svn commit: r1439577 - in /incubator/jspwiki/trunk/src/org/apache/wiki: api/exceptions/WikiI18nException.java auth/user/DuplicateUserException.java

[ju...@apache.org]

Author: juanpablo
Date: Mon Jan 28 19:07:37 2013
New Revision: 1439577

URL: http://svn.apache.org/viewvc?rev=1439577&view=rev
Log:
new WikiI18nException, meant to carry key & args to construct i18n messages to show meaningful messages to end-user. Classes and/or JSPs on the web tier are responsible of constructing the appropiate message.

DuplicateUserException inherits from WikiI18nException.

Added:
    incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/WikiI18nException.java
Modified:
    incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/DuplicateUserException.java

Added: incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/WikiI18nException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/WikiI18nException.java?rev=1439577&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/WikiI18nException.java (added)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/api/exceptions/WikiI18nException.java Mon Jan 28 19:07:37 2013
@@ -0,0 +1,57 @@
+/*
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.     
+ */
+package org.apache.wiki.api.exceptions;
+
+/**
+ *  A generic Wiki exception, meant to carry key & args to construct i18n messages to show 
+ *  meaningful messages to end-user. Classes and/or JSPs on the web tier are responsible of
+ *  constructing the appropiate message.
+ *
+ *  @since 2.9.1
+ */
+public class WikiI18nException
+    extends WikiException
+{
+    private static final long serialVersionUID = -1412916016409728838L;
+    
+    /** arguments needed to construct the i18n message associated with the exception. */
+    protected final Object[] args;
+
+    /**
+     *  Constructs an exception.
+     *  
+     *  @param key the key corresponding to the i18n message in the exception.
+     *  @param args arguments needed to construct the i18n message associated with the exception.
+     */
+    public WikiI18nException( String key, Object... args )
+    {
+        super( key );
+        this.args = args;
+    }
+    
+    /**
+     * getter. 
+     * 
+     * @return arguments needed to construct the i18n message associated with the exception.
+     */
+    public Object[] getArgs()
+    {
+        return args;
+    }
+}

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/DuplicateUserException.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/DuplicateUserException.java?rev=1439577&r1=1439576&r2=1439577&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/DuplicateUserException.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/auth/user/DuplicateUserException.java Mon Jan 28 19:07:37 2013
@@ -18,17 +18,26 @@
  */
 package org.apache.wiki.auth.user;
 
+import org.apache.wiki.api.exceptions.WikiI18nException;
+
+
 /**
- * Exception indicating that an identical user already exists in the user
- * database.
+ * Exception indicating that an identical user already exists in the user database.
+ * 
  * @since 2.3
  */
-public final class DuplicateUserException extends Exception
+public final class DuplicateUserException extends WikiI18nException
 {
     private static final long serialVersionUID = 3258125851953674032L;
 
     public DuplicateUserException( String message )
     {
-        super( message );
+        super( message, ( Object[] )null );
+    }
+
+    public DuplicateUserException( String message, Object... args )
+    {
+        super( message, args );
     }
+
 }
\ No newline at end of file