Allon Mureinik has uploaded a new change for review. Change subject: core: Remove unused XmlDocument.nameTable ......................................................................
core: Remove unused XmlDocument.nameTable XmlDocument.nameTable is never initialized and therefore is always null. Since it holds no data, it can safely be removed. The only place this field was ever referenced was by calls to new XmlNamspaceManager(Object), which simply ignored the passed object. Since this parameter is not used anyway, and is always called with XmlDocument.nameTable, the constructor was changed and the parameter was removed. Change-Id: Ie922fdd01d85a6f61fadaccd2a20263c7d013f85 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlDocument.java M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNamespaceManager.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java 4 files changed, 3 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/21600/1 diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlDocument.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlDocument.java index 73f2fec..71e1371 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlDocument.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlDocument.java @@ -16,7 +16,6 @@ public class XmlDocument { - public Object nameTable; private String outerXml; public XmlNode[] childNodes; diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNamespaceManager.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNamespaceManager.java index e308f9f..ed60780 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNamespaceManager.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/XmlNamespaceManager.java @@ -12,7 +12,7 @@ private Map<String, String> prefixToUri; - public XmlNamespaceManager(Object nameTable) { + public XmlNamespaceManager() { prefixToUri = new HashMap<String, String>(); } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java index b428ecf..aeb24de 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfParser.java @@ -27,7 +27,7 @@ _document = new XmlDocument(); _document.LoadXml(ovfstring); - _xmlNS = new XmlNamespaceManager(_document.nameTable); + _xmlNS = new XmlNamespaceManager(); } public boolean IsTemplate() { diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java index e1f7d9a..ada552c 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java @@ -57,7 +57,7 @@ _document = document; this.vmBase = vmBase; - _xmlNS = new XmlNamespaceManager(_document.nameTable); + _xmlNS = new XmlNamespaceManager(); _xmlNS.addNamespace("ovf", OVF_URI); _xmlNS.addNamespace("rasd", RASD_URI); _xmlNS.addNamespace("vssd", VSSD_URI); -- To view, visit http://gerrit.ovirt.org/21600 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie922fdd01d85a6f61fadaccd2a20263c7d013f85 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
