I'm getting these two after an SVN Sync:

The constructor InputValidator(String, WikiSession) is undefined
JSPWiki/src/com/ecyrd/jspwiki/auth/authorize    GroupManager.java    line
582    1219520881260    140279
The constructor InputValidator(String, WikiSession) is undefined
JSPWiki/src/com/ecyrd/jspwiki/auth/authorize    GroupManager.java    line
644    1219520881260    140280

regards,
Harry

2008/8/23 Dirk Frederickx <[EMAIL PROTECTED]>

> Strange, I did a full test run.
> Txs, I'll check again.
>
> dirk
>
> On Sat, Aug 23, 2008 at 9:50 PM, Harry Metske <[EMAIL PROTECTED]>
> wrote:
> > Dirk,
> >
> > the changed constructor of InputValidator results in 2 compile errors in
> > com.ecyrd.jspwiki.auth.authorize.GroupManager :-)
> >
> > regards,
> > Harry
> >
> > 2008/8/23 <[EMAIL PROTECTED]>
> >
> >> Author: brushed
> >> Date: Sat Aug 23 11:43:57 2008
> >> New Revision: 688394
> >>
> >> URL: http://svn.apache.org/viewvc?rev=688394&view=rev
> >> Log:
> >> v2.7.0-alpha-24: [JSPWIKI-333] Fix InputValidator to use correct locale.
> >>
> >> Modified:
> >>    incubator/jspwiki/trunk/ChangeLog
> >>    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
> >>    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java
> >>    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java
> >>    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/InputValidator.java
> >>
> >> Modified: incubator/jspwiki/trunk/ChangeLog
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=688394&r1=688393&r2=688394&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/ChangeLog (original)
> >> +++ incubator/jspwiki/trunk/ChangeLog Sat Aug 23 11:43:57 2008
> >> @@ -1,3 +1,11 @@
> >> +2008-08-23 Dirk Frederickx <[EMAIL PROTECTED]>
> >> +
> >> +        * 2.7.0-alpha-24
> >> +
> >> +        * [JSPWIKI-333] Language selection/deselection was not working
> >> correctly
> >> +        for some error messages. Refactored the input-validator to use
> >> correct locale.
> >> +
> >> +
> >>  2008-08-20  Andrew Jaquith <ajaquith AT apache DOT org>
> >>
> >>         * 2.7.0-alpha-23
> >>
> >> Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=688394&r1=688393&r2=688394&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
> (original)
> >> +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sat Aug
> 23
> >> 11:43:57 2008
> >> @@ -77,7 +77,7 @@
> >>      *  <p>
> >>      *  If the build identifier is empty, it is not added.
> >>      */
> >> -    public static final String     BUILD         = "23";
> >> +    public static final String     BUILD         = "24";
> >>
> >>     /**
> >>      *  This is the generic version string you should use
> >>
> >> Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java?rev=688394&r1=688393&r2=688394&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java
> >> (original)
> >> +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiContext.java Sat
> Aug
> >> 23 11:43:57 2008
> >> @@ -936,12 +936,7 @@
> >>     public ResourceBundle getBundle( String bundle ) throws
> >> MissingResourceException
> >>     {
> >>         Locale loc = Preferences.getLocale( this );
> >> -
> >> -/*        if( loc == null) {
> >> -            if( m_request != null )
> >> -                loc = m_request.getLocale();
> >> -        }
> >> -*/
> >> +
> >>         ResourceBundle b =
> >> m_engine.getInternationalizationManager().getBundle(bundle, loc);
> >>
> >>         return b;
> >>
> >> Modified:
> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java?rev=688394&r1=688393&r2=688394&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java
> >> (original)
> >> +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/UserManager.java
> Sat
> >> Aug 23 11:43:57 2008
> >> @@ -477,7 +477,7 @@
> >>     {
> >>         boolean isNew = profile.isNew();
> >>         WikiSession session = context.getWikiSession();
> >> -        InputValidator validator = new InputValidator(
> SESSION_MESSAGES,
> >> session );
> >> +        InputValidator validator = new InputValidator(
> SESSION_MESSAGES,
> >> context );
> >>         ResourceBundle rb = context.getBundle(
> >> InternationalizationManager.CORE_BUNDLE );
> >>
> >>         //
> >>
> >> Modified:
> >> incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/InputValidator.java
> >> URL:
> >>
> http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/InputValidator.java?rev=688394&r1=688393&r2=688394&view=diff
> >>
> >>
> ==============================================================================
> >> --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/InputValidator.java
> >> (original)
> >> +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/InputValidator.java
> >> Sat Aug 23 11:43:57 2008
> >> @@ -25,7 +25,7 @@
> >>  import java.util.regex.Matcher;
> >>  import java.util.regex.Pattern;
> >>
> >> -import com.ecyrd.jspwiki.WikiSession;
> >> +import com.ecyrd.jspwiki.*;
> >>  import com.ecyrd.jspwiki.i18n.InternationalizationManager;
> >>
> >>  /**
> >> @@ -61,18 +61,21 @@
> >>
> >>     private final WikiSession      m_session;
> >>
> >> +    private final WikiContext      m_context;
> >> +
> >>     /**
> >>      * Constructs a new input validator for a specific form and wiki
> >> session.
> >>      * When validation errors are detected, they will be added to the
> wiki
> >>      * session's messages.
> >>      * @param form the ID or name of the form this validator should be
> >>      * associated with
> >> -     * @param session the wiki session
> >> +     * @param context the wiki context
> >>      */
> >> -    public InputValidator( String form, WikiSession session )
> >> +    public InputValidator( String form, WikiContext context )
> >>     {
> >>         m_form = form;
> >> -        m_session = session;
> >> +        m_context = context;
> >> +        m_session = context.getWikiSession();
> >>     }
> >>
> >>     /**
> >> @@ -102,8 +105,7 @@
> >>     {
> >>         if ( isBlank( input ) )
> >>         {
> >> -            ResourceBundle rb = ResourceBundle.getBundle(
> >> InternationalizationManager.CORE_BUNDLE,
> >> -
> >>  m_session.getLocale() );
> >> +            ResourceBundle rb = m_context.getBundle(
> >> InternationalizationManager.CORE_BUNDLE );
> >>
> >>             Object[] args = { label };
> >>             m_session.addMessage( m_form, MessageFormat.format(
> >> rb.getString("validate.cantbenull"),
> >> @@ -132,8 +134,7 @@
> >>             return true;
> >>         }
> >>
> >> -        ResourceBundle rb = ResourceBundle.getBundle(
> >> InternationalizationManager.CORE_BUNDLE,
> >> -
> >>  m_session.getLocale() );
> >> +        ResourceBundle rb = m_context.getBundle(
> >> InternationalizationManager.CORE_BUNDLE );
> >>
> >>         // Otherwise, see if it matches the pattern for the target type
> >>         Matcher matcher;
> >>
> >>
> >>
> >
> >
> > --
> > met vriendelijke groet,
> > Harry Metske
> > Telnr. +31-548-512395
> > Mobile +31-6-51898081
> >
>



-- 
met vriendelijke groet,
Harry Metske
Telnr. +31-548-512395
Mobile +31-6-51898081

Reply via email to