Switched to generic properties parsing on more renderers

This commit is contained in:
Erik C. Thauvin 2023-03-25 20:49:30 -07:00
parent c1b0e7fcf5
commit 4bba966770
5 changed files with 16 additions and 63 deletions

View file

@ -20,10 +20,7 @@ package rife.render;
import rife.template.Template;
import rife.template.ValueRenderer;
import java.io.IOException;
import java.io.StringReader;
import java.lang.management.ManagementFactory;
import java.util.Properties;
/**
* Renders the server uptime.
@ -45,16 +42,7 @@ public class Uptime implements ValueRenderer {
*/
@Override
public String render(Template template, String valueId, String differentiator) {
var properties = new Properties();
var defaultValue = template.getDefaultValue(valueId);
if (defaultValue != null) {
try {
properties.load(new StringReader(defaultValue));
} catch (IOException ignore) {
// ignore
}
}
var properties = RenderUtils.parsePropertiesString(template.getDefaultValue(valueId));
String uptime;
if (template.hasAttribute(Uptime.class.getName())) {
uptime = RenderUtils.uptime((long) template.getAttribute(Uptime.class.getName()), properties);