commit f4a060b4ab7f2bd6db14fe3a57576fb28c02e3b2
Author: Michal Srb <msrb(a)redhat.com>
Date: Wed Jun 4 11:01:06 2014 +0200
Drop _root_element_name
Looks like it's not needed
python/javapackages/pom/artifact.py | 11 ++++-------
python/javapackages/pom/dependency.py | 2 --
python/javapackages/pom/exclusion.py | 2 --
python/javapackages/pom/extension.py | 2 --
python/javapackages/pom/plugin.py | 2 --
5 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/python/javapackages/pom/artifact.py b/python/javapackages/pom/artifact.py
index c35acf4..c8ce77d 100644
--- a/python/javapackages/pom/artifact.py
+++ b/python/javapackages/pom/artifact.py
@@ -49,9 +49,6 @@ class ArtifactFormatException(Exception):
class AbstractArtifact(object):
- def __init__(self):
- self._root_element_name = "abstractArtifact"
-
def get_mvn_str(self):
m = self.__get_members()
return Printer.get_mvn_str(m['groupId'], m['artifactId'],
@@ -99,7 +96,8 @@ class AbstractArtifact(object):
Return XML Element node representation of the Artifact
"""
if root_element_name is None:
- root_element_name = self._root_element_name
+ clsname = self.__class__.__name__
+ root_element_name = clsname[0].lower() + clsname[1:]
root = Element(root_element_name)
members = self.__get_members()
@@ -115,7 +113,8 @@ class AbstractArtifact(object):
Return XML formatted string representation of the Artifact
"""
if root_element_name is None:
- root_element_name = self._root_element_name
+ clsname = self.__class__.__name__
+ root_element_name = clsname[0].lower() + clsname[1:]
root = self.get_xml_element(root_element_name)
return tostring(root, pretty_print=True)
@@ -186,8 +185,6 @@ class Artifact(AbstractArtifact):
self.classifier = classifier.strip()
self.version = version.strip()
- self._root_element_name = "artifact"
-
@classmethod
def merge_artifacts(cls, dominant, recessive):
"""
diff --git a/python/javapackages/pom/dependency.py
b/python/javapackages/pom/dependency.py
index 0499b06..5979b6e 100644
--- a/python/javapackages/pom/dependency.py
+++ b/python/javapackages/pom/dependency.py
@@ -52,8 +52,6 @@ class Dependency(AbstractArtifact):
self.optional = optional
self.exclusions = exclusions
- self._root_element_name = "dependency"
-
def get_xml_element(self, root="dependency"):
"""
Return XML Element node representation of the Artifact
diff --git a/python/javapackages/pom/exclusion.py b/python/javapackages/pom/exclusion.py
index fe5707a..4b05c0c 100644
--- a/python/javapackages/pom/exclusion.py
+++ b/python/javapackages/pom/exclusion.py
@@ -44,8 +44,6 @@ class Exclusion(AbstractArtifact):
self.groupId = groupId.strip()
self.artifactId = artifactId.strip()
- self._root_element_name = "exclusion"
-
@classmethod
def from_xml_element(cls, xmlnode):
"""
diff --git a/python/javapackages/pom/extension.py b/python/javapackages/pom/extension.py
index 4412845..a6aa1e4 100644
--- a/python/javapackages/pom/extension.py
+++ b/python/javapackages/pom/extension.py
@@ -44,8 +44,6 @@ class Extension(AbstractArtifact):
self.artifactId = artifactId.strip()
self.version = version.strip()
- self._root_element_name = "extension"
-
@classmethod
def from_xml_element(cls, xmlnode):
"""
diff --git a/python/javapackages/pom/plugin.py b/python/javapackages/pom/plugin.py
index b2fd42f..dfc9385 100644
--- a/python/javapackages/pom/plugin.py
+++ b/python/javapackages/pom/plugin.py
@@ -48,8 +48,6 @@ class Plugin(AbstractArtifact):
self.version = version.strip()
self.dependencies = dependencies
- self._root_element_name = "plugin"
-
def get_xml_element(self, root="plugin"):
"""
Return XML Element node representation of the Plugin
Show replies by date