Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 66473 Details for
Bug 163352
import filters are not exported when export the logset
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Attached the patch for comment #24.
patch_163352_09052007.txt (text/plain), 11.24 KB, created by
vrushali satpute
on 2007-05-09 10:08:57 EDT
(
hide
)
Description:
Attached the patch for comment #24.
Filename:
MIME Type:
Creator:
vrushali satpute
Created:
2007-05-09 10:08:57 EDT
Size:
11.24 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.tptp.monitoring.logui >Index: src/org/eclipse/tptp/monitoring/logui/internal/wizards/ExportLogSetsUI.java >=================================================================== >RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.monitoring.logui/src/org/eclipse/tptp/monitoring/logui/internal/wizards/ExportLogSetsUI.java,v >retrieving revision 1.9 >diff -u -r1.9 ExportLogSetsUI.java >--- src/org/eclipse/tptp/monitoring/logui/internal/wizards/ExportLogSetsUI.java 28 Apr 2007 05:04:45 -0000 1.9 >+++ src/org/eclipse/tptp/monitoring/logui/internal/wizards/ExportLogSetsUI.java 9 May 2007 12:18:48 -0000 >@@ -69,14 +69,12 @@ > xmiString.append(lsMgr.generateLogSetPrefEntry(key)); > populateLogSetFilterList(key,filterList); > } >- xmiString.append(lsMgr.generateLogSetFilterDefEntry(filterList)); >+ xmiString.append(FilterTransformationHelper.convertXmiToXml(lsMgr.generateLogSetFilterDefEntry(filterList))); > xmiString.append(" </"); > xmiString.append(LogSetManager.LOGSETS_KEY); > xmiString.append(">"); >- >- String xmlString = FilterTransformationHelper.convertXmiToXml(xmiString.toString()); >- >- String filePath = sourceNameField.getText().trim(); >+ >+ String filePath = sourceNameField.getText().trim(); > if (!filePath.endsWith(".logsxml")) > filePath += ".logsxml"; > >@@ -103,7 +101,7 @@ > OutputStream outputStream = new FileOutputStream(file.toString(), false); > writer = new OutputStreamWriter(outputStream, "UTF8"); > >- writer.write(xmlString.toString()); >+ writer.write(FilterTransformationHelper.indentXML(xmiString.toString())); > writer.flush(); > writer.close(); > >Index: src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogSetsUI.java >=================================================================== >RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.monitoring.logui/src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogSetsUI.java,v >retrieving revision 1.8 >diff -u -r1.8 ImportLogSetsUI.java >--- src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogSetsUI.java 28 Apr 2007 05:04:45 -0000 1.8 >+++ src/org/eclipse/tptp/monitoring/logui/internal/wizards/ImportLogSetsUI.java 9 May 2007 12:18:48 -0000 >@@ -74,11 +74,18 @@ > 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(); >@@ -132,22 +139,21 @@ > FileInputStream inputStream = new FileInputStream(fileName); > Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream); > Element root = doc.getDocumentElement(); >- String xmlString = FilterTransformationHelper.toString(root); >- >- String xmiString = FilterTransformationHelper.convertXmlToXmi(xmlString); >- >- 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++) >+ NodeList nl = root.getChildNodes(); >+ >+ for(int l1 = 0; l1 < nl.getLength(); l1++) > { > if(nl.item(l1).getNodeName().equals(LogSetManager.FILTER_TAG)) > { >- filterNode = (Element)nl.item(l1); >+ 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(); >- >- InputStream is = new ByteArrayInputStream(FilterTransformationHelper.toString(filterNode).getBytes()); >+ String fl = FilterTransformationHelper.toString(filterNode); >+ InputStream is = new ByteArrayInputStream(fl.getBytes()); > rSource.load(is, LogSetManager.RESOURCE_OPTIONS); > return rSource; > } >Index: src/org/eclipse/tptp/monitoring/logui/internal/util/FilterTransformationHelper.java >=================================================================== >RCS file: /cvsroot/tptp/monitoring/org.eclipse.tptp.monitoring.logui/src/org/eclipse/tptp/monitoring/logui/internal/util/FilterTransformationHelper.java,v >retrieving revision 1.6 >diff -u -r1.6 FilterTransformationHelper.java >--- src/org/eclipse/tptp/monitoring/logui/internal/util/FilterTransformationHelper.java 4 May 2007 14:40:33 -0000 1.6 >+++ src/org/eclipse/tptp/monitoring/logui/internal/util/FilterTransformationHelper.java 9 May 2007 12:18:47 -0000 >@@ -21,6 +21,7 @@ > 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; >@@ -43,15 +44,15 @@ > > Document newDocument = builder.newDocument(); > >- Element element = (Element) document.getElementsByTagName("logsets").item(0); >+ Element element = (Element) document.getElementsByTagName(LogSetManager.FILTER_TAG).item(0); > if(element != null) > { > buildXMLDocument(element, null, newDocument); > } > >- Node root = newDocument.getElementsByTagName("logsets").item(0); >+ Node root = newDocument.getDocumentElement(); > >- return toString(root); >+ return toString(root,false); > } > catch (Exception e) > { >@@ -141,6 +142,24 @@ > } > } > } >+ >+ 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) > { >@@ -153,13 +172,12 @@ > > Document newDocument = builder.newDocument(); > >- Element element = (Element) document.getElementsByTagName("logsets").item(0); >+ Element element = (Element) document.getElementsByTagName(LogSetManager.FILTER_TAG).item(0); > if(element != null) > { > buildXmiDocument(element, null, newDocument); > } >- >- Node root = newDocument.getElementsByTagName("logsets").item(0); >+ Node root = newDocument.getDocumentElement(); > > return toString(root); > } >@@ -179,76 +197,70 @@ > nodeName = "HierarchyExtensions:SimpleSearchQuery"; > } > >- Element newElement = newDocument.createElement(nodeName); >- >- Node textChild = element.getFirstChild(); >- if(textChild != null && textChild instanceof Text) >+ if(nodeName.equals(LogSetManager.FILTER_TAG)) > { >- String data = ((Text)textChild).getData(); >- if(data != null) >- newElement.appendChild(newDocument.createTextNode(data)); >+ 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); > } >- >- NamedNodeMap attributes = element.getAttributes(); >- for(int i = 0; i < attributes.getLength(); i++) >+ else > { >- 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"; >- } >+ Element newElement = newDocument.createElement(nodeName); > >- 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")) >+ Node textChild = element.getFirstChild(); >+ if(textChild != null && textChild instanceof Text) > { >- value = "http://www.eclipse.org/emf/2002/Ecore#//E" + value; >+ String data = ((Text)textChild).getData(); >+ if(data != null) >+ newElement.appendChild(newDocument.createTextNode(data)); > } >- else if(value.startsWith("ImportLogFilterType:")) >+ >+ NamedNodeMap attributes = element.getAttributes(); >+ for(int i = 0; i < attributes.getLength(); i++) > { >- value = value.replaceFirst("ImportLogFilterType:", "org.eclipse.hyades.log.ui.ImportLogFilterType:"); >+ 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++) > {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 163352
:
64924
|
64947
|
65218
|
65219
|
65283
| 66473