rife2/rife2
rife2/rife2
2
0
Fork 0
mirror of https://github.com/ethauvin/rife2.git synced 2025-05-02 11:28:12 -07:00
Code Activity

Legacy template code removal

Browse source
This commit is contained in:
Geert Bevin 2022-12-17 10:41:07 -05:00
parent 8bf3d2a179
commit 7afef0cbcd
1 changed files with 2 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

49
lib/src/main/java/rife/template/AbstractTemplate.java
View file

@ -24,9 +24,7 @@ public abstract class AbstractTemplate implements Template {
protected TemplateEncoder encoder_ = EncoderDummy.instance(); protected TemplateEncoder encoder_ = EncoderDummy.instance();
protected List<ResourceBundle> defaultResourceBundles_ = null; protected List<ResourceBundle> defaultResourceBundles_ = null;
protected List<ResourceBundle> resourceBundles_ = null; protected List<ResourceBundle> resourceBundles_ = null;
protected Map<String, Object> expressionVars_ = null;
protected String language_ = null; protected String language_ = null;
protected Map<String, Object> cache_ = null;
protected String defaultContentType_ = null; protected String defaultContentType_ = null;
public final void appendBlock(String valueBlockId) { public final void appendBlock(String valueBlockId) {
@ -822,22 +820,6 @@ public abstract class AbstractTemplate implements Template {
return language_; return language_;
} }
public void setExpressionVar(String name, Object value) {
if (null == expressionVars_) {
expressionVars_ = new HashMap<>();
}
expressionVars_.put(name, value);
}
public void setExpressionVars(Map<String, Object> map) {
expressionVars_ = map;
}
public Map<String, Object> getExpressionVars() {
return expressionVars_;
}
final void initialize() final void initialize()
throws TemplateException { throws TemplateException {
_evaluateL10nTags(null); _evaluateL10nTags(null);
@ -853,26 +835,6 @@ public abstract class AbstractTemplate implements Template {
initializer_ = initializer; initializer_ = initializer;
} }
public void cacheObject(String key, Object value) {
if (null == key) {
return;
}
if (null == cache_) {
cache_ = new HashMap<>();
}
cache_.put(key, value);
}
public Object getCacheObject(String key) {
if (null == cache_) {
return null;
}
return cache_.get(key);
}
public String getDefaultContentType() { public String getDefaultContentType() {
return defaultContentType_; return defaultContentType_;
} }
@ -890,11 +852,8 @@ public abstract class AbstractTemplate implements Template {
} }
if (templateDependencies.size() > 0) { if (templateDependencies.size() > 0) {
Iterator url_it = templateDependencies.keySet().iterator(); for (var dependency_resource : templateDependencies.keySet()) {
URL dependency_resource = null; if (Parser.getModificationTime(resourceFinder, dependency_resource) > templateDependencies.get(dependency_resource)) {
while (url_it.hasNext()) {
dependency_resource = (URL) url_it.next();
if (Parser.getModificationTime(resourceFinder, dependency_resource) > (Long) templateDependencies.get(dependency_resource)) {
return true; return true;
} }
} }
@ -943,10 +902,6 @@ public abstract class AbstractTemplate implements Template {
new_template.constructedValues_.put(constructed_value_id, constructedValues_.get(constructed_value_id)); new_template.constructedValues_.put(constructed_value_id, constructedValues_.get(constructed_value_id));
} }
if (expressionVars_ != null) {
new_template.expressionVars_ = new HashMap<>(expressionVars_);
}
return new_template; return new_template;
} }
} }