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

Always mark prototype as updated if a zip files contains some part of it,

Browse source 
even if it's a skin file.
This commit is contained in:
hns 2003-12-02 17:44:53 +00:00
parent caf5bd02af
commit 076b4f7a60
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/helma/framework/core/ZippedAppFile.java
View file

@ -113,8 +113,6 @@ public class ZippedAppFile implements Updatable {
proto.addActionFile(act); proto.addActionFile(act);
updatables.add(act); updatables.add(act);
// mark prototype as updated
proto.markUpdated();
} else if (fname.endsWith(".hsp")) { } else if (fname.endsWith(".hsp")) {
String name = fname.substring(0, fname.lastIndexOf(".")); String name = fname.substring(0, fname.lastIndexOf("."));
String sourceName = file.getName() + "/" + ename; String sourceName = file.getName() + "/" + ename;
@ -126,8 +124,6 @@ public class ZippedAppFile implements Updatable {
proto.addTemplate(tmp); proto.addTemplate(tmp);
updatables.add(tmp); updatables.add(tmp);
// mark prototype as updated
proto.markUpdated();
} else if (fname.endsWith(".skin")) { } else if (fname.endsWith(".skin")) {
String name = fname.substring(0, fname.lastIndexOf(".")); String name = fname.substring(0, fname.lastIndexOf("."));
String content = getZipEntryContent(zip, entry); String content = getZipEntryContent(zip, entry);
@ -137,6 +133,7 @@ public class ZippedAppFile implements Updatable {
proto.addSkinFile(skin); proto.addSkinFile(skin);
updatables.add(skin); updatables.add(skin);
} else if (fname.endsWith(".js")) { } else if (fname.endsWith(".js")) {
String sourceName = file.getName() + "/" + ename; String sourceName = file.getName() + "/" + ename;
String content = getZipEntryContent(zip, entry); String content = getZipEntryContent(zip, entry);
@ -147,19 +144,17 @@ public class ZippedAppFile implements Updatable {
proto.addFunctionFile(ff); proto.addFunctionFile(ff);
updatables.add(ff); updatables.add(ff);
// mark prototype as updated
proto.markUpdated();
} else if ("type.properties".equalsIgnoreCase(fname)) { } else if ("type.properties".equalsIgnoreCase(fname)) {
DbMapping dbmap = proto.getDbMapping(); DbMapping dbmap = proto.getDbMapping();
SystemProperties props = dbmap.getProperties(); SystemProperties props = dbmap.getProperties();
props.addProps(file.getName(), zip.getInputStream(entry)); props.addProps(file.getName(), zip.getInputStream(entry));
}
// mark prototype as updated // mark prototype as updated
proto.markUpdated(); proto.markUpdated();
} }
} }
}
} catch (Throwable x) { } catch (Throwable x) {
System.err.println("Error updating ZipFile: " + x); System.err.println("Error updating ZipFile: " + x);
} finally { } finally {