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

* sourceCharset property patch contributed by kunitoki at gmail on helma-user

Browse source
This commit is contained in:
hns 2007-05-10 09:31:19 +00:00
parent 972bb8f232
commit d8f5446d01
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/helma/scripting/rhino/HacHspConverter.java
View file

@ -28,22 +28,25 @@ import java.util.StringTokenizer;
*/ */
public class HacHspConverter { public class HacHspConverter {
public static String convertHac(Resource action) throws IOException { public static String convertHac(Resource action, String encoding)
throws IOException {
String functionName = action.getBaseName().replace('.', '_') + "_action"; String functionName = action.getBaseName().replace('.', '_') + "_action";
return composeFunction(functionName, null, action.getContent()); return composeFunction(functionName, null, action.getContent(encoding));
} }
public static String convertHsp(Resource template) throws IOException { public static String convertHsp(Resource template, String encoding)
throws IOException {
String functionName = template.getBaseName().replace('.', '_'); String functionName = template.getBaseName().replace('.', '_');
String body = processHspBody(template.getContent()); String body = processHspBody(template.getContent(encoding));
return composeFunction(functionName, return composeFunction(functionName,
"arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10", "arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10",
body); body);
} }
public static String convertHspAsString(Resource template) throws IOException { public static String convertHspAsString(Resource template, String encoding)
throws IOException {
String functionName = template.getBaseName().replace('.', '_') + "_as_string"; String functionName = template.getBaseName().replace('.', '_') + "_as_string";
String body = processHspBody(template.getContent()); String body = processHspBody(template.getContent(encoding));
return composeFunction(functionName, return composeFunction(functionName,
"arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10", "arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10",
"res.pushStringBuffer(); " + body + "res.pushStringBuffer(); " + body +

12
src/helma/scripting/rhino/RhinoCore.java
View file

@ -769,19 +769,23 @@ public final class RhinoCore implements ScopeProvider {
Resource previousCurrentResource = app.getCurrentCodeResource(); Resource previousCurrentResource = app.getCurrentCodeResource();
app.setCurrentCodeResource(code); app.setCurrentCodeResource(code);
String encoding = app.getProperty("sourceCharset");
try { try {
Scriptable op = type.objProto; Scriptable op = type.objProto;
// do the update, evaluating the file // do the update, evaluating the file
if (sourceName.endsWith(".js")) { if (sourceName.endsWith(".js")) {
reader = new InputStreamReader(code.getInputStream()); reader = encoding == null ?
new InputStreamReader(code.getInputStream()) :
new InputStreamReader(code.getInputStream(), encoding);
cx.evaluateReader(op, reader, sourceName, 1, null); cx.evaluateReader(op, reader, sourceName, 1, null);
} else if (sourceName.endsWith(".hac")) { } else if (sourceName.endsWith(".hac")) {
reader = new StringReader(HacHspConverter.convertHac(code)); reader = new StringReader(HacHspConverter.convertHac(code, encoding));
cx.evaluateReader(op, reader, sourceName, 0, null); cx.evaluateReader(op, reader, sourceName, 0, null);
} else if (sourceName.endsWith(".hsp")) { } else if (sourceName.endsWith(".hsp")) {
reader = new StringReader(HacHspConverter.convertHsp(code)); reader = new StringReader(HacHspConverter.convertHsp(code, encoding));
cx.evaluateReader(op, reader, sourceName, 0, null); cx.evaluateReader(op, reader, sourceName, 0, null);
reader = new StringReader(HacHspConverter.convertHspAsString(code)); reader = new StringReader(HacHspConverter.convertHspAsString(code, encoding));
cx.evaluateReader(op, reader, sourceName, 0, null); cx.evaluateReader(op, reader, sourceName, 0, null);
} }