From 06b9a796be74c75d1297bfa6959a4ce193932a57 Mon Sep 17 00:00:00 2001 From: zapata Date: Sun, 18 Jan 2004 13:29:49 +0000 Subject: [PATCH] small fixes --- .../tal/template/TALBasicTemplateNodeLibrary.java | 2 +- source/mircoders/global/ProducerEngine.java | 1 - .../localizer/basic/MirBasicWriterEngine.java | 36 ++++++++++++---------- templates/admin/content.template | 3 ++ 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/source/mir/generator/tal/template/TALBasicTemplateNodeLibrary.java b/source/mir/generator/tal/template/TALBasicTemplateNodeLibrary.java index ab64df1d..fbb1f456 100755 --- a/source/mir/generator/tal/template/TALBasicTemplateNodeLibrary.java +++ b/source/mir/generator/tal/template/TALBasicTemplateNodeLibrary.java @@ -30,7 +30,6 @@ package mir.generator.tal.template; - import java.util.Map; import java.util.List; import java.util.HashMap; @@ -235,6 +234,7 @@ public class TALBasicTemplateNodeLibrary implements TALTemplateNodeLibrary { public void process(TALExpressionParser aParser, Object aContext, StringBuffer aDestination, TALLogger aLogger) throws TemplateProcessingException { if (errorExpression != null) { StringBuffer destination = new StringBuffer(); + try { outerProcess(aParser, aContext, aDestination, aLogger); } diff --git a/source/mircoders/global/ProducerEngine.java b/source/mircoders/global/ProducerEngine.java index 8e46e57c..60a399ea 100755 --- a/source/mircoders/global/ProducerEngine.java +++ b/source/mircoders/global/ProducerEngine.java @@ -47,7 +47,6 @@ import multex.Exc; import multex.Failure; public class ProducerEngine { -// private Map producers; private JobQueue producerJobQueue; private LoggerWrapper logger; diff --git a/source/mircoders/localizer/basic/MirBasicWriterEngine.java b/source/mircoders/localizer/basic/MirBasicWriterEngine.java index 9279ce64..0cb29227 100755 --- a/source/mircoders/localizer/basic/MirBasicWriterEngine.java +++ b/source/mircoders/localizer/basic/MirBasicWriterEngine.java @@ -18,13 +18,13 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * In addition, as a special exception, The Mir-coders gives permission to link - * the code of this program with any library licensed under the Apache Software License, - * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library - * (or with modified versions of the above that use the same license as the above), - * and distribute linked combinations including the two. You must obey the - * GNU General Public License in all respects for all of the code used other than - * the above mentioned libraries. If you modify this file, you may extend this - * exception to your version of the file, but you are not obligated to do so. + * the code of this program with any library licensed under the Apache Software License, + * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library + * (or with modified versions of the above that use the same license as the above), + * and distribute linked combinations including the two. You must obey the + * GNU General Public License in all respects for all of the code used other than + * the above mentioned libraries. If you modify this file, you may extend this + * exception to your version of the file, but you are not obligated to do so. * If you do not wish to do so, delete this exception statement from your version. */ package mircoders.localizer.basic; @@ -50,27 +50,29 @@ public class MirBasicWriterEngine implements WriterEngine { File file; File dir; - if (anEncoding!=null && !anEncoding.equals("")) + if (anEncoding != null && !anEncoding.equals("")) encoding = anEncoding; else encoding = defaultEncoding; -// MirGlobal.getConfigProperty("Mir.DefaultEncoding"); try { - file = new File( anIdentifier ); - dir = new File(file.getParent()); - if (dir!=null && !dir.exists()){ - dir.mkdirs(); + file = new File(anIdentifier); + + dir = file.getParentFile(); + + if (dir != null && !dir.exists()) { + dir.mkdirs(); } return new PrintWriter( - new BufferedWriter(new OutputStreamWriter( - new FileOutputStream(file), encoding - ),8192) + new BufferedWriter( + new OutputStreamWriter( + new FileOutputStream(file), encoding + ), 8192) ); } catch (Throwable t) { - throw new MirLocalizerFailure("Failure while opening a PrintWriter: "+t.getMessage(),t); + throw new MirLocalizerFailure("Failure while opening a PrintWriter: " + t.getMessage(), t); } }; diff --git a/templates/admin/content.template b/templates/admin/content.template index 5f97cccd..c75de475 100755 --- a/templates/admin/content.template +++ b/templates/admin/content.template @@ -102,6 +102,8 @@ + + changedate, creationdate aren't available for new articles ${lang("content.lastchange_date")}: @@ -123,6 +125,7 @@ + -- 2.11.0