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/15 18:11:10 UTC
svn commit: r1542331 [19/28] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/ajax/
tobago-core/src/main/java/org/apache/myfaces/tobago/application/
tobago-core/src/main/java/org/apache/myfaces/tobago/compat/ tobago-core/...
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/Upload.java Fri Nov 15 17:10:58 2013
@@ -48,7 +48,7 @@ public class Upload {
return file;
}
- public void setFile(FileItem file) {
+ public void setFile(final FileItem file) {
this.file = file;
}
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/WaitFilter.java Fri Nov 15 17:10:58 2013
@@ -37,15 +37,15 @@ public class WaitFilter implements Filte
private static final Logger LOG = LoggerFactory.getLogger(WaitFilter.class);
- public void init(FilterConfig filterConfig) throws ServletException {
+ public void init(final FilterConfig filterConfig) throws ServletException {
}
- public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
throws IOException, ServletException {
try {
Thread.sleep(10000L);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
LOG.error("can't sleep 10000", e);
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ZIndexController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ZIndexController.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ZIndexController.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/java/org/apache/myfaces/tobago/example/test/ZIndexController.java Fri Nov 15 17:10:58 2013
@@ -28,7 +28,7 @@ public class ZIndexController {
return modal1;
}
- public void setModal1(Boolean modal1) {
+ public void setModal1(final Boolean modal1) {
this.modal1 = modal1;
}
@@ -36,7 +36,7 @@ public class ZIndexController {
return modal2;
}
- public void setModal2(Boolean modal2) {
+ public void setModal2(final Boolean modal2) {
this.modal2 = modal2;
}
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/AutomaticSeleniumTest.java Fri Nov 15 17:10:58 2013
@@ -45,24 +45,24 @@ public class AutomaticSeleniumTest exten
private String url;
- public AutomaticSeleniumTest(String title, String url) {
+ public AutomaticSeleniumTest(final String title, final String url) {
this.url = url;
}
@Test
public void testPageConsistency() throws Exception {
- SeleniumScript script = getSeleniumScript(url);
+ final SeleniumScript script = getSeleniumScript(url);
getSelenium().killSession();
- for (SeleniumScriptItem item : script.getItems()) {
+ for (final SeleniumScriptItem item : script.getItems()) {
LOG.info("Calling: " + item);
getSelenium().command(item.getCommand(), item.getParameters()[0], item.getParameters()[1]);
getSelenium().checkPage();
}
}
- private SeleniumScript getSeleniumScript(String url)
+ private SeleniumScript getSeleniumScript(final String url)
throws XPathExpressionException, SAXException, IOException, ParserConfigurationException {
String seleniumUrl = url.substring("/faces/".length());
seleniumUrl = seleniumUrl.substring(0, seleniumUrl.lastIndexOf("."));
@@ -72,7 +72,7 @@ public class AutomaticSeleniumTest exten
@Parameterized.Parameters
public static Collection<Object[]> findPages() {
- List<String> paths = new ArrayList<String>();
+ final List<String> paths = new ArrayList<String>();
String base = MAVEN_TARGET + '/';
@@ -85,10 +85,10 @@ public class AutomaticSeleniumTest exten
Collections.sort(paths);
- List<Object[]> result = new ArrayList<Object[]>();
+ final List<Object[]> result = new ArrayList<Object[]>();
- for (String path : paths) {
- Object[] objects = {
+ for (final String path : paths) {
+ final Object[] objects = {
path.replace('.', '_'), // because dots will be displayed strange in the IDE
createUrl(path)
};
@@ -98,7 +98,7 @@ public class AutomaticSeleniumTest exten
return result;
}
- private static void collect(List<String> result, String base, String directory) {
+ private static void collect(final List<String> result, final String base, final String directory) {
final File file = new File(base + directory);
@@ -110,11 +110,11 @@ public class AutomaticSeleniumTest exten
throw new RuntimeException("Input is not a directory: '" + file.getAbsolutePath() + "'");
}
- String[] filenames = file.list();
+ final String[] filenames = file.list();
- for (String filename : filenames) {
+ for (final String filename : filenames) {
- String path = directory + '/' + filename;
+ final String path = directory + '/' + filename;
if (new File(base + path).isDirectory()) {
collect(result, base, path);
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumScript.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumScript.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumScript.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumScript.java Fri Nov 15 17:10:58 2013
@@ -56,33 +56,33 @@ public class SeleniumScript {
XPATH_EXPRESSION = XPATH_FACTORY.newXPath().compile("//table/tbody");
TR_XPATH = XPATH_FACTORY.newXPath().compile("tr");
TD_XPATH = XPATH_FACTORY.newXPath().compile("td");
- } catch (XPathExpressionException e) {
+ } catch (final XPathExpressionException e) {
throw new RuntimeException(e);
}
}
- public SeleniumScript(URL scriptUrl, String url)
+ public SeleniumScript(final URL scriptUrl, final String url)
throws IOException, XPathExpressionException, SAXException, ParserConfigurationException {
try {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- DocumentBuilder parser = factory.newDocumentBuilder();
+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ final DocumentBuilder parser = factory.newDocumentBuilder();
parser.setEntityResolver(new EntityResolver() {
- public InputSource resolveEntity(String publicId, String systemId)
+ public InputSource resolveEntity(final String publicId, final String systemId)
throws SAXException, IOException {
// do not any resource resolving
return new InputSource(new StringReader(""));
}
});
- Document document = parser.parse(scriptUrl.openStream());
+ final Document document = parser.parse(scriptUrl.openStream());
addSeleniumItems(document, url);
- } catch (FileNotFoundException e) {
+ } catch (final FileNotFoundException e) {
// using default
items.add(new SeleniumScriptItem("open", url, ""));
}
}
- private void addSeleniumItems(Document document, String url) throws XPathExpressionException {
+ private void addSeleniumItems(final Document document, final String url) throws XPathExpressionException {
final Object table = XPATH_EXPRESSION.evaluate(document, XPathConstants.NODE);
final NodeList trList = (NodeList) TR_XPATH.evaluate(table, XPathConstants.NODESET);
@@ -93,9 +93,9 @@ public class SeleniumScript {
Assert.assertEquals(3, tdList.getLength());
- String command = tdList.item(0).getTextContent();
+ final String command = tdList.item(0).getTextContent();
String parameter1 = tdList.item(1).getTextContent();
- String parameter2 = tdList.item(2).getTextContent();
+ final String parameter2 = tdList.item(2).getTextContent();
if (command.equals("open")) {
// for open commands, use the filename, not the name in the script,
// because we need the script for *.jspx and *.xhtml
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumScriptItem.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumScriptItem.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumScriptItem.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumScriptItem.java Fri Nov 15 17:10:58 2013
@@ -24,7 +24,7 @@ public class SeleniumScriptItem {
private String command;
private String[] parameters;
- public SeleniumScriptItem(String command, String parameter1, String parameter2) {
+ public SeleniumScriptItem(final String command, final String parameter1, final String parameter2) {
this.command = command;
this.parameters = new String[]{parameter1, parameter2};
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java Fri Nov 15 17:10:58 2013
@@ -46,7 +46,7 @@ public abstract class SeleniumTest {
return selenium;
}
- protected static String createUrl(String page) {
+ protected static String createUrl(final String page) {
Assert.assertTrue("Page name must start with a slash.", page.startsWith("/"));
if (CONTEXT_PATH.length() == 0) {
return '/' + SERVLET_MAPPING + page;
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TestTheAutomaticSeleniumTest.java Fri Nov 15 17:10:58 2013
@@ -49,12 +49,12 @@ public class TestTheAutomaticSeleniumTes
@Test
public void areTheCorrectFilesTested() {
- List<String> metaTestList = new ArrayList<String>();
+ final List<String> metaTestList = new ArrayList<String>();
- Collection<Object[]> pages = AutomaticSeleniumTest.findPages();
- for (Object[] page : pages) {
- String url = (String) page[1];
- String prefix = "/faces/meta-test/";
+ final Collection<Object[]> pages = AutomaticSeleniumTest.findPages();
+ for (final Object[] page : pages) {
+ final String url = (String) page[1];
+ final String prefix = "/faces/meta-test/";
if (url.startsWith(prefix)) {
metaTestList.add(url.substring(prefix.length()));
}
@@ -62,7 +62,7 @@ public class TestTheAutomaticSeleniumTes
Collections.sort(metaTestList);
- String[] expected = new String[]{
+ final String[] expected = new String[]{
"meta-0-ok.jspx",
"meta-0-ok.xhtml",
"meta-2-ok.xhtml",
@@ -75,16 +75,16 @@ public class TestTheAutomaticSeleniumTes
@Test
public void test404() throws Exception {
try {
- String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-404-not-existing.xhtml");
+ final String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-404-not-existing.xhtml");
LOG.info("Testing page: '" + url + "'");
- AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
+ final AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
test.testPageConsistency();
Assert.fail("The test should fail, but wasn't.");
- } catch (AssertionError e) { // from IDE
+ } catch (final AssertionError e) { // from IDE
Assert.assertTrue(e.getMessage().contains("404 - page not found"));
- } catch (SeleniumException e) { // from mvn -Pintegration-test
+ } catch (final SeleniumException e) { // from mvn -Pintegration-test
LOG.info("Exception: '" + e.getMessage() + "'");
Assert.assertTrue(e.getMessage().contains("Response_Code = 404"));
}
@@ -93,14 +93,14 @@ public class TestTheAutomaticSeleniumTes
@Test
public void testErrorSeverity() throws Exception {
try {
- String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-1-fail.xhtml");
+ final String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-1-fail.xhtml");
LOG.info("Testing page: '" + url + "'");
- AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
+ final AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
test.testPageConsistency();
Assert.fail("The test should fail, but wasn't.");
- } catch (AssertionError e) {
+ } catch (final AssertionError e) {
if (e.getMessage().contains(TobagoSelenium.HAS_ERROR_SEVERITY)) {
// okay, the error was detected.
} else {
@@ -112,14 +112,14 @@ public class TestTheAutomaticSeleniumTes
@Test
public void testNotTobago() throws Exception {
try {
- String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-4-not-tobago.xhtml");
+ final String url = AutomaticSeleniumTest.createUrl("/meta-test/meta-4-not-tobago.xhtml");
LOG.info("Testing page: '" + url + "'");
- AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
+ final AutomaticSeleniumTest test = new AutomaticSeleniumTest(url, url);
test.testPageConsistency();
Assert.fail("The test should fail, but wasn't.");
- } catch (AssertionError e) {
+ } catch (final AssertionError e) {
if (e.getMessage().contains(TobagoSelenium.IS_BROKEN)) {
// okay, the error was detected.
} else {
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TobagoSelenium.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TobagoSelenium.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TobagoSelenium.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/TobagoSelenium.java Fri Nov 15 17:10:58 2013
@@ -32,12 +32,12 @@ public class TobagoSelenium extends Defa
private String browserUrl;
- public TobagoSelenium(String browserUrl) {
+ public TobagoSelenium(final String browserUrl) {
super(new HttpCommandProcessor("localhost", 4444, "*firefox", browserUrl));
this.browserUrl = browserUrl;
}
- public String command(String command, String parameter1, String parameter2) {
+ public String command(final String command, final String parameter1, final String parameter2) {
return commandProcessor.doCommand(command, new String[]{parameter1, parameter2});
}
@@ -56,14 +56,14 @@ public class TobagoSelenium extends Defa
if (isErrorOnPage()) {
Assert.fail(format(HAS_ERROR_SEVERITY, location, html, getErrors()));
}
- } catch (SeleniumException e) {
+ } catch (final SeleniumException e) {
Assert.fail(format(IS_BROKEN, location, html, "Not a Tobago page? Exception=" + e));
}
}
}
- public String format(String error, String location, String html, String options) {
- StringBuilder b = new StringBuilder();
+ public String format(final String error, final String location, final String html, final String options) {
+ final StringBuilder b = new StringBuilder();
b.append(error);
b.append("\nPage URL: ");
b.append(location);
@@ -90,7 +90,7 @@ public class TobagoSelenium extends Defa
* If the page is not a Tobago page, or any other problem with JavaScript or the page.
*/
protected boolean isErrorOnPage() throws SeleniumException {
- String errorSeverity = getEval("window.LOG.getMaximumSeverity() >= window.LOG.ERROR");
+ final String errorSeverity = getEval("window.LOG.getMaximumSeverity() >= window.LOG.ERROR");
return Boolean.parseBoolean(errorSeverity);
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/InRenderer.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-theme-example/src/main/java/org/apache/myfaces/tobago/renderkit/html/example/standard/tag/InRenderer.java Fri Nov 15 17:10:58 2013
@@ -43,18 +43,18 @@ import java.io.IOException;
public class InRenderer extends org.apache.myfaces.tobago.renderkit.html.scarborough.standard.tag.InRenderer{
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
+ public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
super.encodeEnd(facesContext, component);
- UIIn in = (UIIn) component;
- for (String markup : in.getMarkup()) {
+ final UIIn in = (UIIn) component;
+ for (final String markup : in.getMarkup()) {
if (markup.equals("changeaware")) {
- String id = in.getClientId(facesContext);
+ final String id = in.getClientId(facesContext);
final String[] cmds = {"new Example.ChangeAware('" + id + "');"};
HtmlRendererUtils.writeScriptLoader(facesContext, null, cmds);
}
if (markup.equals("blink")) {
- String id = in.getClientId(facesContext);
+ final String id = in.getClientId(facesContext);
final String[] cmds = {"new Example.Blinker('" + id + "');"};
HtmlRendererUtils.writeScriptLoader(facesContext, null, cmds);
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java Fri Nov 15 17:10:58 2013
@@ -48,7 +48,8 @@ public class AjaxUtils {
* @deprecated Please use AjaxInternalUtils.checkParamValidity()
*/
@Deprecated
- public static void checkParamValidity(FacesContext facesContext, UIComponent uiComponent, Class compClass) {
+ public static void checkParamValidity(
+ final FacesContext facesContext, final UIComponent uiComponent, final Class compClass) {
AjaxInternalUtils.checkParamValidity(facesContext, uiComponent, compClass);
}
@@ -56,7 +57,8 @@ public class AjaxUtils {
* @deprecated Please use AjaxInternalUtils.encodeAjaxComponent()
*/
@Deprecated
- public static void encodeAjaxComponent(FacesContext facesContext, UIComponent component) throws IOException {
+ public static void encodeAjaxComponent(final FacesContext facesContext, final UIComponent component)
+ throws IOException {
AjaxInternalUtils.encodeAjaxComponent(facesContext, component);
}
@@ -64,7 +66,7 @@ public class AjaxUtils {
* @deprecated Please use AjaxInternalUtils.parseAndStoreComponents()
*/
@Deprecated
- public static Map<String, UIComponent> parseAndStoreComponents(FacesContext facesContext) {
+ public static Map<String, UIComponent> parseAndStoreComponents(final FacesContext facesContext) {
return AjaxInternalUtils.parseAndStoreComponents(facesContext);
}
@@ -72,7 +74,7 @@ public class AjaxUtils {
* @deprecated Please use AjaxInternalUtils.getAjaxComponents()
*/
@Deprecated
- public static Map<String, UIComponent> getAjaxComponents(FacesContext facesContext) {
+ public static Map<String, UIComponent> getAjaxComponents(final FacesContext facesContext) {
return AjaxInternalUtils.getAjaxComponents(facesContext);
}
@@ -80,7 +82,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.isAjaxRequest()
*/
@Deprecated
- public static boolean isAjaxRequest(FacesContext facesContext) {
+ public static boolean isAjaxRequest(final FacesContext facesContext) {
return org.apache.myfaces.tobago.ajax.AjaxUtils.isAjaxRequest(facesContext);
}
@@ -88,7 +90,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.removeAjaxComponent()
*/
@Deprecated
- public static void removeAjaxComponent(FacesContext facesContext, String clientId) {
+ public static void removeAjaxComponent(final FacesContext facesContext, final String clientId) {
org.apache.myfaces.tobago.ajax.AjaxUtils.removeAjaxComponent(facesContext, clientId);
}
@@ -96,7 +98,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
*/
@Deprecated
- public static void addAjaxComponent(FacesContext facesContext, String clientId) {
+ public static void addAjaxComponent(final FacesContext facesContext, final String clientId) {
org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent(facesContext, clientId);
}
@@ -104,7 +106,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent()
*/
@Deprecated
- public static void addAjaxComponent(FacesContext facesContext, UIComponent component) {
+ public static void addAjaxComponent(final FacesContext facesContext, final UIComponent component) {
org.apache.myfaces.tobago.ajax.AjaxUtils.addAjaxComponent(facesContext, component);
}
@@ -112,7 +114,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils.ensureDecoded()
*/
@Deprecated
- public static void ensureDecoded(FacesContext facesContext, String clientId) {
+ public static void ensureDecoded(final FacesContext facesContext, final String clientId) {
AjaxInternalUtils.ensureDecoded(facesContext, clientId);
}
@@ -120,7 +122,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils.ensureDecoded()
*/
@Deprecated
- public static void ensureDecoded(FacesContext facesContext, UIComponent component) {
+ public static void ensureDecoded(final FacesContext facesContext, final UIComponent component) {
AjaxInternalUtils.ensureDecoded(facesContext, component);
}
@@ -128,7 +130,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.internal.ajax.AjaxInternalUtils.encodeJavaScriptString()
*/
@Deprecated
- public static String encodeJavascriptString(String value) {
+ public static String encodeJavascriptString(final String value) {
return AjaxInternalUtils.encodeJavaScriptString(value);
}
@@ -136,7 +138,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.redirect
*/
@Deprecated
- public static boolean redirect(FacesContext facesContext, String url) throws IOException {
+ public static boolean redirect(final FacesContext facesContext, final String url) throws IOException {
return org.apache.myfaces.tobago.ajax.AjaxUtils.redirect(facesContext, url);
}
@@ -144,7 +146,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.redirect
*/
@Deprecated
- public static void redirect(HttpServletResponse response, String url) throws IOException {
+ public static void redirect(final HttpServletResponse response, final String url) throws IOException {
org.apache.myfaces.tobago.ajax.AjaxUtils.redirect(response, url);
}
@@ -152,7 +154,7 @@ public class AjaxUtils {
* @deprecated Please use org.apache.myfaces.tobago.ajax.AjaxUtils.getRequestPartialIds
*/
@Deprecated
- public static Set<String> getRequestPartialIds(FacesContext context) {
+ public static Set<String> getRequestPartialIds(final FacesContext context) {
return org.apache.myfaces.tobago.ajax.AjaxUtils.getRequestPartialIds(context);
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/application/LabelValueBindingFacesMessage.java Fri Nov 15 17:10:58 2013
@@ -40,28 +40,28 @@ public class LabelValueBindingFacesMessa
}
public LabelValueBindingFacesMessage(
- Severity severity, String summary, String detail,
- Locale locale, Object... args) {
+ final Severity severity, final String summary, final String detail,
+ final Locale locale, final Object... args) {
super(severity, summary, detail);
this.locale = locale;
this.args = args;
}
- public LabelValueBindingFacesMessage(String summary, String detail) {
+ public LabelValueBindingFacesMessage(final String summary, final String detail) {
super(summary, detail);
}
- public LabelValueBindingFacesMessage(String summary) {
+ public LabelValueBindingFacesMessage(final String summary) {
super(summary);
}
@Override
public String getDetail() {
- String detail = super.getDetail();
+ final String detail = super.getDetail();
if (args != null && args.length > 0) {
if (args.length == 1 && UIComponentTag.isValueReference(args[0].toString())) {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueBinding value = facesContext.getApplication().createValueBinding(detail);
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
+ final ValueBinding value = facesContext.getApplication().createValueBinding(detail);
return MessageUtils.getFormatedMessage(detail, locale, value.getValue(facesContext));
}
return MessageUtils.getFormatedMessage(detail, locale, args);
@@ -71,11 +71,11 @@ public class LabelValueBindingFacesMessa
@Override
public String getSummary() {
- String summary = super.getSummary();
+ final String summary = super.getSummary();
if (args != null && args.length > 0) {
if (args.length == 1 && UIComponentTag.isValueReference(args[0].toString())) {
- FacesContext facesContext = FacesContext.getCurrentInstance();
- ValueBinding value = facesContext.getApplication().createValueBinding(summary);
+ final FacesContext facesContext = FacesContext.getCurrentInstance();
+ final ValueBinding value = facesContext.getApplication().createValueBinding(summary);
return MessageUtils.getFormatedMessage(summary, locale, value.getValue(facesContext));
}
return MessageUtils.getFormatedMessage(summary, locale, args);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/bean/ResourceMap.java Fri Nov 15 17:10:58 2013
@@ -41,22 +41,22 @@ public class ResourceMap extends Propert
}
}
- public void setFilename(String filename) {
+ public void setFilename(final String filename) {
if (LOG.isDebugEnabled()) {
LOG.debug("filename = '" + filename + "'");
}
try {
- InputStream is = getClass().getClassLoader().getResourceAsStream(filename);
+ final InputStream is = getClass().getClassLoader().getResourceAsStream(filename);
if (is == null) {
LOG.error("Cannot load resource map from file: " + filename);
}
load(is);
- } catch (IOException e) {
+ } catch (final IOException e) {
LOG.error("Cannot load resource map from file: " + filename, e);
}
if (LOG.isDebugEnabled()) {
LOG.debug("size() = \"" + size() + "\"");
- for (Object x : keySet()) {
+ for (final Object x : keySet()) {
LOG.debug("{}", x);
}
}
@@ -66,7 +66,7 @@ public class ResourceMap extends Propert
// because we implement Map. This hotfix enables filename setting via put().
@Override
- public Object put(Object key, Object value) {
+ public Object put(final Object key, final Object value) {
if ("filename".equals(key)) {
if (LOG.isDebugEnabled()) {
LOG.debug("put(\"filename\", \"" + value + "\")");
@@ -77,8 +77,8 @@ public class ResourceMap extends Propert
}
@Override
- public Object get(Object key) {
- Object value = super.get(key);
+ public Object get(final Object key) {
+ final Object value = super.get(key);
if (LOG.isDebugEnabled()) {
LOG.debug("Query value for key='" + key + "' -> '" + value + "'");
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/compat/FacesInvokeOnComponent12.java Fri Nov 15 17:10:58 2013
@@ -40,8 +40,8 @@ public class FacesInvokeOnComponent12 {
*/
@Deprecated
public static boolean invokeOnComponent(
- FacesContext context, UIComponent component, String clientId, ContextCallback callback) {
- String thisClientId = component.getClientId(context);
+ final FacesContext context, final UIComponent component, final String clientId, final ContextCallback callback) {
+ final String thisClientId = component.getClientId(context);
if (clientId.equals(thisClientId)) {
callback.invokeContextCallback(context, component);
@@ -71,9 +71,9 @@ public class FacesInvokeOnComponent12 {
*/
@Deprecated
private static boolean invokeOnComponentFacetsAndChildren(
- FacesContext context, UIComponent component, String clientId, ContextCallback callback) {
- for (java.util.Iterator<UIComponent> it = component.getFacetsAndChildren(); it.hasNext();) {
- UIComponent child = it.next();
+ final FacesContext context, final UIComponent component, final String clientId, final ContextCallback callback) {
+ for (final java.util.Iterator<UIComponent> it = component.getFacetsAndChildren(); it.hasNext();) {
+ final UIComponent child = it.next();
if (child.invokeOnComponent(context, clientId, callback)) {
return true;
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/compat/FacesUtils.java Fri Nov 15 17:10:58 2013
@@ -55,7 +55,7 @@ public class FacesUtils {
*/
@Deprecated
public static boolean invokeOnComponent(
- FacesContext context, UIComponent component, String clientId, ContextCallback callback) {
+ final FacesContext context, final UIComponent component, final String clientId, final ContextCallback callback) {
return FacesInvokeOnComponent12.invokeOnComponent(context, component, clientId, callback);
}
@@ -63,12 +63,13 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void invokeMethodBinding(FacesContext facesContext, MethodBinding methodBinding, FacesEvent event) {
+ public static void invokeMethodBinding(
+ final FacesContext facesContext, final MethodBinding methodBinding, final FacesEvent event) {
if (methodBinding != null && event != null) {
try {
methodBinding.invoke(facesContext, new Object[]{event});
- } catch (EvaluationException e) {
- Throwable cause = e.getCause();
+ } catch (final EvaluationException e) {
+ final Throwable cause = e.getCause();
if (cause instanceof AbortProcessingException) {
throw (AbortProcessingException) cause;
} else {
@@ -83,7 +84,7 @@ public class FacesUtils {
*/
@Deprecated
public static Object getValueFromValueBindingOrValueExpression(
- FacesContext context, UIComponent component, String name) {
+ final FacesContext context, final UIComponent component, final String name) {
return FacesUtilsEL.getValueFromValueBindingOrValueExpression(context, component, name);
}
@@ -91,7 +92,7 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static boolean hasValueBindingOrValueExpression(UIComponent component, String name) {
+ public static boolean hasValueBindingOrValueExpression(final UIComponent component, final String name) {
return FacesUtilsEL.hasValueBindingOrValueExpression(component, name);
}
@@ -100,7 +101,7 @@ public class FacesUtils {
*/
@Deprecated
public static boolean isReadonlyValueBindingOrValueExpression(
- FacesContext context, UIComponent component, String name) {
+ final FacesContext context, final UIComponent component, final String name) {
return FacesUtilsEL.isReadonlyValueBindingOrValueExpression(context, component, name);
}
@@ -108,7 +109,7 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static String getExpressionString(UIComponent component, String name) {
+ public static String getExpressionString(final UIComponent component, final String name) {
return FacesUtilsEL.getExpressionString(component, name);
}
@@ -117,7 +118,7 @@ public class FacesUtils {
*/
@Deprecated
public static void setValueOfBindingOrExpression(
- FacesContext context, Object value, UIComponent component, String bindingName) {
+ final FacesContext context, final Object value, final UIComponent component, final String bindingName) {
FacesUtilsEL.setValueOfBindingOrExpression(context, value, component, bindingName);
}
@@ -126,7 +127,7 @@ public class FacesUtils {
*/
@Deprecated
public static void setValueOfBindingOrExpression(
- FacesContext context, Object value, Object bindingOrExpression) {
+ final FacesContext context, final Object value, final Object bindingOrExpression) {
FacesUtilsEL.setValueOfBindingOrExpression(context, value, bindingOrExpression);
}
@@ -135,7 +136,7 @@ public class FacesUtils {
*/
@Deprecated
public static void copyValueBindingOrValueExpression(
- UIComponent fromComponent, String fromName, UIComponent toComponent, String toName) {
+ final UIComponent fromComponent, final String fromName, final UIComponent toComponent, final String toName) {
FacesUtilsEL.copyValueBindingOrValueExpression(fromComponent, fromName, toComponent, toName);
}
@@ -143,7 +144,7 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static Object getValueFromBindingOrExpression(Object obj) {
+ public static Object getValueFromBindingOrExpression(final Object obj) {
return FacesUtilsEL.getValueFromBindingOrExpression(obj);
}
@@ -151,7 +152,7 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static Object createExpressionOrBinding(String string) {
+ public static Object createExpressionOrBinding(final String string) {
return FacesUtilsEL.createExpressionOrBinding(string);
}
@@ -159,7 +160,7 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setValidator(EditableValueHolder editableValueHolder, Object validator) {
+ public static void setValidator(final EditableValueHolder editableValueHolder, final Object validator) {
FacesUtilsEL.setValidator(editableValueHolder, validator);
}
@@ -167,7 +168,7 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setConverter(ValueHolder valueHolder, Object converterExpression) {
+ public static void setConverter(final ValueHolder valueHolder, final Object converterExpression) {
FacesUtilsEL.setConverter(valueHolder, converterExpression);
}
@@ -175,15 +176,17 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setBindingOrExpression(UIComponent component, String name, Object valueBindingOrExpression) {
- FacesUtilsEL.setBindingOrExpression(component, name, valueBindingOrExpression);
+ public static void setBindingOrExpression(
+ final UIComponent component, final String name, final Object valueBindingOrExpression) {
+ FacesUtilsEL.setBindingOrExpression(component, name, valueBindingOrExpression);
}
/**
* @deprecated since 2.0.0
*/
@Deprecated
- public static void setBindingOrExpression(UIComponent component, String name, String valueBindingOrExpression) {
+ public static void setBindingOrExpression(
+ final UIComponent component, final String name, final String valueBindingOrExpression) {
setBindingOrExpression(component, name, createExpressionOrBinding(valueBindingOrExpression));
}
@@ -191,8 +194,8 @@ public class FacesUtils {
* @deprecated since 2.0.0
*/
@Deprecated
- public static void addBindingOrExpressionTabChangeListener(TabChangeSource source, String type,
- Object bindingOrExpression) {
+ public static void addBindingOrExpressionTabChangeListener(final TabChangeSource source, final String type,
+ final Object bindingOrExpression) {
FacesUtilsEL.addBindingOrExpressionTabChangeListener(source, type, bindingOrExpression);
}
@@ -201,31 +204,34 @@ public class FacesUtils {
*/
@Deprecated
public static Comparator getBindingOrExpressionComparator(
- FacesContext facesContext, UIComponent child, String var, boolean descending, Comparator comparator) {
- return FacesUtilsEL.getBindingOrExpressionComparator(facesContext, child, var, descending, comparator);
+ final FacesContext facesContext, final UIComponent child, final String var, final boolean descending,
+ final Comparator comparator) {
+ return FacesUtilsEL.getBindingOrExpressionComparator(facesContext, child, var, descending, comparator);
}
/**
* @deprecated since 2.0.0
*/
@Deprecated
- public static void addBindingOrExpressionPopupActionListener(ActionSource actionSource, Object bindingOrExpression) {
- FacesUtilsEL.addBindingOrExpressionPopupActionListener(actionSource, bindingOrExpression);
+ public static void addBindingOrExpressionPopupActionListener(
+ final ActionSource actionSource, final Object bindingOrExpression) {
+ FacesUtilsEL.addBindingOrExpressionPopupActionListener(actionSource, bindingOrExpression);
}
/**
* @deprecated since 2.0.0
*/
@Deprecated
- public static void addBindingOrExpressionResetActionListener(ActionSource actionSource, Object bindingOrExpression) {
- FacesUtilsEL.addBindingOrExpressionResetActionListener(actionSource, bindingOrExpression);
+ public static void addBindingOrExpressionResetActionListener(
+ final ActionSource actionSource, final Object bindingOrExpression) {
+ FacesUtilsEL.addBindingOrExpressionResetActionListener(actionSource, bindingOrExpression);
}
/**
* @deprecated since 2.0.0 Please call facesContext.getAttributes() directly.
*/
@Deprecated
- public static Map getFacesContextAttributes(FacesContext facesContext) {
+ public static Map getFacesContextAttributes(final FacesContext facesContext) {
return facesContext.getAttributes();
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java Fri Nov 15 17:10:58 2013
@@ -63,187 +63,190 @@ public class ComponentUtil {
private ComponentUtil() {
}
- public static boolean hasErrorMessages(FacesContext context) {
+ public static boolean hasErrorMessages(final FacesContext context) {
return ComponentUtils.hasErrorMessages(context);
}
- public static boolean containsPopupActionListener(javax.faces.component.UICommand command) {
+ public static boolean containsPopupActionListener(final javax.faces.component.UICommand command) {
return ComponentUtils.containsPopupActionListener(command);
}
- public static String getFacesMessageAsString(FacesContext facesContext, UIComponent component) {
+ public static String getFacesMessageAsString(final FacesContext facesContext, final UIComponent component) {
return ComponentUtils.getFacesMessageAsString(facesContext, component);
}
- public static boolean isInPopup(UIComponent component) {
+ public static boolean isInPopup(final UIComponent component) {
return ComponentUtils.isInPopup(component);
}
- public static void resetPage(FacesContext context) {
+ public static void resetPage(final FacesContext context) {
ComponentUtils.resetPage(context);
}
- public static UIPage findPage(FacesContext context, UIComponent component) {
+ public static UIPage findPage(final FacesContext context, final UIComponent component) {
return (UIPage) ComponentUtils.findPage(context, component);
}
- public static UIPage findPage(UIComponent component) {
+ public static UIPage findPage(final UIComponent component) {
return (UIPage) ComponentUtils.findPage(component);
}
- public static void addStyles(UIComponent component, String[] styles) {
+ public static void addStyles(final UIComponent component, final String[] styles) {
((TobagoFacesContext) FacesContext.getCurrentInstance()).getStyleFiles().addAll(Arrays.asList(styles));
}
- public static void addScripts(UIComponent component, String[] scripts) {
+ public static void addScripts(final UIComponent component, final String[] scripts) {
((TobagoFacesContext) FacesContext.getCurrentInstance()).getScriptFiles().addAll(Arrays.asList(scripts));
}
- public static void addOnloadCommands(UIComponent component, String[] cmds) {
+ public static void addOnloadCommands(final UIComponent component, final String[] cmds) {
((TobagoFacesContext) FacesContext.getCurrentInstance()).getOnloadScripts().addAll(Arrays.asList(cmds));
}
- public static UIPage findPage(FacesContext facesContext) {
+ public static UIPage findPage(final FacesContext facesContext) {
return (UIPage) ComponentUtils.findPage(facesContext);
}
- public static UIForm findForm(UIComponent component) {
+ public static UIForm findForm(final UIComponent component) {
return (UIForm) ComponentUtils.findForm(component);
}
- public static List<UIForm> findSubForms(UIComponent component) {
+ public static List<UIForm> findSubForms(final UIComponent component) {
return new ArrayList<UIForm>((List) ComponentUtils.findSubForms(component));
}
- public static <T extends UIComponent> T findDescendant(UIComponent component, Class<T> type) {
+ public static <T extends UIComponent> T findDescendant(final UIComponent component, final Class<T> type) {
return ComponentUtils.findDescendant(component, type);
}
- public static String findClientIdFor(UIComponent component, FacesContext facesContext) {
+ public static String findClientIdFor(final UIComponent component, final FacesContext facesContext) {
return ComponentUtils.findClientIdFor(component, facesContext);
}
- public static UIComponent findFor(UIComponent component) {
+ public static UIComponent findFor(final UIComponent component) {
return ComponentUtils.findFor(component);
}
- public static boolean isInActiveForm(UIComponent component) {
+ public static boolean isInActiveForm(final UIComponent component) {
return ComponentUtils.isInActiveForm(component);
}
- public static boolean isError(javax.faces.component.UIInput uiInput) {
+ public static boolean isError(final javax.faces.component.UIInput uiInput) {
return ComponentUtils.isError(uiInput);
}
- public static boolean isError(UIComponent component) {
+ public static boolean isError(final UIComponent component) {
return ComponentUtils.isError(component);
}
- public static boolean isOutputOnly(UIComponent component) {
+ public static boolean isOutputOnly(final UIComponent component) {
return ComponentUtils.isOutputOnly(component);
}
- public static boolean mayValidate(UIComponent component) {
+ public static boolean mayValidate(final UIComponent component) {
return ComponentUtils.mayValidate(component);
}
- public static boolean mayUpdateModel(UIComponent component) {
+ public static boolean mayUpdateModel(final UIComponent component) {
return ComponentUtils.mayUpdateModel(component);
}
- public static boolean getBooleanAttribute(UIComponent component, String name) {
+ public static boolean getBooleanAttribute(final UIComponent component, final String name) {
return ComponentUtils.getBooleanAttribute(component, name);
}
- public static void setRenderedPartially(org.apache.myfaces.tobago.component.UICommand command, String renderers) {
+ public static void setRenderedPartially(
+ final org.apache.myfaces.tobago.component.UICommand command, final String renderers) {
((SupportsRenderedPartially) command).setRenderedPartially(new String[]{renderers});
}
- public static void setStyleClasses(UIComponent component, String styleClasses) {
+ public static void setStyleClasses(final UIComponent component, final String styleClasses) {
ComponentUtils.setStyleClasses(component, styleClasses);
}
- public static void setMarkup(UIComponent markupComponent, String markup) {
+ public static void setMarkup(final UIComponent markupComponent, final String markup) {
ComponentUtils.setMarkup(markupComponent, markup);
}
- public static Object getAttribute(UIComponent component, String name) {
+ public static Object getAttribute(final UIComponent component, final String name) {
return ComponentUtils.getAttribute(component, name);
}
- public static String getStringAttribute(UIComponent component, String name) {
+ public static String getStringAttribute(final UIComponent component, final String name) {
return ComponentUtils.getStringAttribute(component, name);
}
- public static int getIntAttribute(UIComponent component, String name) {
+ public static int getIntAttribute(final UIComponent component, final String name) {
return getIntAttribute(component, name, 0);
}
- public static int getIntAttribute(UIComponent component, String name, int defaultValue) {
+ public static int getIntAttribute(final UIComponent component, final String name, final int defaultValue) {
return ComponentUtils.getIntAttribute(component, name, defaultValue);
}
- public static Character getCharacterAttribute(UIComponent component, String name) {
+ public static Character getCharacterAttribute(final UIComponent component, final String name) {
return ComponentUtils.getCharacterAttribute(component, name);
}
- public static boolean isFacetOf(UIComponent component, UIComponent parent) {
+ public static boolean isFacetOf(final UIComponent component, final UIComponent parent) {
return ComponentUtils.isFacetOf(component, parent);
}
- public static LayoutComponentRendererBase getRenderer(FacesContext facesContext, UIComponent component) {
+ public static LayoutComponentRendererBase getRenderer(final FacesContext facesContext, final UIComponent component) {
return (LayoutComponentRendererBase) ComponentUtils.getRenderer(facesContext, component);
}
- public static LayoutComponentRendererBase getRenderer(FacesContext facesContext, String family, String rendererType) {
+ public static LayoutComponentRendererBase getRenderer(
+ final FacesContext facesContext, final String family, final String rendererType) {
return (LayoutComponentRendererBase) ComponentUtils.getRenderer(facesContext, family, rendererType);
}
- public static String currentValue(UIComponent component) {
+ public static String currentValue(final UIComponent component) {
return RenderUtils.currentValue(component);
}
- public static List<SelectItem> getSelectItems(UIComponent component) {
+ public static List<SelectItem> getSelectItems(final UIComponent component) {
return RenderUtils.getSelectItems(component);
}
- public static Object findParameter(UIComponent component, String name) {
+ public static Object findParameter(final UIComponent component, final String name) {
return ComponentUtils.findParameter(component, name);
}
- public static String toString(UIComponent component, int offset) {
+ public static String toString(final UIComponent component, final int offset) {
return DebugUtils.toString(component, offset);
}
- public static ActionListener createActionListener(String type) throws JspException {
+ public static ActionListener createActionListener(final String type) throws JspException {
return ComponentUtils.createActionListener(type);
}
- public static UIGraphic getFirstGraphicChild(UIComponent component) {
+ public static UIGraphic getFirstGraphicChild(final UIComponent component) {
return ComponentUtils.getFirstGraphicChild(component);
}
-/**
- * @deprecated
- */
-@Deprecated public static boolean isHoverEnabled(UIComponent component) {
- Deprecation.LOG.error("no longer supported");
- return ComponentUtils.getBooleanAttribute(component, Attributes.HOVER);
+ /**
+ * @deprecated
+ */
+ @Deprecated
+ public static boolean isHoverEnabled(final UIComponent component) {
+ Deprecation.LOG.error("no longer supported");
+ return ComponentUtils.getBooleanAttribute(component, Attributes.HOVER);
}
- public static UIOutput getFirstNonGraphicChild(UIComponent component) {
+ public static UIOutput getFirstNonGraphicChild(final UIComponent component) {
return ComponentUtils.getFirstNonGraphicChild(component);
}
- public static void setIntegerSizeProperty(UIComponent component, String name, String value) {
+ public static void setIntegerSizeProperty(final UIComponent component, final String name, final String value) {
ComponentUtils.setIntegerSizeProperty(component, name, value);
}
- public static String removePx(String value) {
+ public static String removePx(final String value) {
return ComponentUtils.removePx(value);
}
- public static void setIntegerProperty(UIComponent component, String name, String value) {
+ public static void setIntegerProperty(final UIComponent component, final String name, final String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -253,7 +256,7 @@ public class ComponentUtil {
}
}
- public static void setBooleanProperty(UIComponent component, String name, String value) {
+ public static void setBooleanProperty(final UIComponent component, final String name, final String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -263,7 +266,7 @@ public class ComponentUtil {
}
}
- public static void setStringProperty(UIComponent component, String name, String value) {
+ public static void setStringProperty(final UIComponent component, final String name, final String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
component.setValueBinding(name, createValueBinding(value));
@@ -273,102 +276,110 @@ public class ComponentUtil {
}
}
- public static void setValueForValueBinding(String name, Object value) {
+ public static void setValueForValueBinding(final String name, final Object value) {
ComponentUtils.setValueForValueBinding(name, value);
}
- public static ValueBinding createValueBinding(String value) {
+ public static ValueBinding createValueBinding(final String value) {
return ComponentUtils.createValueBinding(value);
}
public static String getValueFromEl(String script) {
if (UIComponentTag.isValueReference(script)) {
- ValueBinding valueBinding = ComponentUtils.createValueBinding(script);
+ final ValueBinding valueBinding = ComponentUtils.createValueBinding(script);
script = (String) valueBinding.getValue(FacesContext.getCurrentInstance());
}
return script;
}
- public static UIComponent createComponent(String componentType, String rendererType, String id) {
+ public static UIComponent createComponent(final String componentType, final String rendererType, final String id) {
return CreateComponentUtils.createComponent(componentType, rendererType, id);
}
- public static UIComponent createComponent(FacesContext facesContext, String componentType,
- String rendererType, String id) {
+ public static UIComponent createComponent(
+ final FacesContext facesContext, final String componentType,
+ final String rendererType, final String id) {
return CreateComponentUtils.createComponent(facesContext, componentType, rendererType, id);
}
-
+
/**
* Please use createComponent(FacesContext facesContext, String componentType, String rendererType, String id)
*
* @deprecated
*/
@Deprecated
- public static UIComponent createComponent(FacesContext facesContext, String componentType, String rendererType) {
+ public static UIComponent createComponent(
+ final FacesContext facesContext, final String componentType, final String rendererType) {
return createComponent(facesContext, componentType, rendererType, null);
}
- public static UIColumn createTextColumn(String label, String sortable, String align, String value, String id) {
+ public static UIColumn createTextColumn(
+ final String label, final String sortable, final String align, final String value, final String id) {
return (UIColumn) CreateComponentUtils.createTextColumn(label, sortable, align, value, id);
}
- public static UIColumn createColumn(String label, String sortable, String align, UIComponent child) {
+ public static UIColumn createColumn(
+ final String label, final String sortable, final String align, final UIComponent child) {
return (UIColumn) CreateComponentUtils.createColumn(label, sortable, align, child);
}
- public static UIColumn createColumn(String label, String sortable, String align, UIComponent child, String id) {
+ public static UIColumn createColumn(
+ final String label, final String sortable, final String align, final UIComponent child, final String id) {
return (UIColumn) CreateComponentUtils.createColumn(label, sortable, align, child, id);
}
- public static UIMenuSelectOne createUIMenuSelectOneFacet(FacesContext facesContext, UICommand command, String id) {
+ public static UIMenuSelectOne createUIMenuSelectOneFacet(
+ final FacesContext facesContext, final UICommand command, final String id) {
return CreateComponentUtils.createUIMenuSelectOneFacet(facesContext, command, id);
}
- public static boolean hasSelectedValue(List<SelectItem> items, Object value) {
+ public static boolean hasSelectedValue(final List<SelectItem> items, final Object value) {
return ComponentUtils.hasSelectedValue(items, value);
}
- public static UIComponent createUISelectBooleanFacet(FacesContext facesContext, UICommand command, String id) {
+ public static UIComponent createUISelectBooleanFacet(
+ final FacesContext facesContext, final UICommand command, final String id) {
return CreateComponentUtils.createUISelectBooleanFacet(facesContext, command, id);
}
- public static int getIntValue(ValueBinding valueBinding) {
+ public static int getIntValue(final ValueBinding valueBinding) {
return ComponentUtils.getIntValue(valueBinding);
}
- public static String createPickerId(FacesContext facesContext, UIComponent component, String postfix) {
+ public static String createPickerId(
+ final FacesContext facesContext, final UIComponent component, final String postfix) {
return ComponentUtils.createPickerId(facesContext, component, postfix);
}
- public static String getComponentId(FacesContext facesContext, UIComponent component) {
+ public static String getComponentId(final FacesContext facesContext, final UIComponent component) {
return ComponentUtils.getComponentId(facesContext, component);
}
- public static UIComponent provideLabel(FacesContext facesContext, UIComponent component) {
+ public static UIComponent provideLabel(final FacesContext facesContext, final UIComponent component) {
return ComponentUtils.provideLabel(facesContext, component);
}
- public static List<SelectItem> getItemsToRender(javax.faces.component.UISelectOne component) {
+ public static List<SelectItem> getItemsToRender(final javax.faces.component.UISelectOne component) {
return RenderUtils.getItemsToRender(component);
}
- public static List<SelectItem> getItemsToRender(javax.faces.component.UISelectMany component) {
+ public static List<SelectItem> getItemsToRender(final javax.faces.component.UISelectMany component) {
return RenderUtils.getItemsToRender(component);
}
- public static void setValidator(EditableValueHolder editableValueHolder, String validator) {
+ public static void setValidator(final EditableValueHolder editableValueHolder, final String validator) {
ComponentUtils.setValidator(editableValueHolder, validator);
}
- public static void setConverter(ValueHolder valueHolder, String converterId) {
+ public static void setConverter(final ValueHolder valueHolder, final String converterId) {
ComponentUtils.setConverter(valueHolder, converterId);
}
- public static void setAction(UICommand component, String type, String action) {
+ public static void setAction(final UICommand component, final String type, final String action) {
ComponentUtils.setAction(component, action);
}
- public static void setSuggestMethodBinding(UIIn component, String suggestMethod) {
+ public static void setSuggestMethodBinding(final UIIn component, final String suggestMethod) {
if (suggestMethod != null) {
if (UIComponentTag.isValueReference(suggestMethod)) {
final MethodBinding methodBinding = FacesContext.getCurrentInstance().getApplication()
@@ -381,26 +392,26 @@ public class ComponentUtil {
}
}
- public static void setActionListener(ActionSource command, String actionListener) {
+ public static void setActionListener(final ActionSource command, final String actionListener) {
ComponentUtils.setActionListener(command, actionListener);
}
- public static void setValueChangeListener(EditableValueHolder valueHolder, String valueChangeListener) {
+ public static void setValueChangeListener(final EditableValueHolder valueHolder, final String valueChangeListener) {
ComponentUtils.setValueChangeListener(valueHolder, valueChangeListener);
}
- public static void setValueBinding(UIComponent component, String name, String state) {
+ public static void setValueBinding(final UIComponent component, final String name, final String state) {
ComponentUtils.setValueBinding(component, name, state);
}
- public static void setStateChangeListener(UISheet data, String stateChangeListener) {
+ public static void setStateChangeListener(final UISheet data, final String stateChangeListener) {
final FacesContext facesContext = FacesContext.getCurrentInstance();
final Application application = facesContext.getApplication();
if (stateChangeListener != null) {
if (UIComponentTag.isValueReference(stateChangeListener)) {
- Class[] arguments = {SheetStateChangeEvent.class};
- MethodBinding binding
+ final Class[] arguments = {SheetStateChangeEvent.class};
+ final MethodBinding binding
= application.createMethodBinding(stateChangeListener, arguments);
data.setStateChangeListener(binding);
} else {
@@ -411,11 +422,11 @@ public class ComponentUtil {
}
@Deprecated
- public static String[] getMarkupBinding(FacesContext facesContext, SupportsMarkup component) {
+ public static String[] getMarkupBinding(final FacesContext facesContext, final SupportsMarkup component) {
return ComponentUtils.getMarkupBinding(facesContext, component);
}
- public static UIComponent findComponent(UIComponent from, String relativeId) {
+ public static UIComponent findComponent(final UIComponent from, final String relativeId) {
return ComponentUtils.findComponent(from, relativeId);
}
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UIViewRoot.java Fri Nov 15 17:10:58 2013
@@ -68,9 +68,9 @@ public class UIViewRoot extends javax.fa
// private int nextUniqueId;
@Override
- public void setLocale(Locale locale) {
+ public void setLocale(final Locale locale) {
super.setLocale(locale);
- ClientProperties clientProperties = VariableResolverUtils.resolveClientProperties(getFacesContext());
+ final ClientProperties clientProperties = VariableResolverUtils.resolveClientProperties(getFacesContext());
clientProperties.setLocale(locale);
clientProperties.updateUserAgent(getFacesContext());
}
@@ -114,7 +114,7 @@ public class UIViewRoot extends javax.fa
// XXX begin of JSF 2.0 like code
- public void broadcastEventsForPhase(FacesContext context, PhaseId phaseId) {
+ public void broadcastEventsForPhase(final FacesContext context, final PhaseId phaseId) {
broadcastForPhase(phaseId);
if (context.getRenderResponse() || context.getResponseComplete()) {
clearEvents();
@@ -133,7 +133,7 @@ public class UIViewRoot extends javax.fa
//
// TODO: remove if fixed in stable release! In 1.1_02 this seems to be fixed.
- public void queueEvent(FacesEvent event) {
+ public void queueEvent(final FacesEvent event) {
if (event == null) {
throw new NullPointerException("event");
}
@@ -144,22 +144,22 @@ public class UIViewRoot extends javax.fa
}
- private void broadcastForPhase(PhaseId phaseId) {
+ private void broadcastForPhase(final PhaseId phaseId) {
if (events == null) {
return;
}
boolean abort = false;
- int phaseIdOrdinal = phaseId.getOrdinal();
- for (ListIterator<FacesEvent> listiterator = events.listIterator(); listiterator.hasNext();) {
- FacesEvent event = listiterator.next();
- int ordinal = event.getPhaseId().getOrdinal();
+ final int phaseIdOrdinal = phaseId.getOrdinal();
+ for (final ListIterator<FacesEvent> listiterator = events.listIterator(); listiterator.hasNext();) {
+ final FacesEvent event = listiterator.next();
+ final int ordinal = event.getPhaseId().getOrdinal();
if (ordinal == PhaseId.ANY_PHASE.getOrdinal() || ordinal == phaseIdOrdinal) {
- UIComponent source = event.getComponent();
+ final UIComponent source = event.getComponent();
try {
source.broadcast(event);
- } catch (FacesException e) {
+ } catch (final FacesException e) {
Throwable fe = e;
while (fe != null) {
if (fe instanceof AbortProcessingException) {
@@ -183,8 +183,8 @@ public class UIViewRoot extends javax.fa
try {
listiterator.remove();
- } catch (ConcurrentModificationException cme) {
- int eventIndex = listiterator.previousIndex();
+ } catch (final ConcurrentModificationException cme) {
+ final int eventIndex = listiterator.previousIndex();
events.remove(eventIndex);
//listiterator = events.listIterator();
}
@@ -205,14 +205,14 @@ public class UIViewRoot extends javax.fa
@Override
- public void processDecodes(FacesContext context) {
+ public void processDecodes(final FacesContext context) {
if (context == null) {
throw new NullPointerException("context");
}
- Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.parseAndStoreComponents(context);
+ final Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.parseAndStoreComponents(context);
if (ajaxComponents != null) {
// first decode the page
- AbstractUIPage page = ComponentUtils.findPage(context);
+ final AbstractUIPage page = ComponentUtils.findPage(context);
page.decode(context);
page.markSubmittedForm(context);
FacesContextUtils.setAjax(context, true);
@@ -222,7 +222,7 @@ public class UIViewRoot extends javax.fa
decodeActionComponent(context, page, ajaxComponents);
// and all ajax components
- for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
+ for (final Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
FacesContextUtils.setAjaxComponentId(context, entry.getKey());
invokeOnComponent(context, entry.getKey(), APPLY_REQUEST_VALUES_CALLBACK);
}
@@ -235,18 +235,18 @@ public class UIViewRoot extends javax.fa
}
}
- private void decodeActionComponent(FacesContext facesContext, AbstractUIPage page, Map<String,
+ private void decodeActionComponent(final FacesContext facesContext, final AbstractUIPage page, final Map<String,
UIComponent> ajaxComponents) {
- String actionId = page.getActionId();
+ final String actionId = page.getActionId();
UIComponent actionComponent = null;
if (actionId != null) {
actionComponent = findComponent(actionId);
if (actionComponent == null && FacesVersion.supports20() && FacesVersion.isMyfaces()) {
- String bugActionId = actionId.replaceAll(":\\d+:", ":");
+ final String bugActionId = actionId.replaceAll(":\\d+:", ":");
try {
actionComponent = findComponent(bugActionId);
//LOG.info("command = \"" + actionComponent + "\"", new Exception());
- } catch (Exception e) {
+ } catch (final Exception e) {
// ignore
}
}
@@ -254,7 +254,7 @@ public class UIViewRoot extends javax.fa
if (actionComponent == null) {
return;
}
- for (UIComponent ajaxComponent : ajaxComponents.values()) {
+ for (final UIComponent ajaxComponent : ajaxComponents.values()) {
UIComponent component = actionComponent;
while (component != null) {
if (component == ajaxComponent) {
@@ -268,14 +268,14 @@ public class UIViewRoot extends javax.fa
@Override
- public void processValidators(FacesContext context) {
+ public void processValidators(final FacesContext context) {
if (context == null) {
throw new NullPointerException("context");
}
- Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(context);
+ final Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(context);
if (ajaxComponents != null) {
- for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
+ for (final Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
FacesContextUtils.setAjaxComponentId(context, entry.getKey());
invokeOnComponent(context, entry.getKey(), PROCESS_VALIDATION_CALLBACK);
}
@@ -289,13 +289,13 @@ public class UIViewRoot extends javax.fa
}
@Override
- public void processUpdates(FacesContext context) {
+ public void processUpdates(final FacesContext context) {
if (context == null) {
throw new NullPointerException("context");
}
- Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(context);
+ final Map<String, UIComponent> ajaxComponents = AjaxInternalUtils.getAjaxComponents(context);
if (ajaxComponents != null) {
- for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
+ for (final Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
invokeOnComponent(context, entry.getKey(), UPDATE_MODEL_VALUES_CALLBACK);
}
} else {
@@ -308,7 +308,7 @@ public class UIViewRoot extends javax.fa
}
@Override
- public void processApplication(FacesContext context) {
+ public void processApplication(final FacesContext context) {
if (context == null) {
throw new NullPointerException("context");
}
@@ -330,7 +330,7 @@ public class UIViewRoot extends javax.fa
}
@Override
- public void encodeChildren(FacesContext context) throws IOException {
+ public void encodeChildren(final FacesContext context) throws IOException {
if (AjaxUtils.isAjaxRequest(context)) {
new AjaxResponseRenderer().renderResponse(context);
@@ -340,7 +340,7 @@ public class UIViewRoot extends javax.fa
}
@Override
- public boolean invokeOnComponent(FacesContext context, String clientId, ContextCallback callback)
+ public boolean invokeOnComponent(final FacesContext context, final String clientId, final ContextCallback callback)
throws FacesException {
return ComponentUtils.invokeOnComponent(context, this, clientId, callback);
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/config/ThemeConfig.java Fri Nov 15 17:10:58 2013
@@ -35,7 +35,7 @@ public class ThemeConfig {
* @deprecated since 1.5.0, please use ThemeConfig.getMeasure()
*/
@Deprecated
- public static int getValue(FacesContext facesContext, UIComponent component, String name) {
+ public static int getValue(final FacesContext facesContext, final UIComponent component, final String name) {
Deprecation.LOG.warn("please use ThemeConfig.getMeasure()");
return ResourceManagerFactory.getResourceManager(facesContext).getThemeMeasure(
facesContext, component.getRendererType(), null, name).getPixel();
@@ -45,7 +45,7 @@ public class ThemeConfig {
* @deprecated since 1.5.0, please use ThemeConfig.getMeasure()
*/
@Deprecated
- public static boolean hasValue(FacesContext facesContext, UIComponent component, String name) {
+ public static boolean hasValue(final FacesContext facesContext, final UIComponent component, final String name) {
Deprecation.LOG.warn("please use ThemeConfig.getMeasure()");
return ResourceManagerFactory.getResourceManager(facesContext).getThemeMeasure(
facesContext, component.getRendererType(), null, name) != null;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/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?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/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 Fri Nov 15 17:10:58 2013
@@ -36,7 +36,7 @@ import java.util.Iterator;
public class FacesContextWrapper extends javax.faces.context.FacesContext {
private FacesContext context;
- public FacesContextWrapper(FacesContext context) {
+ public FacesContextWrapper(final FacesContext context) {
this.context = context;
}
@@ -64,7 +64,7 @@ public class FacesContextWrapper extends
return context.getMessages();
}
- public Iterator getMessages(String clientId) {
+ public Iterator getMessages(final String clientId) {
return context.getMessages(clientId);
}
@@ -84,7 +84,7 @@ public class FacesContextWrapper extends
return context.getResponseStream();
}
- public void setResponseStream(ResponseStream responseStream) {
+ public void setResponseStream(final ResponseStream responseStream) {
context.setResponseStream(responseStream);
}
@@ -92,7 +92,7 @@ public class FacesContextWrapper extends
return context.getResponseWriter();
}
- public void setResponseWriter(ResponseWriter responseWriter) {
+ public void setResponseWriter(final ResponseWriter responseWriter) {
context.setResponseWriter(responseWriter);
}
@@ -100,11 +100,11 @@ public class FacesContextWrapper extends
return context.getViewRoot();
}
- public void setViewRoot(UIViewRoot root) {
+ public void setViewRoot(final UIViewRoot root) {
context.setViewRoot(root);
}
- public void addMessage(String clientId, FacesMessage message) {
+ public void addMessage(final String clientId, final FacesMessage message) {
context.addMessage(clientId, message);
}
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java?rev=1542331&r1=1542330&r2=1542331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/context/ResourceManagerFactory.java Fri Nov 15 17:10:58 2013
@@ -45,7 +45,7 @@ public class ResourceManagerFactory {
* @deprecated has been moved to internal package
*/
@Deprecated
- public static ResourceManager getResourceManager(FacesContext facesContext) {
+ public static ResourceManager getResourceManager(final FacesContext facesContext) {
return org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.getResourceManager(facesContext);
}
@@ -53,7 +53,7 @@ public class ResourceManagerFactory {
* @deprecated has been moved to internal package
*/
@Deprecated
- public static ResourceManager getResourceManager(ServletContext servletContext) {
+ public static ResourceManager getResourceManager(final ServletContext servletContext) {
return org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.getResourceManager(servletContext);
}
@@ -61,7 +61,8 @@ public class ResourceManagerFactory {
* @deprecated has been moved to internal package
*/
@Deprecated
- public static void init(ServletContext servletContext, TobagoConfigImpl tobagoConfig) throws ServletException {
+ public static void init(final ServletContext servletContext, final TobagoConfigImpl tobagoConfig)
+ throws ServletException {
org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.init(servletContext, tobagoConfig);
}
@@ -69,7 +70,7 @@ public class ResourceManagerFactory {
* @deprecated has been moved to internal package
*/
@Deprecated
- public static void release(ServletContext servletContext) {
+ public static void release(final ServletContext servletContext) {
org.apache.myfaces.tobago.internal.context.ResourceManagerFactory.release(servletContext);
}
}