diff --git a/src/helma/framework/core/SkinFile.java b/src/helma/framework/core/SkinFile.java index a7709385..10652458 100644 --- a/src/helma/framework/core/SkinFile.java +++ b/src/helma/framework/core/SkinFile.java @@ -69,10 +69,7 @@ public final class SkinFile implements Updatable { if (!file.exists ()) { // remove skin from prototype - if (prototype != null) { - prototype.skins.remove (name); - prototype.updatables.remove (file.getName()); - } + remove (); } else { // we only need to update if the skin has already been initialized if (skin != null) @@ -90,10 +87,19 @@ public final class SkinFile implements Updatable { } catch (IOException x) { app.logEvent ("Error reading Skin "+file+": "+x); } - + lastmod = file.lastModified (); } + public void remove () { + if (prototype != null) { + prototype.skins.remove (name); + if (file != null) + prototype.updatables.remove (file.getName()); + } + } + + public Skin getSkin () { if (skin == null) read (); @@ -103,7 +109,7 @@ public final class SkinFile implements Updatable { public String getName () { return name; } - + public String toString () { return prototype.getName()+"/"+file.getName(); } diff --git a/src/helma/objectmodel/db/DbMapping.java b/src/helma/objectmodel/db/DbMapping.java index 0685f06d..a9c884d8 100644 --- a/src/helma/objectmodel/db/DbMapping.java +++ b/src/helma/objectmodel/db/DbMapping.java @@ -237,6 +237,13 @@ public final class DbMapping implements Updatable { } + /** + * Method in interface Updatable. + */ + public void remove () { + // do nothing, removing of type properties is not implemented. + } + /** * Get a JDBC connection for this DbMapping. */