You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2018/12/02 20:09:58 UTC
[myfaces] branch master updated: break up "shaded"
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 738aea7 break up "shaded"
738aea7 is described below
commit 738aea7e15683a2b3c3f4e65c6f6c5354a0031dc
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Sun Dec 2 21:09:51 2018 +0100
break up "shaded"
---
.../apache/myfaces/application/jsp/ServletViewResponseWrapper.java | 2 +-
.../src/main/java/org/apache/myfaces/util/EnumerationIterator.java | 3 +++
.../myfaces/{shared => }/view/HttpServletResponseSwitch.java | 2 +-
.../java/org/apache/myfaces/{shared => }/view/ResponseSwitch.java | 2 +-
.../apache/myfaces/{shared => }/view/ServletResponseSwitch.java | 4 +++-
.../apache/myfaces/{shared => }/view/SwitchableOutputStream.java | 2 +-
.../org/apache/myfaces/{shared => }/view/SwitchableWriter.java | 2 +-
.../myfaces/{shared => }/view/ViewDeclarationLanguageBase.java | 2 +-
.../org/apache/myfaces/{shared => }/view/ViewResponseWrapper.java | 2 +-
.../myfaces/view/facelets/FaceletViewDeclarationLanguageBase.java | 2 +-
.../org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java | 1 -
.../{shared/view => view/jsp}/JspViewDeclarationLanguageBase.java | 7 ++++++-
12 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java b/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
index 6119489..818a668 100644
--- a/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/application/jsp/ServletViewResponseWrapper.java
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.application.jsp;
-import org.apache.myfaces.shared.view.ViewResponseWrapper;
+import org.apache.myfaces.view.ViewResponseWrapper;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
diff --git a/impl/src/main/java/org/apache/myfaces/util/EnumerationIterator.java b/impl/src/main/java/org/apache/myfaces/util/EnumerationIterator.java
index 919c6f4..6a49686 100755
--- a/impl/src/main/java/org/apache/myfaces/util/EnumerationIterator.java
+++ b/impl/src/main/java/org/apache/myfaces/util/EnumerationIterator.java
@@ -34,16 +34,19 @@ public final class EnumerationIterator<T> implements Iterator<T>
_enumeration = enumeration;
}
+ @Override
public boolean hasNext()
{
return _enumeration.hasMoreElements();
}
+ @Override
public T next()
{
return _enumeration.nextElement();
}
+ @Override
public void remove()
{
throw new UnsupportedOperationException(this.getClass().getName() + " UnsupportedOperationException");
diff --git a/impl/src/main/java/org/apache/myfaces/shared/view/HttpServletResponseSwitch.java b/impl/src/main/java/org/apache/myfaces/view/HttpServletResponseSwitch.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/shared/view/HttpServletResponseSwitch.java
rename to impl/src/main/java/org/apache/myfaces/view/HttpServletResponseSwitch.java
index 69610ab..937864c 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/view/HttpServletResponseSwitch.java
+++ b/impl/src/main/java/org/apache/myfaces/view/HttpServletResponseSwitch.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.view;
+package org.apache.myfaces.view;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/view/ResponseSwitch.java b/impl/src/main/java/org/apache/myfaces/view/ResponseSwitch.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/shared/view/ResponseSwitch.java
rename to impl/src/main/java/org/apache/myfaces/view/ResponseSwitch.java
index 04f3200..e2f2a1b 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/view/ResponseSwitch.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ResponseSwitch.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.view;
+package org.apache.myfaces.view;
/**
* Responses which can be enabled or disabled implement this interface.
diff --git a/impl/src/main/java/org/apache/myfaces/shared/view/ServletResponseSwitch.java b/impl/src/main/java/org/apache/myfaces/view/ServletResponseSwitch.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/shared/view/ServletResponseSwitch.java
rename to impl/src/main/java/org/apache/myfaces/view/ServletResponseSwitch.java
index 44e870c..162a5d8 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/view/ServletResponseSwitch.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ServletResponseSwitch.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.view;
+package org.apache.myfaces.view;
import java.io.IOException;
import java.io.PrintWriter;
@@ -48,6 +48,7 @@ public class ServletResponseSwitch extends ServletResponseWrapper implements Res
* Enables or disables the Response's Writer and OutputStream.
* @param enabled
*/
+ @Override
public void setEnabled(boolean enabled)
{
_enabled = enabled;
@@ -57,6 +58,7 @@ public class ServletResponseSwitch extends ServletResponseWrapper implements Res
* Are the Response's Writer and OutputStream currently enabled?
* @return
*/
+ @Override
public boolean isEnabled()
{
return _enabled;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/view/SwitchableOutputStream.java b/impl/src/main/java/org/apache/myfaces/view/SwitchableOutputStream.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/shared/view/SwitchableOutputStream.java
rename to impl/src/main/java/org/apache/myfaces/view/SwitchableOutputStream.java
index be5b5f8..416d4a5 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/view/SwitchableOutputStream.java
+++ b/impl/src/main/java/org/apache/myfaces/view/SwitchableOutputStream.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.view;
+package org.apache.myfaces.view;
import java.io.IOException;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/view/SwitchableWriter.java b/impl/src/main/java/org/apache/myfaces/view/SwitchableWriter.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/shared/view/SwitchableWriter.java
rename to impl/src/main/java/org/apache/myfaces/view/SwitchableWriter.java
index 6db571b..35bb4d3 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/view/SwitchableWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/view/SwitchableWriter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.view;
+package org.apache.myfaces.view;
import java.io.IOException;
import java.io.Writer;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/view/ViewDeclarationLanguageBase.java b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java
similarity index 99%
rename from impl/src/main/java/org/apache/myfaces/shared/view/ViewDeclarationLanguageBase.java
rename to impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java
index 2f2acc7..7824fab 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/view/ViewDeclarationLanguageBase.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ViewDeclarationLanguageBase.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.view;
+package org.apache.myfaces.view;
import javax.faces.application.Application;
import javax.faces.application.ViewHandler;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/view/ViewResponseWrapper.java b/impl/src/main/java/org/apache/myfaces/view/ViewResponseWrapper.java
similarity index 96%
rename from impl/src/main/java/org/apache/myfaces/shared/view/ViewResponseWrapper.java
rename to impl/src/main/java/org/apache/myfaces/view/ViewResponseWrapper.java
index eec8070..366b5a3 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/view/ViewResponseWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/ViewResponseWrapper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.view;
+package org.apache.myfaces.view;
import java.io.IOException;
import java.io.Writer;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageBase.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageBase.java
index ecb281c..81762fb 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageBase.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguageBase.java
@@ -23,7 +23,7 @@ import javax.faces.component.UIViewRoot;
import javax.faces.component.visit.VisitContextFactory;
import javax.faces.context.FacesContext;
import javax.faces.render.RenderKitFactory;
-import org.apache.myfaces.shared.view.ViewDeclarationLanguageBase;
+import org.apache.myfaces.view.ViewDeclarationLanguageBase;
/**
*
diff --git a/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
index 2bdcbcf..f9c3824 100644
--- a/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguage.java
@@ -40,7 +40,6 @@ import javax.servlet.jsp.jstl.core.Config;
import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
import org.apache.myfaces.application.viewstate.StateCacheUtils;
-import org.apache.myfaces.shared.view.JspViewDeclarationLanguageBase;
import org.apache.myfaces.view.ViewDeclarationLanguageStrategy;
import org.apache.myfaces.view.facelets.tag.composite.CompositeLibrary;
import org.apache.myfaces.view.facelets.tag.jsf.core.CoreLibrary;
diff --git a/impl/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java b/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageBase.java
similarity index 98%
rename from impl/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java
rename to impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageBase.java
index 8fb8974..00a316b 100644
--- a/impl/src/main/java/org/apache/myfaces/shared/view/JspViewDeclarationLanguageBase.java
+++ b/impl/src/main/java/org/apache/myfaces/view/jsp/JspViewDeclarationLanguageBase.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.shared.view;
+package org.apache.myfaces.view.jsp;
import java.beans.BeanInfo;
import java.io.IOException;
@@ -45,6 +45,11 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.myfaces.shared.application.DefaultViewHandlerSupport;
import org.apache.myfaces.shared.application.ViewHandlerSupport;
import org.apache.myfaces.config.MyfacesConfig;
+import org.apache.myfaces.view.HttpServletResponseSwitch;
+import org.apache.myfaces.view.ResponseSwitch;
+import org.apache.myfaces.view.ServletResponseSwitch;
+import org.apache.myfaces.view.ViewDeclarationLanguageBase;
+import org.apache.myfaces.view.ViewResponseWrapper;
public abstract class JspViewDeclarationLanguageBase extends ViewDeclarationLanguageBase