Skip to content

Commit

Permalink
fix a bug concerning marshalling a pojo representation of an xml desc…
Browse files Browse the repository at this point in the history 
…ription back to an xml string -> all description subtypes
  • Loading branch information
@jkrue
jkrue committed Nov 29, 2016
1 parent 6983602 commit b541edb
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 48 deletions.
20 changes: 10 additions & 10 deletions wizard/src/main/java/de/unibi/cebitec/bibiserv/wizard/bean/input/CreateXML.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,8 @@ public void createXmlFile() {
if (!param.getDescription().isEmpty() && !param.getDescription().get(
0).getContent().isEmpty()) {
Tparam.Description description = param.getDescription().get(0);
String descriptionContent = LoadXMLBean.getDescriptionContent(
description);
String descriptionContent = LoadXMLBean.flowObjectList2String(
description.getContent());
description.getContent().clear();
description.getContent().add(descriptionContent);
}
Expand All @@ -943,8 +943,8 @@ public void createXmlFile() {
if (!enumParam.getDescription().isEmpty() && !enumParam.getDescription().get(0).getContent().isEmpty()) {
TenumParam.Description description = enumParam.getDescription().
get(0);
String descriptionContent = LoadXMLBean.getDescriptionContent(
description);
String descriptionContent = LoadXMLBean.flowObjectList2String(
description.getContent());
description.getContent().clear();
description.getContent().add(descriptionContent);
}
Expand All @@ -959,8 +959,8 @@ public void createXmlFile() {
if (!paramGroup.getDescription().isEmpty() && !paramGroup.getDescription().get(0).getContent().isEmpty()) {
TparamGroup.Description description =
paramGroup.getDescription().get(0);
String descriptionContent = LoadXMLBean.getDescriptionContent(
description);
String descriptionContent = LoadXMLBean.flowObjectList2String(
description.getContent());
description.getContent().clear();
description.getContent().add(descriptionContent);
}
Expand All @@ -976,8 +976,8 @@ public void createXmlFile() {
0).getContent().isEmpty()) {
TinputOutput.Description description = input.getDescription().
get(0);
String descriptionContent = LoadXMLBean.getDescriptionContent(
description);
String descriptionContent = LoadXMLBean.flowObjectList2String(
description.getContent());
description.getContent().clear();
description.getContent().add(descriptionContent);
}
Expand All @@ -1000,8 +1000,8 @@ public void createXmlFile() {
get(0).getContent().isEmpty()) {
TinputOutput.Description description = output.getDescription().
get(0);
String descriptionContent = LoadXMLBean.getDescriptionContent(
description);
String descriptionContent = LoadXMLBean.flowObjectList2String(
description.getContent());
description.getContent().clear();
description.getContent().add(descriptionContent);
}
Expand Down
74 changes: 37 additions & 37 deletions wizard/src/main/java/de/unibi/cebitec/bibiserv/wizard/bean/input/LoadXMLBean.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import de.unibi.techfak.bibiserv.cms.Texecutable;
import de.unibi.techfak.bibiserv.cms.Tfile;
import de.unibi.techfak.bibiserv.cms.Tfunction;
import de.unibi.techfak.bibiserv.cms.Tfunction.Description;
import de.unibi.techfak.bibiserv.cms.TinputOutput;
import de.unibi.techfak.bibiserv.cms.Titem;
import de.unibi.techfak.bibiserv.cms.Tmanual;
Expand Down Expand Up @@ -71,6 +72,7 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.namespace.QName;
import org.primefaces.event.FileUploadEvent;

/**
Expand Down Expand Up @@ -198,7 +200,7 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
//load the description manually (if it is there).
if (!runnableItem.getDescription().isEmpty()) {
Titem.Description basicInfoDescription = new Titem.Description();
basicInfoDescription.getContent().add(getDescriptionContent(runnableItem.getDescription().get(0)));
basicInfoDescription.getContent().add(flowObjectList2String(runnableItem.getDescription().get(0).getContent()));
basicInfoDescription.setLang(runnableItem.getDescription().get(0).getLang());
newRunnable.getDescription().add(basicInfoDescription);
}
Expand Down Expand Up @@ -259,8 +261,7 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
for (TinputOutput input : executable.getInput()) {
//Handle the description manually.
TinputOutput.Description inputDescription = new TinputOutput.Description();
inputDescription.getContent().add(getDescriptionContent(
input.getDescription().get(0)));
inputDescription.getContent().add(flowObjectList2String(input.getDescription().get(0).getContent()));
inputDescription.setLang(input.getDescription().get(0).getLang());
input.getDescription().set(0, inputDescription);

Expand Down Expand Up @@ -314,8 +315,8 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
//Handle the description manually.
if (!dependency.getDescription().isEmpty()) {
Tdependency.Description dependencyDescription = new Tdependency.Description();
dependencyDescription.getContent().add(getDescriptionContent(
dependency.getDescription().get(0)));
dependencyDescription.getContent().add(flowObjectList2String(
dependency.getDescription().get(0).getContent()));
dependencyDescription.setLang(dependency.getDescription().get(0).getLang());
dependency.getDescription().set(0, dependencyDescription);
}
Expand Down Expand Up @@ -356,8 +357,8 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
for (TinputOutput output : executable.getOutput()) {
//Handle the description manually.
TinputOutput.Description outputDescription = new TinputOutput.Description();
outputDescription.getContent().add(getDescriptionContent(
output.getDescription().get(0)));
outputDescription.getContent().add(flowObjectList2String(
output.getDescription().get(0).getContent()));
outputDescription.setLang(output.getDescription().get(0).getLang());
output.getDescription().set(0, outputDescription);

Expand Down Expand Up @@ -385,8 +386,8 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
for (Tparam parameter : executable.getParam()) {
//Handle the description manually.
Tparam.Description parameterDescription = new Tparam.Description();
parameterDescription.getContent().add(getDescriptionContent(
parameter.getDescription().get(0)));
parameterDescription.getContent().add(flowObjectList2String(
parameter.getDescription().get(0).getContent()));
parameterDescription.setLang(parameter.getDescription().get(0).getLang());
parameter.getDescription().set(0, parameterDescription);

Expand Down Expand Up @@ -417,8 +418,8 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
for (TenumParam enumParameter : executable.getEnumParam()) {
//Handle the description manually.
TenumParam.Description parameterDescription = new TenumParam.Description();
parameterDescription.getContent().add(getDescriptionContent(
enumParameter.getDescription().get(0)));
parameterDescription.getContent().add(flowObjectList2String(
enumParameter.getDescription().get(0).getContent()));
parameterDescription.setLang(enumParameter.getDescription().get(0).getLang());
enumParameter.getDescription().set(0, parameterDescription);

Expand Down Expand Up @@ -455,8 +456,8 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
if (!paramGroup.getDescription().isEmpty()) {
TparamGroup.Description parameterGroupDescription =
new TparamGroup.Description();
parameterGroupDescription.getContent().add(getDescriptionContent(
paramGroup.getDescription().get(0)));
parameterGroupDescription.getContent().add(flowObjectList2String(
paramGroup.getDescription().get(0).getContent()));
parameterGroupDescription.setLang(paramGroup.getDescription().get(0).getLang());
paramGroup.getDescription().set(0, parameterGroupDescription);
}
Expand Down Expand Up @@ -491,8 +492,9 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
//Handle the description manually (if there is one).
if (!function.getDescription().isEmpty()) {
Tfunction.Description functionDescription = new Tfunction.Description();
functionDescription.getContent().add(getDescriptionContent(
function.getDescription().get(0)));
//validate content
functionDescription.getContent().add(flowObjectList2String(function.getDescription().get(0).getContent()));

functionDescription.setLang(function.getDescription().get(0).getLang());
function.getDescription().set(0, functionDescription);
}
Expand Down Expand Up @@ -520,8 +522,8 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
//Handle the description manually (if there is one).
if (!paramGroup.getDescription().isEmpty()) {
TparamGroup.Description paramGroupDescription = new TparamGroup.Description();
paramGroupDescription.getContent().add(getDescriptionContent(
paramGroup.getDescription().get(0)));
paramGroupDescription.getContent().add(flowObjectList2String(
paramGroup.getDescription().get(0).getContent()));
paramGroupDescription.setLang(paramGroup.getDescription().get(0).getLang());
paramGroup.getDescription().set(0, paramGroupDescription);
}
Expand Down Expand Up @@ -654,8 +656,8 @@ public void loadTRunnableData(TrunnableItem runnableItem) throws IOException {
//Handle the description manually (if there is one).
if (!file.getDescription().isEmpty()) {
Tfile.Description fileDescription = new Tfile.Description();
fileDescription.getContent().add(getDescriptionContent(
file.getDescription().get(0)));
fileDescription.getContent().add(flowObjectList2String(
file.getDescription().get(0).getContent()));
fileDescription.setLang(file.getDescription().get(0).getLang());
file.getDescription().set(0, fileDescription);
}
Expand Down Expand Up @@ -970,35 +972,33 @@ public String disambiguate(String input, String typestring) {
return disambiguator.disambiguateName(input, typestring);
}



/**
* Extracts the microhtml data of a description as String.
* Flatten a flow content (from a description), a list content objects, to
* a string representation.
*
* @param descriptionData input microhtml data (Flow root element).
* @return microhtml data as String.
* @param list of Flow content object
* @return content as String.
*/
public static String getDescriptionContent(Object descriptionData) {
public static String flowObjectList2String(List<Object> content) {

StringWriter stringWriter = new StringWriter();

try {
Flow description = (Flow) descriptionData;

JAXBContext microHtmlContext = JAXBContext.newInstance(
MICROHTMLNAMESPACE);
Flow flow = new Flow();
flow.getContent().addAll(content);

try {
JAXBContext microHtmlContext = JAXBContext.newInstance(MICROHTMLNAMESPACE);

Marshaller microHTMLMarshaller = microHtmlContext.createMarshaller();
microHTMLMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
Boolean.TRUE);

de.unibi.techfak.bibiserv.cms.microhtml.ObjectFactory microHTMLFactory =
new de.unibi.techfak.bibiserv.cms.microhtml.ObjectFactory();
microHTMLMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);

microHTMLMarshaller.marshal(microHTMLFactory.createMicrohtml(description),
stringWriter);
JAXBElement obj = new JAXBElement(new QName("bibiserv:de.unibi.techfak.bibiserv.cms.microhtml"),Flow.class,flow);
microHTMLMarshaller.marshal(obj, stringWriter);

return stringWriter.toString();

} catch (JAXBException e) {
e.printStackTrace(); //debug
return PropertyManager.getProperty("couldNotLoadDescriptionError");
} catch (ClassCastException e) {
return PropertyManager.getProperty("couldNotLoadDescriptionError");
Expand Down
1 change: 0 additions & 1 deletion wizard/src/main/java/de/unibi/cebitec/bibiserv/wizard/bean/manage/BasicInfoBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import de.unibi.techfak.bibiserv.cms.ObjectFactory;
import de.unibi.techfak.bibiserv.cms.Titem;
import de.unibi.techfak.bibiserv.cms.TrunnableItem;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.faces.bean.ManagedBean;
Expand Down

0 comments on commit b541edb

Please sign in to comment.