You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/11/12 23:47:57 UTC
svn commit: r1541289 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/context/
tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/
Author: lofwyr
Date: Tue Nov 12 22:47:57 2013
New Revision: 1541289
URL: http://svn.apache.org/r1541289
Log:
clean up
Added:
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java
- copied, changed from r1540055, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java
- copied, changed from r1540055, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java
- copied, changed from r1540055, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java
Removed:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java
Copied: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java (from r1540055, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java?p2=myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java&r1=1540055&r2=1541289&rev=1541289&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextFactoryWrapper.java Tue Nov 12 22:47:57 2013
@@ -24,14 +24,19 @@ import javax.faces.context.FacesContext;
import javax.faces.lifecycle.Lifecycle;
import javax.faces.FacesException;
+/**
+ * @deprecated since 2.0.0
+ */
+@Deprecated
public class FacesContextFactoryWrapper extends FacesContextFactory {
private FacesContextFactory facesContextFactory;
- public FacesContextFactoryWrapper(FacesContextFactory facesContextFactory) {
+ public FacesContextFactoryWrapper(final FacesContextFactory facesContextFactory) {
this.facesContextFactory = facesContextFactory;
}
- public FacesContext getFacesContext(Object context, Object request, Object response, Lifecycle lifecycle)
+ public FacesContext getFacesContext(
+ final Object context, final Object request, final Object response, final Lifecycle lifecycle)
throws FacesException {
return facesContextFactory.getFacesContext(context, request, response, lifecycle);
}
Copied: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java (from r1540055, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java?p2=myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java&r1=1540055&r2=1541289&rev=1541289&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/FacesContextWrapper.java Tue Nov 12 22:47:57 2013
@@ -29,6 +29,10 @@ import javax.faces.render.RenderKit;
import javax.faces.component.UIViewRoot;
import java.util.Iterator;
+/**
+ * @deprecated since 2.0.0
+ */
+@Deprecated
public class FacesContextWrapper extends javax.faces.context.FacesContext {
private FacesContext context;
Copied: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java (from r1540055, myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java?p2=myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java&p1=myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java&r1=1540055&r2=1541289&rev=1541289&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/TobagoFacesContext.java Tue Nov 12 22:47:57 2013
@@ -22,18 +22,20 @@ package org.apache.myfaces.tobago.contex
import org.apache.commons.collections.list.SetUniqueList;
import org.apache.commons.collections.set.ListOrderedSet;
import org.apache.myfaces.tobago.internal.component.AbstractUIPopup;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javax.faces.context.FacesContext;
+import javax.faces.context.FacesContextWrapper;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-
+/**
+ * @deprecated since 2.0.0
+ */
+@Deprecated
public class TobagoFacesContext extends FacesContextWrapper {
- private static final Logger LOG = LoggerFactory.getLogger(TobagoFacesContext.class);
+ private final FacesContext wrapped;
private SetUniqueList scriptFiles;
@@ -59,10 +61,8 @@ public class TobagoFacesContext extends
private boolean ajax;
-// private Map<Object, Object> attributes;
-
- public TobagoFacesContext(FacesContext context) {
- super(context);
+ public TobagoFacesContext(FacesContext wrapped) {
+ this.wrapped = wrapped;
scriptFiles = SetUniqueList.decorate(new ArrayList());
scriptBlocks = new ListOrderedSet();
styleFiles = new ListOrderedSet();
@@ -146,17 +146,17 @@ public class TobagoFacesContext extends
@Override
public String toString() {
- return getClass().getName() + " wrapped context=" + getContext();
+ return getClass().getName() + " wrapped context=" + getWrapped();
}
@Override
public void release() {
super.release();
-/*
- if (attributes != null) {
- attributes.clear();
- }
-*/
clearScriptsAndPopups();
}
+
+ @Override
+ public FacesContext getWrapped() {
+ return wrapped;
+ }
}