+++ /dev/null
-/*
- * Copyright (C) 2001, 2002 The Mir-coders group
- *
- * This file is part of Mir.
- *
- * Mir is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Mir is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mir; if not, write to the Free Software
- * 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.
- * If you do not wish to do so, delete this exception statement from your version.
- */
-
-package mir.misc;
-
-
-
-/**
- * Reports the location of the error in the File.
- * Based and inspired by a source from the Ant distribution
- * (Copyright (c) 1999-2001 The Apache Software Foundation.)
- *
- * @version $Id: ConfigException.java,v 1.4 2003/04/21 12:42:52 idfx Exp $
- *
- * @author The Mir-coders group
- */
-
-public class ConfigException extends RuntimeException {
-
- /** Exception that might have caused this one. */
- private Throwable cause;
-
- /** Location in the build file where the exception occured */
- private Location location = Location.UNKNOWN_LOCATION;
-
- /**
- * Constructs a build exception with no descriptive information.
- */
- public ConfigException() {
- super();
- }
-
- /**
- * Constructs an exception with the given descriptive message.
- * @param msg Description of or information about the exception.
- */
- public ConfigException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs an exception with the given message and exception as
- * a root cause.
- * @param msg Description of or information about the exception.
- * @param cause Throwable that might have cause this one.
- */
- public ConfigException(String msg, Throwable cause) {
- super(msg);
- this.cause = cause;
- }
-
- /**
- * Constructs an exception with the given message and exception as
- * a root cause and a location in a file.
- * @param msg Description of or information about the exception.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ConfigException(String msg, Throwable cause, Location location) {
- this(msg, cause);
- this.location = location;
- }
-
- /**
- * Constructs an exception with the given exception as a root cause.
- * @param cause Exception that might have caused this one.
- */
- public ConfigException(Throwable cause) {
- super(cause.toString());
- this.cause = cause;
- }
-
- /**
- * Constructs an exception with the given descriptive message and a location
- * in a file.
- * @param msg Description of or information about the exception.
- * @param location Location in the project file where the error occured.
- */
- public ConfigException(String msg, Location location) {
- super(msg);
- this.location = location;
- }
-
- /**
- * Constructs an exception with the given exception as
- * a root cause and a location in a file.
- * @param cause Exception that might have cause this one.
- * @param location Location in the project file where the error occured.
- */
- public ConfigException(Throwable cause, Location location) {
- this(cause);
- this.location = location;
- }
-
- /**
- * Returns the nested exception.
- */
- public Throwable getException() {
- return cause;
- }
-
- /**
- * Returns the location of the error and the error message.
- */
- public String toString() {
- return location.toString() + getMessage();
- }
-
- /**
- * Sets the file location where the error occured.
- */
- public void setLocation(Location location) {
- this.location = location;
- }
-
- /**
- * Returns the file location where the error occured.
- */
- public Location getLocation() {
- return location;
- }
-
- // Override stack trace methods to show original cause:
- public void printStackTrace() {
- printStackTrace(System.err);
- }
-
-}
+++ /dev/null
-/*
- * Copyright (C) 2001, 2002 The Mir-coders group
- *
- * This file is part of Mir.
- *
- * Mir is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * Mir is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mir; if not, write to the Free Software
- * 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.
- * If you do not wish to do so, delete this exception statement from your version.
- */
-package mir.misc;
-
-/**
- * Stores the file name and line number in a file.
- *
- * @version $Id: Location.java,v 1.3 2003/04/21 12:42:52 idfx Exp $
- *
- */
-public class Location {
- private String fileName;
- private int lineNumber;
- private int columnNumber;
-
- public static final Location UNKNOWN_LOCATION = new Location();
-
- /**
- * Creates an "unknown" location.
- */
- private Location() {
- this(null, 0, 0);
- }
-
- /**
- * Creates a location consisting of a file name but no line number.
- */
- public Location(String fileName) {
- this(fileName, 0, 0);
- }
-
- /**
- * Creates a location consisting of a file name and line number.
- */
- public Location(String fileName, int lineNumber, int columnNumber) {
- this.fileName = fileName;
- this.lineNumber = lineNumber;
- this.columnNumber = columnNumber;
- }
-
- /**
- * Returns the file name, line number and a trailing space. An error
- * message can be appended easily. For unknown locations, returns
- * an empty string.
- */
- public String toString() {
- StringBuffer buf = new StringBuffer();
-
- if (fileName != null) {
- buf.append(fileName);
-
- if (lineNumber != 0) {
- buf.append(":");
- buf.append(lineNumber);
- }
-
- buf.append(": ");
- }
-
- return buf.toString();
- }
-}
import java.util.TimeZone;
/**
- * Statische Hilfsmethoden zur Stringbehandlung
- *
- * @version $Id: StringUtil.java,v 1.33.2.7 2005/09/18 15:01:27 zapata Exp $
- * @author mir-coders group
- *
*/
public final class StringUtil {
package mircoders.global;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import mir.bundle.BasicBundleFactory;
import mir.bundle.BundleFactory;
import mir.bundle.CascadingBundleFactory;
import mir.entity.adapter.EntityAdapter;
import mir.log.LoggerEngine;
import mir.log.LoggerWrapper;
-import mir.misc.ConfigException;
import mircoders.accesscontrol.AccessControl;
import mircoders.entity.EntityComment;
import mircoders.entity.EntityContent;
import mircoders.localizer.MirCachingLocalizerDecorator;
import mircoders.localizer.MirLocalizer;
import mircoders.localizer.MirLocalizerExc;
+import mircoders.localizer.MirLocalizerFailure;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
public class MirGlobal {
static private MirLocalizer localizer;
new PropertiesFileBundleLoader(
config().getHome())));
+ private MirGlobal() {
+ }
+
public synchronized static MirLocalizer localizer() {
String localizerClassName;
Class localizerClass;
localizerClass = Class.forName(localizerClassName);
}
catch (Throwable t) {
- throw new ConfigException("localizer class '" +
- localizerClassName + "' not found: " + t.toString());
+ throw new MirLocalizerFailure("localizer class '" +
+ localizerClassName + "' not found: ", t);
}
- if (!(MirLocalizer.class.isAssignableFrom(localizerClass)))
- throw new ConfigException("localizer class '" +
+ if (!MirLocalizer.class.isAssignableFrom(localizerClass)) {
+ throw new MirLocalizerFailure("localizer class '" +
localizerClassName + "' is not assignable from MirLocalizer");
+ }
try {
localizer = new MirCachingLocalizerDecorator((MirLocalizer) localizerClass.newInstance());
}
catch (Throwable t) {
- throw new ConfigException("localizer class '" +
- localizerClassName + "' cannot be instantiated: " + t.toString());
+ throw new MirLocalizerFailure("localizer class '" +
+ localizerClassName + "' cannot be instantiated: " + t.getMessage(), t);
}
}
return result.toString();
}
- public synchronized static Abuse abuse() {
+ synchronized public static Abuse abuse() {
if (abuse==null) {
try {
abuse = new Abuse(localizer().dataModel().adapterModel());
return MirPropertiesConfiguration.instance();
}
- public synchronized static DatabaseEngine getDatabaseEngine() {
- if (databaseEngine==null)
+ synchronized public static DatabaseEngine getDatabaseEngine() {
+ if (databaseEngine==null) {
databaseEngine = new DatabaseEngine();
+ }
return databaseEngine;
}
}
}
- public static synchronized AccessControl accessControl() {
+ synchronized public static AccessControl accessControl() {
if (accessControl == null) {
accessControl=new AccessControl();
}
try {
EntityAdapter user = null;
- if (aUser!=null)
+ if (aUser!=null) {
user = localizer().dataModel().adapterModel().makeEntityAdapter("user", aUser);
+ }
- if (operation!=null)
+ if (operation!=null) {
operation.perform(
user,
localizer().dataModel().adapterModel().makeEntityAdapter("content", anArticle));
+ }
}
catch (Throwable t) {
- t.printStackTrace(logger.asPrintWriter(LoggerWrapper.DEBUG_MESSAGE));
-
- throw new RuntimeException(t.toString());
+ throw new MirGlobalFailure(t.getMessage(), t);
}
}
try {
EntityAdapter user = null;
- if (aUser!=null)
+ if (aUser!=null) {
user = localizer().dataModel().adapterModel().makeEntityAdapter("user", aUser);
+ }
- if (operation!=null)
+ if (operation!=null) {
operation.perform(
user,
localizer().dataModel().adapterModel().makeEntityAdapter("comment", aComment));
+ }
}
catch (Throwable t) {
- throw new RuntimeException(t.toString());
+ throw new MirGlobalFailure(t.getMessage(), t);
}
}
return (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) articleOperations.get(aName);
}
catch (Throwable t) {
- throw new RuntimeException(t.toString());
+ throw new MirGlobalFailure(t.getMessage(), t);
}
}
return (MirAdminInterfaceLocalizer.MirSimpleEntityOperation) commentOperations.get(aName);
}
catch (Throwable t) {
- throw new RuntimeException(t.toString());
+ throw new MirGlobalFailure(t.getMessage(), t);
}
}
super(aCause.getMessage(), aCause);
}
- public MirGlobalFailure(String msg, Exception cause){
- super(msg,cause);
+ public MirGlobalFailure(String aMessage, Throwable aCause){
+ super(aMessage,aCause);
}
+
+ public MirGlobalFailure(String aMessage){
+ super(aMessage, null);
+ }
+
}
import multex.Failure;
public class MirLocalizerFailure extends Failure {
- public MirLocalizerFailure(String msg, Throwable throwable) {
- super(msg, throwable);
+ public MirLocalizerFailure(String aMessage, Throwable aCause) {
+ super(aMessage, aCause);
}
- public MirLocalizerFailure(Throwable aThrowable) {
- this(aThrowable.getMessage(), aThrowable);
+
+ public MirLocalizerFailure(Throwable aCause) {
+ this(aCause.getMessage(), aCause);
+ }
+
+ public MirLocalizerFailure(String aMessage) {
+ super(aMessage, null);
}
}
mainTemplate = getConfiguration().getString("ServletModule.Abuse.Main.Template");
}
- protected void defaultAction(HttpServletRequest aRequest, HttpServletResponse aResponse) {
+ public void defaultAction(HttpServletRequest aRequest, HttpServletResponse aResponse) {
showsettings(aRequest, aResponse);
}
projects / mir.git / commitdiff