From 234b35a3121003c357b6e394770e7077a7375d59 Mon Sep 17 00:00:00 2001 From: Jj! Date: Tue, 28 Aug 2018 19:49:05 -0500 Subject: [PATCH] [NOISSUE] I do no like this --- .../shibboleth/admin/ui/domain/AbstractXMLObject.java | 9 ++++++++- .../shibboleth/admin/ui/domain/EntityDescriptor.java | 11 ----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java index f30b02f61..a6f65ab13 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractXMLObject.java @@ -46,9 +46,16 @@ public void detach() { } + @Transient + private transient Element dom; + @Nullable public Element getDOM() { - return null; + return this.dom; + } + + public void setDom(Element dom) { + this.dom = dom; } public String getNamespaceURI() { diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java index 92e496c5e..498e46f32 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java @@ -266,15 +266,4 @@ public List getOrderedChildren() { return Collections.unmodifiableList(children); } - - @Override - public Element getDOM() { - XMLObjectProviderRegistry registry = ConfigurationService.get(XMLObjectProviderRegistry.class); - try { - return registry.getMarshallerFactory().getMarshaller(this).marshall(this); - } catch (MarshallingException e) { - // TODO: some sort of logging? - return null; - } - } }