Author: alexsmirnov Date: 2007-09-07 20:40:01 -0400 (Fri, 07 Sep 2007) New Revision: 2821 Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java trunk/framework/impl/src/main/javascript/ajaxjsf/log4ajax.js Log: Prevent recursion in a LOG popup window. Create AjaxPortlet-related Lifecycle implementation. Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java (rev 0) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -0,0 +1,53 @@ +/** + * + */ +package org.ajax4jsf.portlet.lifecycle; + +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; + +/** + * @author asmirnov + * + */ +public class ApplyValuesPhase extends LifecyclePhase { + + private final LifecyclePhase nextPhase; + + /** + * @param lifecycle + */ + public ApplyValuesPhase(Lifecycle lifecycle) { + super(lifecycle); + nextPhase = new UpdateModelPhase(lifecycle); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[]) + */ + @Override + protected void executeNextPhase(FacesContext context, + PhaseListener[] listeners) { + nextPhase.execute(context, listeners); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext) + */ + @Override + protected void executePhase(FacesContext context) { + context.getViewRoot().processDecodes(context); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId() + */ + @Override + protected PhaseId getPhaseId() { + // TODO Auto-generated method stub + return PhaseId.APPLY_REQUEST_VALUES; + } + +} Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java (rev 0) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -0,0 +1,50 @@ +/** + * + */ +package org.ajax4jsf.portlet.lifecycle; + +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; + +/** + * @author asmirnov + * + */ +public class InvokeApplicationPhase extends LifecyclePhase { + + /** + * @param lifecycle + */ + public InvokeApplicationPhase(Lifecycle lifecycle) { + super(lifecycle); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[]) + */ + @Override + protected void executeNextPhase(FacesContext context, + PhaseListener[] listeners) { + // do nothing. + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext) + */ + @Override + protected void executePhase(FacesContext context) { + context.getViewRoot().processApplication(context); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId() + */ + @Override + protected PhaseId getPhaseId() { + return PhaseId.INVOKE_APPLICATION; + } + +} Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java (rev 0) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -0,0 +1,102 @@ +/** + * + */ +package org.ajax4jsf.portlet.lifecycle; + +import javax.faces.FacesException; +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * @author asmirnov + * + */ +public abstract class LifecyclePhase { + + + private static final Log _log = LogFactory.getLog(LifecyclePhase.class); + + + private final Lifecycle _lifecycle; + + public LifecyclePhase(Lifecycle lifecycle) { + this._lifecycle = lifecycle; + } + + + /** + * Execute phase methods with + * @param context + * @param listeners + */ + public void execute(FacesContext context,PhaseListener[] listeners){ + int listenerToCall = 0; + PhaseEvent event = new PhaseEvent(context,getPhaseId(),_lifecycle); + // Execute listeners before phase. + try { + for(;listenerToCall<listeners.length;listenerToCall++){ + PhaseListener listener = listeners[listenerToCall]; + if(isExecutableListener(listener)){ + listener.beforePhase(event); + } + } + } catch (Exception e) { + _log.error("Error to execute beforePhase "+getPhaseId().toString()+ " method for listener", e); + } + try { + executePhase(context); + } catch (Exception e) { + _log.error("Error execute phase "+getPhaseId().toString()); + if(PhaseId.RENDER_RESPONSE.compareTo(getPhaseId())==0){ + throw new FacesException(e); + } + } finally { + // Execute listeners after phase, in the reverse order of the before phase. + try { + for(listenerToCall--;listenerToCall>=0;listenerToCall--){ + PhaseListener listener = listeners[listenerToCall]; + if(isExecutableListener(listener)){ + listener.afterPhase(event); + } + } + } catch (Exception e) { + _log.error("Error to execute afterPhase "+getPhaseId().toString()+ " method for listener", e); + } + + } + if(!context.getRenderResponse() && !context.getResponseComplete()){ + executeNextPhase(context,listeners); + } + } + + /** + * @param context + * @param listeners + */ + protected abstract void executeNextPhase(FacesContext context, + PhaseListener[] listeners); + + + /** + * @param context + */ + protected abstract void executePhase(FacesContext context); + + + /** + * @return + */ + protected abstract PhaseId getPhaseId(); + + private boolean isExecutableListener(PhaseListener listener) { + PhaseId phaseId = listener.getPhaseId(); + return 0 == getPhaseId().compareTo(phaseId) || 0 == PhaseId.ANY_PHASE.compareTo(phaseId); + } + +} Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/LifecyclePhase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java 2007-09-07 20:13:39 UTC (rev 2820) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -3,6 +3,9 @@ */ package org.ajax4jsf.portlet.lifecycle; +import java.util.ArrayList; +import java.util.List; + import javax.faces.FacesException; import javax.faces.context.FacesContext; import javax.faces.event.PhaseListener; @@ -12,12 +15,17 @@ * @author asmirnov * */ -public class PortletLifecycle { +public class PortletLifecycle extends Lifecycle { + + private final List<PhaseListener> _phaseListeners = new ArrayList<PhaseListener>(); + + private final LifecyclePhase executePhase = new RestoreViewPhase(this); + + private final LifecyclePhase renderPhase = new RenderResponsePhase(this); + + private PhaseListener[] _phaseListenersArray = null; - private Lifecycle _defaultLifecycle; - - public PortletLifecycle(Lifecycle lifecycle) { - _defaultLifecycle = lifecycle; + public PortletLifecycle() { } /** @@ -25,66 +33,61 @@ * @see javax.faces.lifecycle.Lifecycle#addPhaseListener(javax.faces.event.PhaseListener) */ public void addPhaseListener(PhaseListener listener) { - _defaultLifecycle.addPhaseListener(listener); + if(null == listener){ + throw new NullPointerException("PhaseListener for add to Lifecycle can't be null"); + } + synchronized (_phaseListeners) { + _phaseListeners.add(listener); + _phaseListenersArray = null; + } } + /** - * @param obj - * @return - * @see java.lang.Object#equals(java.lang.Object) - */ - public boolean equals(Object obj) { - return _defaultLifecycle.equals(obj); - } + * @param listener + * @see javax.faces.lifecycle.Lifecycle#removePhaseListener(javax.faces.event.PhaseListener) + */ + public void removePhaseListener(PhaseListener listener) { + if(null == listener){ + throw new NullPointerException("PhaseListener for remove from Lifecycle can't be null"); + } + synchronized (_phaseListeners) { + _phaseListeners.remove(listener); + _phaseListenersArray = null; + } + } - /** + /** + * @return + * @see javax.faces.lifecycle.Lifecycle#getPhaseListeners() + */ + public PhaseListener[] getPhaseListeners() { + if (_phaseListenersArray == null) { + // Lazy creation of a working copy listeners Array. + synchronized (_phaseListeners) { + _phaseListenersArray = _phaseListeners.toArray(new PhaseListener[_phaseListeners.size()]); + } + } + + return _phaseListenersArray; + } + + /** * @param context * @throws FacesException * @see javax.faces.lifecycle.Lifecycle#execute(javax.faces.context.FacesContext) */ public void execute(FacesContext context) throws FacesException { - _defaultLifecycle.execute(context); + executePhase.execute(context, getPhaseListeners()); } /** - * @return - * @see javax.faces.lifecycle.Lifecycle#getPhaseListeners() - */ - public PhaseListener[] getPhaseListeners() { - return _defaultLifecycle.getPhaseListeners(); - } - - /** - * @return - * @see java.lang.Object#hashCode() - */ - public int hashCode() { - return _defaultLifecycle.hashCode(); - } - - /** - * @param listener - * @see javax.faces.lifecycle.Lifecycle#removePhaseListener(javax.faces.event.PhaseListener) - */ - public void removePhaseListener(PhaseListener listener) { - _defaultLifecycle.removePhaseListener(listener); - } - - /** * @param context * @throws FacesException * @see javax.faces.lifecycle.Lifecycle#render(javax.faces.context.FacesContext) */ public void render(FacesContext context) throws FacesException { - _defaultLifecycle.render(context); + renderPhase.execute(context, getPhaseListeners()); } - - /** - * @return - * @see java.lang.Object#toString() - */ - public String toString() { - return _defaultLifecycle.toString(); - } } Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java 2007-09-07 20:13:39 UTC (rev 2820) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -21,7 +21,9 @@ package org.ajax4jsf.portlet.lifecycle; +import java.util.HashMap; import java.util.Iterator; +import java.util.Map; import javax.faces.lifecycle.Lifecycle; import javax.faces.lifecycle.LifecycleFactory; @@ -35,19 +37,10 @@ private LifecycleFactory _defaultFactory; - private PortletLifecycle _defaultLifecycle ; + private final Map<String, Lifecycle> _lifecycles = new HashMap<String, Lifecycle>(1); // private Map _lifecycles = new HashMap(); - /** - * @return the debugLifecycle - */ - private PortletLifecycle getDefaultLifecycle() { - if (_defaultLifecycle == null) { - _defaultLifecycle = new PortletLifecycle(_defaultFactory.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE)); - } - return _defaultLifecycle; - } /** * @param defaultFactory @@ -55,29 +48,34 @@ public PortletLifecycleFactory(LifecycleFactory defaultFactory) { super(); this._defaultFactory = defaultFactory; + this._lifecycles.put(DEFAULT_LIFECYCLE, new PortletLifecycle()); } /* (non-Javadoc) * @see javax.faces.lifecycle.LifecycleFactory#addLifecycle(java.lang.String, javax.faces.lifecycle.Lifecycle) */ - public void addLifecycle(String arg0, Lifecycle arg1) { - this._defaultFactory.addLifecycle(arg0, arg1); + public void addLifecycle(String lifecycleId, Lifecycle lifecycle) { + if(null == lifecycleId || null == lifecycle){ + throw new NullPointerException("arguments for a addLifecycle method can't be null"); + } + _lifecycles.put(lifecycleId, lifecycle); } /* (non-Javadoc) * @see javax.faces.lifecycle.LifecycleFactory#getLifecycle(java.lang.String) */ public Lifecycle getLifecycle(String lifecycleId) { - Lifecycle life; - life = this._defaultFactory.getLifecycle(lifecycleId); - return life; + if(null == lifecycleId ){ + throw new NullPointerException("argument for a removeLifecycle method can't be null"); + } + return _lifecycles.get(lifecycleId); } /* (non-Javadoc) * @see javax.faces.lifecycle.LifecycleFactory#getLifecycleIds() */ public Iterator getLifecycleIds() { - return this._defaultFactory.getLifecycleIds(); + return _lifecycles.keySet().iterator(); } } Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java (rev 0) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -0,0 +1,54 @@ +/** + * + */ +package org.ajax4jsf.portlet.lifecycle; + +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; + +/** + * @author asmirnov + * + */ +public class ProcessValidatorsPhase extends LifecyclePhase { + + private final LifecyclePhase nextPhase; + + /** + * @param lifecycle + */ + public ProcessValidatorsPhase(Lifecycle lifecycle) { + super(lifecycle); + nextPhase = new UpdateModelPhase(lifecycle); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[]) + */ + @Override + protected void executeNextPhase(FacesContext context, + PhaseListener[] listeners) { + nextPhase.execute(context, listeners); + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext) + */ + @Override + protected void executePhase(FacesContext context) { + context.getViewRoot().processValidators(context); + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId() + */ + @Override + protected PhaseId getPhaseId() { + return PhaseId.PROCESS_VALIDATIONS; + } + +} Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java (rev 0) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -0,0 +1,61 @@ +/** + * + */ +package org.ajax4jsf.portlet.lifecycle; + +import java.io.IOException; + +import javax.faces.FacesException; +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; + +/** + * @author asmirnov + * + */ +public class RenderResponsePhase extends LifecyclePhase { + + /** + * @param lifecycle + */ + public RenderResponsePhase(Lifecycle lifecycle) { + super(lifecycle); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[]) + */ + @Override + protected void executeNextPhase(FacesContext context, + PhaseListener[] listeners) { + // do nothing. + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext) + */ + @Override + protected void executePhase(FacesContext context) { + try { + context.getApplication().getViewHandler(). + renderView(context, context.getViewRoot()); + } catch (FacesException e) { + throw e; + } catch (IOException e) { + throw new FacesException(e); + } + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId() + */ + @Override + protected PhaseId getPhaseId() { + // TODO Auto-generated method stub + return PhaseId.RENDER_RESPONSE; + } + +} Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java (rev 0) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -0,0 +1,53 @@ +/** + * + */ +package org.ajax4jsf.portlet.lifecycle; + +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; + +/** + * @author asmirnov + * + */ +public class RestoreViewPhase extends LifecyclePhase { + + private final LifecyclePhase nextPhase; + + /** + * @param lifecycle + */ + public RestoreViewPhase(Lifecycle lifecycle) { + super(lifecycle); + nextPhase = new ApplyValuesPhase(lifecycle); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[]) + */ + @Override + protected void executeNextPhase(FacesContext context, + PhaseListener[] listeners) { + nextPhase.execute(context, listeners); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext) + */ + @Override + protected void executePhase(FacesContext context) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId() + */ + @Override + protected PhaseId getPhaseId() { + return PhaseId.RESTORE_VIEW; + } + +} Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Added: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java =================================================================== --- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java (rev 0) +++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java 2007-09-08 00:40:01 UTC (rev 2821) @@ -0,0 +1,53 @@ +/** + * + */ +package org.ajax4jsf.portlet.lifecycle; + +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; +import javax.faces.lifecycle.Lifecycle; + +/** + * @author asmirnov + * + */ +public class UpdateModelPhase extends LifecyclePhase { + + private final LifecyclePhase nextPhase; + /** + * @param lifecycle + */ + public UpdateModelPhase(Lifecycle lifecycle) { + super(lifecycle); + nextPhase = new InvokeApplicationPhase(lifecycle); + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[]) + */ + @Override + protected void executeNextPhase(FacesContext context, + PhaseListener[] listeners) { + nextPhase.execute(context, listeners); + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext) + */ + @Override + protected void executePhase(FacesContext context) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId() + */ + @Override + protected PhaseId getPhaseId() { + return PhaseId.UPDATE_MODEL_VALUES; + } + +} Property changes on: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/log4ajax.js =================================================================== --- trunk/framework/impl/src/main/javascript/ajaxjsf/log4ajax.js 2007-09-07 20:13:39 UTC (rev 2820) +++ trunk/framework/impl/src/main/javascript/ajaxjsf/log4ajax.js 2007-09-08 00:40:01 UTC (rev 2821) @@ -5,10 +5,8 @@ * @author <a href="mailto:thespiegs@users.sourceforge.net">Eric Spiegelberg</a> * @see <a href="http://sourceforge.net/projects/log4ajax">Log4Ajax<... */ - -function LOG() -{ - throw "Do not instantiate LOG"; +if (!window.LOG) { + window.LOG = {}; } LOG.Level = function(name, priority, color){