diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java index dc2d5e5..616c5fb 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/AlgorithmGenerator.java @@ -286,39 +286,39 @@ public class AlgorithmGenerator { if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + " [Published by " + serviceCredentials.getFullName() + " (" + + " {Published by " + serviceCredentials.getFullName() + " (" + serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime()) - + "]"; + + "}"; } else { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + + " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}"; } } else { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + " [Published by " + serviceCredentials.getFullName() + " on " - + sdf.format(Calendar.getInstance().getTime()) + "]"; + + " {Published by " + serviceCredentials.getFullName() + " on " + + sdf.format(Calendar.getInstance().getTime()) + "}"; } else { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + + " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}"; } } } else { if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { - algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " (" + algorithmDescription = " {Published by " + serviceCredentials.getFullName() + " (" + serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime()) - + "]"; + + "}"; } else { - algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + algorithmDescription = " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}"; } } else { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { - algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " on " - + sdf.format(Calendar.getInstance().getTime()) + "]"; + algorithmDescription = " {Published by " + serviceCredentials.getFullName() + " on " + + sdf.format(Calendar.getInstance().getTime()) + "}"; } else { - algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + algorithmDescription = " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}"; } } } diff --git a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/InfoGenerator.java b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/InfoGenerator.java index 390d239..051fb69 100644 --- a/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/InfoGenerator.java +++ b/src/main/java/org/gcube/portlets/user/statisticalalgorithmsimporter/server/generator/InfoGenerator.java @@ -193,39 +193,39 @@ public class InfoGenerator { if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + " [Published by " + serviceCredentials.getFullName() + " (" + + " {Published by " + serviceCredentials.getFullName() + " (" + serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime()) - + "]"; + + "}"; } else { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + + " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}"; } } else { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + " [Published by " + serviceCredentials.getFullName() + " on " - + sdf.format(Calendar.getInstance().getTime()) + "]"; + + " {Published by " + serviceCredentials.getFullName() + " on " + + sdf.format(Calendar.getInstance().getTime()) + "}"; } else { algorithmDescription = project.getInputData().getProjectInfo().getAlgorithmDescription() - + " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + + " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}"; } } } else { if (serviceCredentials.getUserName() != null && !serviceCredentials.getUserName().isEmpty()) { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { - algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " (" + algorithmDescription = " {Published by " + serviceCredentials.getFullName() + " (" + serviceCredentials.getUserName() + ") on " + sdf.format(Calendar.getInstance().getTime()) - + "]"; + + "}"; } else { - algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + algorithmDescription = " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}"; } } else { if (serviceCredentials.getFullName() != null && !serviceCredentials.getFullName().isEmpty()) { - algorithmDescription = " [Published by " + serviceCredentials.getFullName() + " on " - + sdf.format(Calendar.getInstance().getTime()) + "]"; + algorithmDescription = " {Published by " + serviceCredentials.getFullName() + " on " + + sdf.format(Calendar.getInstance().getTime()) + "}"; } else { - algorithmDescription = " [Published on " + sdf.format(Calendar.getInstance().getTime()) + "]"; + algorithmDescription = " {Published on " + sdf.format(Calendar.getInstance().getTime()) + "}"; } } } @@ -236,8 +236,8 @@ public class InfoGenerator { if (project.getInputData().getProjectInfo().getProjectShareInfo().getUsers() != null && !project.getInputData().getProjectInfo().getProjectShareInfo().getUsers().isEmpty()) { StringBuilder userList = new StringBuilder(); - String startTag = "-["; - String endTag = "]"; + String startTag = "-#"; + String endTag = "#"; String separator = ","; boolean first = true; userList.append(startTag);