antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

getSkin now walks down the prototype chain the way it should

Browse source
This commit is contained in:
hns 2001-08-10 15:00:58 +00:00
parent f443c70916
commit 4e50a34189
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/helma/framework/core/RequestEvaluator.java
View file

@ -740,6 +740,17 @@ public class RequestEvaluator implements Runnable {
return skin; return skin;
} }
proto = app.getPrototype (n); proto = app.getPrototype (n);
// not found in node manager for this prototype.
// the next step is to look if it is defined as skin file for this prototype
if (proto != null) {
skin = proto.getSkin (skinname);
// if we have a thisObject and didn't find the skin, try in parent prototype
if (skin == null && n != null) {
proto = proto.getPrototype ();
if (proto != null)
skin = proto.getSkin (skinname);
}
}
} else { } else {
// the requested skin is global - start from currentNode (=end of request path) for app skin retrieval // the requested skin is global - start from currentNode (=end of request path) for app skin retrieval
if (skinManager != null) { if (skinManager != null) {
@ -748,13 +759,6 @@ public class RequestEvaluator implements Runnable {
return skin; return skin;
} }
proto = app.typemgr.getPrototype ("global"); proto = app.typemgr.getPrototype ("global");
}
if (proto != null)
skin = proto.getSkin (skinname);
// if we have a thisObject and didn't find the skin, try in hopobject
if (skin == null && n != null) {
proto = app.typemgr.getPrototype ("hopobject");
if (proto != null)
skin = proto.getSkin (skinname); skin = proto.getSkin (skinname);
} }
return skin; return skin;
@ -773,8 +777,13 @@ public class RequestEvaluator implements Runnable {
} }
} }
// if this is not for the global prototype, also check hopobject // if this is not for the global prototype, also check hopobject
if (!"global".equalsIgnoreCase (prototype) && !"hopobject".equalsIgnoreCase (prototype))
return getSkinFromNode (node, "hopobject", skinname); // NOT! inheritance is taken care of in the above getSkin method.
// the sequence is prototype.skin-from-db, prototype.skin-from-file, parent.from-db, parent.from-file etc.
// if (!"global".equalsIgnoreCase (prototype) && !"hopobject".equalsIgnoreCase (prototype)) {
// return getSkinFromNode (node, "hopobject", skinname);
// }
return null; return null;
} }