You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by pa...@apache.org on 2020/07/10 13:38:04 UTC
svn commit: r1879765 [28/41] - in
/myfaces/site/publish/core22/myfaces-impl-shared: ./ apidocs/
apidocs/org/apache/myfaces/shared/application/
apidocs/org/apache/myfaces/shared/application/class-use/
apidocs/org/apache/myfaces/shared/component/ apidocs...
Modified: myfaces/site/publish/core22/myfaces-impl-shared/cpd.xml
URL: http://svn.apache.org/viewvc/myfaces/site/publish/core22/myfaces-impl-shared/cpd.xml?rev=1879765&r1=1879764&r2=1879765&view=diff
==============================================================================
--- myfaces/site/publish/core22/myfaces-impl-shared/cpd.xml (original)
+++ myfaces/site/publish/core22/myfaces-impl-shared/cpd.xml Fri Jul 10 13:37:56 2020
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<pmd-cpd>
<duplication lines="107" tokens="446">
-<file line="137" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java"/>
-<file line="169" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java"/>
+<file line="137" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java"/>
+<file line="169" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java"/>
<codefragment>
<![CDATA[
}
@@ -116,8 +116,8 @@
</codefragment>
</duplication>
<duplication lines="77" tokens="436">
-<file line="221" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
-<file line="316" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="221" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="316" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
<codefragment>
<![CDATA[
if ((commonPropertiesMarked & CommonPropertyConstants.ONDBLCLICK_PROP) != 0 ||
@@ -201,8 +201,8 @@
</codefragment>
</duplication>
<duplication lines="70" tokens="286">
-<file line="930" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
-<file line="1091" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="930" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="1091" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
<codefragment>
<![CDATA[
writer.writeURIAttribute(HTML.HREF_ATTR, targetHref, null);
@@ -279,8 +279,8 @@
</codefragment>
</duplication>
<duplication lines="65" tokens="286">
-<file line="818" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
-<file line="1014" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="818" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="1014" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
<codefragment>
<![CDATA[
writer.startElement(HTML.SPAN_ELEM, output);
@@ -351,16 +351,106 @@
]]>
</codefragment>
</duplication>
-<duplication lines="76" tokens="275">
-<file line="73" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="204" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<duplication lines="79" tokens="272">
+<file line="583" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
+<file line="144" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/SelectItemsUtils.java"/>
+<codefragment>
+<![CDATA[
+ writer.startElement(HTML.OPTION_ELEM, selectItemInfo.getComponent()); // component);
+ if (itemStrValue != null)
+ {
+ writer.writeAttribute(HTML.VALUE_ATTR, itemStrValue, null);
+ }
+ else
+ {
+ writer.writeAttribute(HTML.VALUE_ATTR, "", null);
+ }
+
+ if (selected)
+ {
+ writer.writeAttribute(HTML.SELECTED_ATTR, HTML.SELECTED_ATTR, null);
+ }
+
+ boolean disabled = selectItem.isDisabled();
+ if (disabled)
+ {
+ writer.writeAttribute(HTML.DISABLED_ATTR, HTML.DISABLED_ATTR, null);
+ }
+
+ String labelClass = null;
+
+ if (componentDisabled || disabled)
+ {
+ labelClass = (String) component.getAttributes().get(
+ JSFAttr.DISABLED_CLASS_ATTR);
+ }
+ else
+ {
+ labelClass = (String) component.getAttributes().get(
+ JSFAttr.ENABLED_CLASS_ATTR);
+ }
+ if (labelClass != null)
+ {
+ writer.writeAttribute("class", labelClass, "labelClass");
+ }
+
+ boolean escape;
+ if (component instanceof EscapeCapable)
+ {
+ escape = ((EscapeCapable) component).isEscape();
+
+ // Preserve tomahawk semantic. If escape=false
+ // all items should be non escaped. If escape
+ // is true check if selectItem.isEscape() is
+ // true and do it.
+ // This is done for remain compatibility.
+ if (escape && selectItem.isEscape())
+ {
+ writer.writeText(selectItem.getLabel(), null);
+ }
+ else
+ {
+ writer.write(selectItem.getLabel());
+ }
+ }
+ else
+ {
+ escape = RendererUtils.getBooleanAttribute(component,
+ JSFAttr.ESCAPE_ATTR, false);
+ //default is to escape
+ //In JSF 1.2, when a SelectItem is created by default
+ //selectItem.isEscape() returns true (this property
+ //is not available on JSF 1.1).
+ //so, if we found a escape property on the component
+ //set to true, escape every item, but if not
+ //check if isEscape() = true first.
+ if (escape || selectItem.isEscape())
+ {
+ writer.writeText(selectItem.getLabel(), null);
+ }
+ else
+ {
+ writer.write(selectItem.getLabel());
+ }
+ }
+
+ writer.endElement(HTML.OPTION_ELEM);
+]]>
+</codefragment>
+</duplication>
+<duplication lines="79" tokens="265">
+<file line="73" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="207" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
<codefragment>
<![CDATA[
String app;
- char c;
- for (int i = 0; i < string.length (); ++i)
+ char c = ' ';
+ char prevC;
+ int length = string.length();
+ for (int i = 0; i < length; ++i)
{
app = null;
+ prevC = c;
c = string.charAt(i);
// All characters before letters
@@ -374,7 +464,7 @@
case '>': app = ">"; break; //>
case ' ':
if (encodeSubsequentBlanksToNbsp &&
- (i == 0 || (i - 1 >= 0 && string.charAt(i - 1) == ' ')))
+ prevC == ' ')
{
//Space at beginning or after another space
app = " ";
@@ -435,96 +525,111 @@
]]>
</codefragment>
</duplication>
-<duplication lines="79" tokens="272">
-<file line="583" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
-<file line="144" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/SelectItemsUtils.java"/>
+<duplication lines="94" tokens="257">
+<file line="218" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="379" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
<codefragment>
<![CDATA[
- writer.startElement(HTML.OPTION_ELEM, selectItemInfo.getComponent()); // component);
- if (itemStrValue != null)
- {
- writer.writeAttribute(HTML.VALUE_ATTR, itemStrValue, null);
- }
- else
- {
- writer.writeAttribute(HTML.VALUE_ATTR, "", null);
- }
-
- if (selected)
+ if ((int)c < 0x41)
+ {
+ switch (c)
{
- writer.writeAttribute(HTML.SELECTED_ATTR, HTML.SELECTED_ATTR, null);
+ case '"': app = """; break; //"
+ case '&': app = "&"; break; //&
+ case '<': app = "<"; break; //<
+ case '>': app = ">"; break; //>
+ case ' ':
+ if (encodeSubsequentBlanksToNbsp &&
+ prevC == ' ')
+ {
+ //Space at beginning or after another space
+ app = " ";
+ }
+ break;
+ case '\n':
+ if (encodeNewline)
+ {
+ app = "<br/>";
+ }
+ break;
+ default:
+ break;
}
-
- boolean disabled = selectItem.isDisabled();
- if (disabled)
+ // http://www.w3.org/MarkUp/html3/specialchars.html
+ // From C0 extension U+0000-U+001F only U+0009, U+000A and
+ // U+000D are valid control characters
+ if (c <= 0x1F && c != 0x09 && c != 0x0A && c != 0x0D)
{
- writer.writeAttribute(HTML.DISABLED_ATTR, HTML.DISABLED_ATTR, null);
+ // Ignore escape character
+ app = "";
}
+ }
+ else if (encodeNonLatin && (int)c > 0x80)
+ {
+ switch(c)
+ {
+ //german umlauts
+ case '\u00E4' : app = "ä"; break;
+ case '\u00C4' : app = "Ä"; break;
+ case '\u00F6' : app = "ö"; break;
+ case '\u00D6' : app = "Ö"; break;
+ case '\u00FC' : app = "ü"; break;
+ case '\u00DC' : app = "Ü"; break;
+ case '\u00DF' : app = "ß"; break;
- String labelClass = null;
+ //misc
+ //case 0x80: app = "€"; break; sometimes euro symbol is ascii 128, should we suport it?
+ case '\u20AC': app = "€"; break;
+ case '\u00AB': app = "«"; break;
+ case '\u00BB': app = "»"; break;
+ case '\u00A0': app = " "; break;
- if (componentDisabled || disabled)
- {
- labelClass = (String) component.getAttributes().get(
- JSFAttr.DISABLED_CLASS_ATTR);
- }
- else
- {
- labelClass = (String) component.getAttributes().get(
- JSFAttr.ENABLED_CLASS_ATTR);
- }
- if (labelClass != null)
- {
- writer.writeAttribute("class", labelClass, "labelClass");
+ default :
+ //encode all non basic latin characters
+ app = "&#" + ((int)c) + ";";
+ break;
}
-
- boolean escape;
- if (component instanceof EscapeCapable)
+ }
+ if (app != null)
+ {
+ //if (sb == null)
+ //{
+ // sb = new StringBuilder(realLength*2);
+ // sb.append(string, offset, i - offset);
+ //}
+ //sb.append(app);
+ if (start < i)
{
- escape = ((EscapeCapable) component).isEscape();
-
- // Preserve tomahawk semantic. If escape=false
- // all items should be non escaped. If escape
- // is true check if selectItem.isEscape() is
- // true and do it.
- // This is done for remain compatibility.
- if (escape && selectItem.isEscape())
- {
- writer.writeText(selectItem.getLabel(), null);
- }
- else
- {
- writer.write(selectItem.getLabel());
- }
+ writer.write(string, start, i-start);
}
- else
+ start = i+1;
+ writer.write(app);
+ }
+ /*
+ else
+ {
+ if (sb != null)
{
- escape = RendererUtils.getBooleanAttribute(component,
- JSFAttr.ESCAPE_ATTR, false);
- //default is to escape
- //In JSF 1.2, when a SelectItem is created by default
- //selectItem.isEscape() returns true (this property
- //is not available on JSF 1.1).
- //so, if we found a escape property on the component
- //set to true, escape every item, but if not
- //check if isEscape() = true first.
- if (escape || selectItem.isEscape())
- {
- writer.writeText(selectItem.getLabel(), null);
- }
- else
- {
- writer.write(selectItem.getLabel());
- }
+ sb.append(c);
}
+ }*/
+ }
- writer.endElement(HTML.OPTION_ELEM);
+ //if (sb == null)
+ //{
+ // writer.write(string, offset, realLength);
+ //}
+ //else
+ //{
+ // writer.write(sb.toString());
+ //}
+ if (start == offset)
]]>
</codefragment>
</duplication>
<duplication lines="70" tokens="253">
-<file line="289" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java"/>
-<file line="385" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java"/>
+<file line="289" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java"/>
+<file line="385" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java"/>
<codefragment>
<![CDATA[
{
@@ -601,8 +706,8 @@
</codefragment>
</duplication>
<duplication lines="55" tokens="236">
-<file line="43" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
-<file line="2233" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
+<file line="43" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="2233" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
<codefragment>
<![CDATA[
}
@@ -664,8 +769,8 @@
</codefragment>
</duplication>
<duplication lines="63" tokens="232">
-<file line="436" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java"/>
-<file line="697" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="436" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java"/>
+<file line="697" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
<codefragment>
<![CDATA[
String name = param.getName();
@@ -734,9 +839,86 @@
]]>
</codefragment>
</duplication>
+<duplication lines="69" tokens="222">
+<file line="84" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="379" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<codefragment>
+<![CDATA[
+ if ((int)c < 0x41)
+ {
+ switch (c)
+ {
+ case '"': app = """; break; //"
+ case '&': app = "&"; break; //&
+ case '<': app = "<"; break; //<
+ case '>': app = ">"; break; //>
+ case ' ':
+ if (encodeSubsequentBlanksToNbsp &&
+ prevC == ' ')
+ {
+ //Space at beginning or after another space
+ app = " ";
+ }
+ break;
+ case '\n':
+ if (encodeNewline)
+ {
+ app = "<br/>";
+ }
+ break;
+ default:
+ break;
+ }
+ // http://www.w3.org/MarkUp/html3/specialchars.html
+ // From C0 extension U+0000-U+001F only U+0009, U+000A and
+ // U+000D are valid control characters
+ if (c <= 0x1F && c != 0x09 && c != 0x0A && c != 0x0D)
+ {
+ // Ignore escape character
+ app = "";
+ }
+ }
+ else if (encodeNonLatin && (int)c > 0x80)
+ {
+ switch(c)
+ {
+ //german umlauts
+ case '\u00E4' : app = "ä"; break;
+ case '\u00C4' : app = "Ä"; break;
+ case '\u00F6' : app = "ö"; break;
+ case '\u00D6' : app = "Ö"; break;
+ case '\u00FC' : app = "ü"; break;
+ case '\u00DC' : app = "Ü"; break;
+ case '\u00DF' : app = "ß"; break;
+
+ //misc
+ //case 0x80: app = "€"; break; sometimes euro symbol is ascii 128, should we suport it?
+ case '\u20AC': app = "€"; break;
+ case '\u00AB': app = "«"; break;
+ case '\u00BB': app = "»"; break;
+ case '\u00A0': app = " "; break;
+
+ default :
+ //encode all non basic latin characters
+ app = "&#" + ((int)c) + ";";
+ break;
+ }
+ }
+ if (app != null)
+ {
+ //if (sb == null)
+ //{
+ // sb = new StringBuilder(realLength*2);
+ // sb.append(string, offset, i - offset);
+ //}
+ //sb.append(app);
+ if (start < i)
+]]>
+</codefragment>
+</duplication>
<duplication lines="20" tokens="216">
-<file line="372" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java"/>
-<file line="301" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
+<file line="372" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessageRendererBase.java"/>
+<file line="301" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
<codefragment>
<![CDATA[
Map attr = messages.getAttributes();
@@ -762,20 +944,21 @@
]]>
</codefragment>
</duplication>
-<duplication lines="41" tokens="212">
-<file line="75" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceValidationUtils.java"/>
-<file line="140" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceValidationUtils.java"/>
+<duplication lines="42" tokens="212">
+<file line="75" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceValidationUtils.java"/>
+<file line="140" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceValidationUtils.java"/>
<codefragment>
<![CDATA[
private static boolean validateResourceName(String expression, boolean allowSlash)
{
- if (expression.length() == 2 &&
+ int length = expression.length();
+ if (length == 2 &&
expression.charAt(0) == '.' &&
expression.charAt(1) == '.')
{
return false;
}
- for (int i = 0; i < expression.length(); i++)
+ for (int i = 0; i < length; i++)
{
char c = expression.charAt(i);
@@ -812,8 +995,8 @@
</codefragment>
</duplication>
<duplication lines="55" tokens="209">
-<file line="278" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java"/>
-<file line="368" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java"/>
+<file line="278" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java"/>
+<file line="368" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java"/>
<codefragment>
<![CDATA[
}
@@ -874,101 +1057,9 @@
]]>
</codefragment>
</duplication>
-<duplication lines="84" tokens="208">
-<file line="222" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="381" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<codefragment>
-<![CDATA[
- (i == 0 || (i - 1 >= 0 && string[i - 1] == ' ')))
- {
- //Space at beginning or after another space
- app = " ";
- }
- break;
- case '\n':
- if (encodeNewline)
- {
- app = "<br/>";
- }
- break;
- default:
- break;
- }
- // http://www.w3.org/MarkUp/html3/specialchars.html
- // From C0 extension U+0000-U+001F only U+0009, U+000A and
- // U+000D are valid control characters
- if (c <= 0x1F && c != 0x09 && c != 0x0A && c != 0x0D)
- {
- // Ignore escape character
- app = "";
- }
- }
- else if (encodeNonLatin && (int)c > 0x80)
- {
- switch(c)
- {
- //german umlauts
- case '\u00E4' : app = "ä"; break;
- case '\u00C4' : app = "Ä"; break;
- case '\u00F6' : app = "ö"; break;
- case '\u00D6' : app = "Ö"; break;
- case '\u00FC' : app = "ü"; break;
- case '\u00DC' : app = "Ü"; break;
- case '\u00DF' : app = "ß"; break;
-
- //misc
- //case 0x80: app = "€"; break; sometimes euro symbol is ascii 128, should we suport it?
- case '\u20AC': app = "€"; break;
- case '\u00AB': app = "«"; break;
- case '\u00BB': app = "»"; break;
- case '\u00A0': app = " "; break;
-
- default :
- //encode all non basic latin characters
- app = "&#" + ((int)c) + ";";
- break;
- }
- }
- if (app != null)
- {
- //if (sb == null)
- //{
- // sb = new StringBuilder(realLength*2);
- // sb.append(string, offset, i - offset);
- //}
- //sb.append(app);
- if (start < i)
- {
- writer.write(string, start, i-start);
- }
- start = i+1;
- writer.write(app);
- }
- /*
- else
- {
- if (sb != null)
- {
- sb.append(c);
- }
- }*/
- }
-
- //if (sb == null)
- //{
- // writer.write(string, offset, realLength);
- //}
- //else
- //{
- // writer.write(sb.toString());
- //}
- if (start == offset)
-]]>
-</codefragment>
-</duplication>
<duplication lines="44" tokens="201">
-<file line="105" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java"/>
-<file line="79" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java"/>
+<file line="105" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java"/>
+<file line="79" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java"/>
<codefragment>
<![CDATA[
writer.writeAttribute(HTML.SIZE_ATTR, Integer.toString(size), null);
@@ -1019,8 +1110,8 @@
</codefragment>
</duplication>
<duplication lines="69" tokens="189">
-<file line="75" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java"/>
-<file line="56" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java"/>
+<file line="75" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java"/>
+<file line="56" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java"/>
<codefragment>
<![CDATA[
public ExceptionHandlerImpl()
@@ -1096,8 +1187,8 @@
</codefragment>
</duplication>
<duplication lines="34" tokens="183">
-<file line="367" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
-<file line="416" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
+<file line="367" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
+<file line="416" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
<codefragment>
<![CDATA[
{
@@ -1138,8 +1229,8 @@
</codefragment>
</duplication>
<duplication lines="28" tokens="178">
-<file line="474" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
-<file line="624" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="474" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="624" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
<codefragment>
<![CDATA[
if (RendererUtils.isAdfOrTrinidadForm(formInfo.getForm()))
@@ -1174,8 +1265,8 @@
</codefragment>
</duplication>
<duplication lines="41" tokens="178">
-<file line="206" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
-<file line="180" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
+<file line="206" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
+<file line="180" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
<codefragment>
<![CDATA[
UISelectOne selectOne = (UISelectOne)uiComponent;
@@ -1222,76 +1313,9 @@
]]>
</codefragment>
</duplication>
-<duplication lines="59" tokens="173">
-<file line="91" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="381" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<codefragment>
-<![CDATA[
- (i == 0 || (i - 1 >= 0 && string[i - 1] == ' ')))
- {
- //Space at beginning or after another space
- app = " ";
- }
- break;
- case '\n':
- if (encodeNewline)
- {
- app = "<br/>";
- }
- break;
- default:
- break;
- }
- // http://www.w3.org/MarkUp/html3/specialchars.html
- // From C0 extension U+0000-U+001F only U+0009, U+000A and
- // U+000D are valid control characters
- if (c <= 0x1F && c != 0x09 && c != 0x0A && c != 0x0D)
- {
- // Ignore escape character
- app = "";
- }
- }
- else if (encodeNonLatin && (int)c > 0x80)
- {
- switch(c)
- {
- //german umlauts
- case '\u00E4' : app = "ä"; break;
- case '\u00C4' : app = "Ä"; break;
- case '\u00F6' : app = "ö"; break;
- case '\u00D6' : app = "Ö"; break;
- case '\u00FC' : app = "ü"; break;
- case '\u00DC' : app = "Ü"; break;
- case '\u00DF' : app = "ß"; break;
-
- //misc
- //case 0x80: app = "€"; break; sometimes euro symbol is ascii 128, should we suport it?
- case '\u20AC': app = "€"; break;
- case '\u00AB': app = "«"; break;
- case '\u00BB': app = "»"; break;
- case '\u00A0': app = " "; break;
-
- default :
- //encode all non basic latin characters
- app = "&#" + ((int)c) + ";";
- break;
- }
- }
- if (app != null)
- {
- //if (sb == null)
- //{
- // sb = new StringBuilder(realLength*2);
- // sb.append(string, offset, i - offset);
- //}
- //sb.append(app);
- if (start < i)
-]]>
-</codefragment>
-</duplication>
<duplication lines="35" tokens="168">
-<file line="113" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java"/>
-<file line="94" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java"/>
+<file line="113" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java"/>
+<file line="94" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextareaRendererBase.java"/>
<codefragment>
<![CDATA[
long commonPropertiesMarked = 0L;
@@ -1333,8 +1357,8 @@
</codefragment>
</duplication>
<duplication lines="67" tokens="165">
-<file line="287" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java"/>
-<file line="158" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/resource/BaseResourceHandlerSupport.java"/>
+<file line="287" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/application/DefaultViewHandlerSupport.java"/>
+<file line="158" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/resource/BaseResourceHandlerSupport.java"/>
<codefragment>
<![CDATA[
}
@@ -1408,8 +1432,8 @@
</codefragment>
</duplication>
<duplication lines="35" tokens="164">
-<file line="122" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java"/>
-<file line="119" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java"/>
+<file line="122" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlListboxRendererBase.java"/>
+<file line="119" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMenuRendererBase.java"/>
<codefragment>
<![CDATA[
org.apache.myfaces.shared.renderkit.RendererUtils.checkParamValidity(facesContext, uiComponent, null);
@@ -1451,8 +1475,8 @@
</codefragment>
</duplication>
<duplication lines="75" tokens="160">
-<file line="43" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/view/HttpServletResponseSwitch.java"/>
-<file line="42" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/view/ServletResponseSwitch.java"/>
+<file line="43" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/view/HttpServletResponseSwitch.java"/>
+<file line="42" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/view/ServletResponseSwitch.java"/>
<codefragment>
<![CDATA[
public ServletResponseSwitch(ServletResponse response)
@@ -1534,8 +1558,8 @@
</codefragment>
</duplication>
<duplication lines="29" tokens="158">
-<file line="434" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
-<file line="373" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
+<file line="434" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
+<file line="373" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
<codefragment>
<![CDATA[
HtmlRendererUtils.renderBehaviorizedOnchangeEventHandler(facesContext, writer, uiComponent,
@@ -1571,8 +1595,8 @@
</codefragment>
</duplication>
<duplication lines="34" tokens="154">
-<file line="828" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
-<file line="940" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="828" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
+<file line="940" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java"/>
<codefragment>
<![CDATA[
HtmlRendererUtils.writeIdAndNameIfNecessary(writer, output, facesContext);
@@ -1612,51 +1636,9 @@
]]>
</codefragment>
</duplication>
-<duplication lines="34" tokens="152">
-<file line="104" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceValidationUtils.java"/>
-<file line="185" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceValidationUtils.java"/>
-<codefragment>
-<![CDATA[
- (c == '@') || (c == '[') || (c == ']' ) || (c == '{') || (c == '}'))
- {
- continue;
- }
- else if (c == '.')
- {
- if (i+2 < expression.length())
- {
- char c1 = expression.charAt(i+1);
- char c2 = expression.charAt(i+2);
- if (c == c1 && (c2 == '/' || c2 == '\\' ) )
- {
- return false;
- }
- }
- continue;
- }
- else
- {
- return false;
- }
- }
- if (expression.length() >= 3)
- {
- int length = expression.length();
- if ( (expression.charAt(length-3) == '/' || expression.charAt(length-3) == '\\' ) &&
- expression.charAt(length-2) == '.' &&
- expression.charAt(length-1) == '.' )
- {
- return false;
- }
- }
- return true;
- }
-]]>
-</codefragment>
-</duplication>
<duplication lines="24" tokens="148">
-<file line="406" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
-<file line="436" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="406" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="436" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
<codefragment>
<![CDATA[
if ((commonPropertiesMarked & CommonPropertyConstants.ONBLUR_PROP) != 0 ||
@@ -1686,39 +1668,9 @@
]]>
</codefragment>
</duplication>
-<duplication lines="22" tokens="146">
-<file line="1029" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="1240" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<codefragment>
-<![CDATA[
- percentEncode(writer, c, characterEncoding);
- }
- else if (c == '%')
- {
- if (i + 2 < string.length())
- {
- char c1 = string.charAt(i+1);
- char c2 = string.charAt(i+2);
- if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z') || (c1 >='a' && c1 <='z')) &&
- (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z') || (c2 >='a' && c2 <='z')))
- {
- // do not percent encode, because it could be already encoded
- }
- else
- {
- //app = percentEncode(c, characterEncoding);
- if (start < i)
- {
- writer.write(string, start, i-start);
- }
- start = i+1;
- percentEncode(writer, c, characterEncoding);
-]]>
-</codefragment>
-</duplication>
<duplication lines="25" tokens="143">
-<file line="159" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
-<file line="212" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
+<file line="159" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
+<file line="212" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
<codefragment>
<![CDATA[
writer.startElement(HTML.TABLE_ELEM, messages);
@@ -1749,9 +1701,39 @@
]]>
</codefragment>
</duplication>
+<duplication lines="22" tokens="142">
+<file line="1040" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="1252" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<codefragment>
+<![CDATA[
+ percentEncode(writer, c, characterEncoding);
+ }
+ else if (c == '%')
+ {
+ if (i + 2 < length)
+ {
+ char c1 = string.charAt(i+1);
+ char c2 = string.charAt(i+2);
+ if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z') || (c1 >='a' && c1 <='z')) &&
+ (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z') || (c2 >='a' && c2 <='z')))
+ {
+ // do not percent encode, because it could be already encoded
+ }
+ else
+ {
+ //app = percentEncode(c, characterEncoding);
+ if (start < i)
+ {
+ writer.write(string, start, i-start);
+ }
+ start = i+1;
+ percentEncode(writer, c, characterEncoding);
+]]>
+</codefragment>
+</duplication>
<duplication lines="43" tokens="138">
-<file line="239" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java"/>
-<file line="286" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java"/>
+<file line="239" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlInputFileRendererBase.java"/>
+<file line="286" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTextRendererBase.java"/>
<codefragment>
<![CDATA[
writer.writeAttribute(HTML.VALUE_ATTR, value, JSFAttr.VALUE_ATTR);
@@ -1800,9 +1782,50 @@
]]>
</codefragment>
</duplication>
+<duplication lines="33" tokens="136">
+<file line="105" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceValidationUtils.java"/>
+<file line="186" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/resource/ResourceValidationUtils.java"/>
+<codefragment>
+<![CDATA[
+ (c == '@') || (c == '[') || (c == ']' ) || (c == '{') || (c == '}'))
+ {
+ continue;
+ }
+ else if (c == '.')
+ {
+ if (i+2 < length)
+ {
+ char c1 = expression.charAt(i+1);
+ char c2 = expression.charAt(i+2);
+ if (c == c1 && (c2 == '/' || c2 == '\\' ) )
+ {
+ return false;
+ }
+ }
+ continue;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ if (length >= 3)
+ {
+ if ( (expression.charAt(length-3) == '/' || expression.charAt(length-3) == '\\' ) &&
+ expression.charAt(length-2) == '.' &&
+ expression.charAt(length-1) == '.' )
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+]]>
+</codefragment>
+</duplication>
<duplication lines="22" tokens="136">
-<file line="392" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
-<file line="471" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="392" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="471" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
<codefragment>
<![CDATA[
public static void renderBehaviorizedFieldEventHandlersWithoutOnchange(
@@ -1831,8 +1854,8 @@
</codefragment>
</duplication>
<duplication lines="23" tokens="131">
-<file line="520" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java"/>
-<file line="560" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java"/>
+<file line="520" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java"/>
+<file line="560" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/util/ConcurrentLRUCache.java"/>
<codefragment>
<![CDATA[
public Map<K, V> getLatestAccessedItems(int n)
@@ -1862,8 +1885,8 @@
</codefragment>
</duplication>
<duplication lines="21" tokens="129">
-<file line="392" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
-<file line="515" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="392" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
+<file line="515" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/CommonEventUtils.java"/>
<codefragment>
<![CDATA[
public static void renderBehaviorizedFieldEventHandlersWithoutOnchangeAndOnselect(
@@ -1891,8 +1914,8 @@
</codefragment>
</duplication>
<duplication lines="52" tokens="126">
-<file line="284" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java"/>
-<file line="194" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java"/>
+<file line="284" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java"/>
+<file line="194" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java"/>
<codefragment>
<![CDATA[
}
@@ -1951,8 +1974,8 @@
</codefragment>
</duplication>
<duplication lines="28" tokens="124">
-<file line="305" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java"/>
-<file line="459" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java"/>
+<file line="305" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java"/>
+<file line="459" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/util/StateUtils.java"/>
<codefragment>
<![CDATA[
public static byte[] decrypt(byte[] secure, ExternalContext ctx)
@@ -1986,16 +2009,16 @@
]]>
</codefragment>
</duplication>
-<duplication lines="16" tokens="121">
-<file line="631" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="790" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<duplication lines="16" tokens="117">
+<file line="640" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="800" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
<codefragment>
<![CDATA[
app = percentEncode(c, characterEncoding);
}
else if (c == '%')
{
- if (i + 2 < string.length())
+ if (i + 2 < length)
{
char c1 = string.charAt(i+1);
char c2 = string.charAt(i+2);
@@ -2010,16 +2033,50 @@
]]>
</codefragment>
</duplication>
-<duplication lines="15" tokens="118">
-<file line="790" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="1240" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<duplication lines="26" tokens="116">
+<file line="326" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
+<file line="305" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
+<codefragment>
+<![CDATA[
+ UIInput uiComponent,
+ String value,
+ boolean disabled,
+ boolean checked,
+ boolean renderId,
+ Integer itemNum)
+ throws IOException
+ {
+ String clientId = uiComponent.getClientId(facesContext);
+
+ String itemId = (itemNum == null)? null : clientId +
+ facesContext.getNamingContainerSeparatorChar() + itemNum;
+
+ ResponseWriter writer = facesContext.getResponseWriter();
+
+ writer.startElement(HTML.INPUT_ELEM, uiComponent);
+
+ if (itemId != null)
+ {
+ writer.writeAttribute(HTML.ID_ATTR, itemId, null);
+ }
+ else if (renderId)
+ {
+ writer.writeAttribute(HTML.ID_ATTR, clientId, null);
+ }
+ writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_RADIO, null);
+]]>
+</codefragment>
+</duplication>
+<duplication lines="15" tokens="114">
+<file line="800" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="1252" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
<codefragment>
<![CDATA[
percentEncode(writer, c, characterEncoding);
}
else if (c == '%')
{
- if (i + 2 < string.length())
+ if (i + 2 < length)
{
char c1 = string.charAt(i+1);
char c2 = string.charAt(i+2);
@@ -2033,16 +2090,16 @@
]]>
</codefragment>
</duplication>
-<duplication lines="16" tokens="118">
-<file line="631" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="1029" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<duplication lines="16" tokens="114">
+<file line="640" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="1040" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
<codefragment>
<![CDATA[
percentEncode(writer, c, "UTF-8");
}
else if (c == '%')
{
- if (i + 2 < string.length())
+ if (i + 2 < length)
{
char c1 = string.charAt(i+1);
char c2 = string.charAt(i+2);
@@ -2057,43 +2114,9 @@
]]>
</codefragment>
</duplication>
-<duplication lines="26" tokens="116">
-<file line="326" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java"/>
-<file line="305" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
-<codefragment>
-<![CDATA[
- UIInput uiComponent,
- String value,
- boolean disabled,
- boolean checked,
- boolean renderId,
- Integer itemNum)
- throws IOException
- {
- String clientId = uiComponent.getClientId(facesContext);
-
- String itemId = (itemNum == null)? null : clientId +
- facesContext.getNamingContainerSeparatorChar() + itemNum;
-
- ResponseWriter writer = facesContext.getResponseWriter();
-
- writer.startElement(HTML.INPUT_ELEM, uiComponent);
-
- if (itemId != null)
- {
- writer.writeAttribute(HTML.ID_ATTR, itemId, null);
- }
- else if (renderId)
- {
- writer.writeAttribute(HTML.ID_ATTR, clientId, null);
- }
- writer.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_RADIO, null);
-]]>
-</codefragment>
-</duplication>
<duplication lines="21" tokens="114">
-<file line="361" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
-<file line="39" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java"/>
+<file line="361" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
+<file line="39" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java"/>
<codefragment>
<![CDATA[
protected void internalRenderSelect(FacesContext facesContext,
@@ -2121,8 +2144,8 @@
</codefragment>
</duplication>
<duplication lines="25" tokens="113">
-<file line="349" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
-<file line="79" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java"/>
+<file line="349" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
+<file line="79" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSelectableRendererBase.java"/>
<codefragment>
<![CDATA[
writer.writeAttribute(HTML.SIZE_ATTR, Integer.toString(size), null);
@@ -2154,8 +2177,8 @@
</codefragment>
</duplication>
<duplication lines="18" tokens="112">
-<file line="178" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java"/>
-<file line="155" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java"/>
+<file line="178" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/context/AjaxExceptionHandlerImpl.java"/>
+<file line="155" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/context/ExceptionHandlerImpl.java"/>
<codefragment>
<![CDATA[
}
@@ -2179,9 +2202,33 @@
]]>
</codefragment>
</duplication>
+<duplication lines="16" tokens="111">
+<file line="800" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="1040" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<codefragment>
+<![CDATA[
+ percentEncode(writer, c, "UTF-8");
+ }
+ else if (c == '%')
+ {
+ if (i + 2 < length)
+ {
+ char c1 = string.charAt(i+1);
+ char c2 = string.charAt(i+2);
+ if ((( c1 >= '0' && c1 <='9') || (c1 >='A' && c1 <='Z') || (c1 >='a' && c1 <='z')) &&
+ (( c2 >= '0' && c2 <='9') || (c2 >='A' && c2 <='Z') || (c2 >='a' && c2 <='z')))
+ {
+ // do not percent encode, because it could be already encoded
+ // and we don't want encode it twice
+ }
+ else
+ {
+]]>
+</codefragment>
+</duplication>
<duplication lines="25" tokens="111">
-<file line="349" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
-<file line="105" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java"/>
+<file line="349" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java"/>
+<file line="105" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlSecretRendererBase.java"/>
<codefragment>
<![CDATA[
writer.writeAttribute(HTML.VALUE_ATTR, strValue, JSFAttr.VALUE_ATTR);
@@ -2213,8 +2260,8 @@
</codefragment>
</duplication>
<duplication lines="23" tokens="109">
-<file line="115" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java"/>
-<file line="151" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java"/>
+<file line="115" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java"/>
+<file line="151" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/UnicodeEncoder.java"/>
<codefragment>
<![CDATA[
if (((int)c) >= 0x80)
@@ -2243,65 +2290,9 @@
]]>
</codefragment>
</duplication>
-<duplication lines="20" tokens="107">
-<file line="1377" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
-<file line="1408" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
-<codefragment>
-<![CDATA[
- UIComponent component, String forClientId, SelectItem item,
- boolean disabled) throws IOException
- {
- writer.startElement(HTML.LABEL_ELEM, null); // component);
- writer.writeAttribute(HTML.FOR_ATTR, forClientId, null);
- String labelClass = null;
- if (disabled)
- {
- labelClass = (String) component.getAttributes().get(JSFAttr.DISABLED_CLASS_ATTR);
- }
- else
- {
- labelClass = (String) component.getAttributes()
- .get(org.apache.myfaces.shared.renderkit.JSFAttr.ENABLED_CLASS_ATTR);
- }
- if (labelClass != null)
- {
- writer.writeAttribute("class", labelClass, "labelClass");
- }
- if ((item.getLabel() != null) && (item.getLabel().length() > 0))
-]]>
-</codefragment>
-</duplication>
-<duplication lines="20" tokens="105">
-<file line="283" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java"/>
-<file line="323" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java"/>
-<codefragment>
-<![CDATA[
- private Integer[] getBodyRows(FacesContext facesContext, UIComponent component)
- {
- Integer[] bodyrows = null;
- String bodyrowsAttr = (String) component.getAttributes().get(JSFAttr.BODYROWS_ATTR);
- if(bodyrowsAttr != null && !"".equals(bodyrowsAttr))
- {
- String[] bodyrowsString = StringUtils.trim(StringUtils.splitShortString(bodyrowsAttr, ','));
- // parsing with no exception handling, because of JSF-spec:
- // "If present, this must be a comma separated list of integers."
- bodyrows = new Integer[bodyrowsString.length];
- for(int i = 0; i < bodyrowsString.length; i++)
- {
- bodyrows[i] = Integer.valueOf(bodyrowsString[i]);
- }
-
- }
- else
- {
- bodyrows = ZERO_INT_ARRAY;
- }
-]]>
-</codefragment>
-</duplication>
-<duplication lines="31" tokens="104">
-<file line="489" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="760" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<duplication lines="32" tokens="108">
+<file line="497" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="769" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
<codefragment>
<![CDATA[
{
@@ -2309,7 +2300,8 @@
String app;
char c;
boolean endLoop = false;
- for (int i = 0; i < string.length (); ++i)
+ int length = string.length();
+ for (int i = 0; i < length; ++i)
{
app = null;
c = string.charAt(i);
@@ -2338,12 +2330,40 @@
]]>
</codefragment>
</duplication>
-<duplication lines="32" tokens="103">
-<file line="886" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="1209" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<duplication lines="20" tokens="107">
+<file line="1377" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
+<file line="1408" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java"/>
+<codefragment>
+<![CDATA[
+ UIComponent component, String forClientId, SelectItem item,
+ boolean disabled) throws IOException
+ {
+ writer.startElement(HTML.LABEL_ELEM, null); // component);
+ writer.writeAttribute(HTML.FOR_ATTR, forClientId, null);
+ String labelClass = null;
+ if (disabled)
+ {
+ labelClass = (String) component.getAttributes().get(JSFAttr.DISABLED_CLASS_ATTR);
+ }
+ else
+ {
+ labelClass = (String) component.getAttributes()
+ .get(org.apache.myfaces.shared.renderkit.JSFAttr.ENABLED_CLASS_ATTR);
+ }
+ if (labelClass != null)
+ {
+ writer.writeAttribute("class", labelClass, "labelClass");
+ }
+ if ((item.getLabel() != null) && (item.getLabel().length() > 0))
+]]>
+</codefragment>
+</duplication>
+<duplication lines="32" tokens="106">
+<file line="897" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<file line="1221" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
<codefragment>
<![CDATA[
- for (int i = offset; i < offset+realLength; ++i)
+ for (int i = offset; i < length; ++i)
{
app = null;
c = string.charAt(i);
@@ -2378,54 +2398,37 @@
]]>
</codefragment>
</duplication>
-<duplication lines="37" tokens="101">
-<file line="810" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
-<file line="1272" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/util/HTMLEncoder.java"/>
+<duplication lines="20" tokens="105">
+<file line="283" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java"/>
+<file line="323" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java"/>
<codefragment>
<![CDATA[
- percentEncode(writer, c, characterEncoding);
- }
- }
- else if (c == '&')
- {
- if (i+4 < string.length() )
- {
- if ('a' == string.charAt(i+1) &&
- 'm' == string.charAt(i+2) &&
- 'p' == string.charAt(i+3) &&
- ';' == string.charAt(i+4))
- {
- //Skip
- }
- else
- {
- app = "&";
- }
- }
- else
- {
- app = "&";
- }
- }
- else
+ private Integer[] getBodyRows(FacesContext facesContext, UIComponent component)
+ {
+ Integer[] bodyrows = null;
+ String bodyrowsAttr = (String) component.getAttributes().get(JSFAttr.BODYROWS_ATTR);
+ if(bodyrowsAttr != null && !"".equals(bodyrowsAttr))
+ {
+ String[] bodyrowsString = StringUtils.trim(StringUtils.splitShortString(bodyrowsAttr, ','));
+ // parsing with no exception handling, because of JSF-spec:
+ // "If present, this must be a comma separated list of integers."
+ bodyrows = new Integer[bodyrowsString.length];
+ for(int i = 0; i < bodyrowsString.length; i++)
{
- //No encoding, just do nothing, char will be added later.
+ bodyrows[i] = Integer.valueOf(bodyrowsString[i]);
}
-
- if (app != null)
- {
- //if (sb == null)
- //{
- // sb = new StringBuilder(string.substring(0, i));
- //}
- //sb.append(app);
- if (start < i)
+
+ }
+ else
+ {
+ bodyrows = ZERO_INT_ARRAY;
+ }
]]>
</codefragment>
</duplication>
<duplication lines="17" tokens="101">
-<file line="183" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
-<file line="237" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
+<file line="183" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
+<file line="237" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlMessagesRendererBase.java"/>
<codefragment>
<![CDATA[
writer.startElement(HTML.TD_ELEM, null); // messages);
@@ -2449,8 +2452,8 @@
</codefragment>
</duplication>
<duplication lines="21" tokens="101">
-<file line="114" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java"/>
-<file line="150" path="/home/lu4242/workspace/trunk/current22/core/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java"/>
+<file line="114" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlImageRendererBase.java"/>
+<file line="150" path="/root/myfaces/myfacesGit22/myfaces/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java"/>
<codefragment>
<![CDATA[
if (behaviors.isEmpty() && isCommonPropertiesOptimizationEnabled(facesContext))