Modified: websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/ExtendedMessageFormat.java.html ============================================================================== --- websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/ExtendedMessageFormat.java.html (original) +++ websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/ExtendedMessageFormat.java.html Sun Mar 12 02:08:01 2017 @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.Locale; +import java.util.Locale.Category; import java.util.Map; import java.util.Objects; @@ -63,7 +64,7 @@ import java.util.Objects; * * @since 1.0 */ -<span class="pc bpc" id="L66" title="1 of 2 branches missed.">public class ExtendedMessageFormat extends MessageFormat {</span> +<span class="pc bpc" id="L67" title="1 of 2 branches missed.">public class ExtendedMessageFormat extends MessageFormat {</span> /** * Serializable Object. @@ -117,8 +118,8 @@ import java.util.Objects; * @throws IllegalArgumentException in case of a bad pattern. */ public ExtendedMessageFormat(final String pattern) { -<span class="fc" id="L120"> this(pattern, Locale.getDefault());</span> -<span class="fc" id="L121"> }</span> +<span class="fc" id="L121"> this(pattern, Locale.getDefault(Category.FORMAT));</span> +<span class="fc" id="L122"> }</span> /** * Create a new ExtendedMessageFormat. @@ -128,8 +129,8 @@ import java.util.Objects; * @throws IllegalArgumentException in case of a bad pattern. */ public ExtendedMessageFormat(final String pattern, final Locale locale) { -<span class="fc" id="L131"> this(pattern, locale, null);</span> -<span class="fc" id="L132"> }</span> +<span class="fc" id="L132"> this(pattern, locale, null);</span> +<span class="fc" id="L133"> }</span> /** * Create a new ExtendedMessageFormat for the default locale. @@ -140,8 +141,8 @@ import java.util.Objects; */ public ExtendedMessageFormat(final String pattern, final Map<String, ? extends FormatFactory> registry) { -<span class="fc" id="L143"> this(pattern, Locale.getDefault(), registry);</span> -<span class="fc" id="L144"> }</span> +<span class="fc" id="L144"> this(pattern, Locale.getDefault(Category.FORMAT), registry);</span> +<span class="fc" id="L145"> }</span> /** * Create a new ExtendedMessageFormat. @@ -154,18 +155,18 @@ import java.util.Objects; public ExtendedMessageFormat(final String pattern, final Locale locale, final Map<String, ? extends FormatFactory> registry) { -<span class="fc" id="L157"> super(DUMMY_PATTERN);</span> -<span class="fc" id="L158"> setLocale(locale);</span> -<span class="fc" id="L159"> this.registry = registry;</span> -<span class="fc" id="L160"> applyPattern(pattern);</span> -<span class="fc" id="L161"> }</span> +<span class="fc" id="L158"> super(DUMMY_PATTERN);</span> +<span class="fc" id="L159"> setLocale(locale);</span> +<span class="fc" id="L160"> this.registry = registry;</span> +<span class="fc" id="L161"> applyPattern(pattern);</span> +<span class="fc" id="L162"> }</span> /** * {@inheritDoc} */ @Override public String toPattern() { -<span class="fc" id="L168"> return toPattern;</span> +<span class="fc" id="L169"> return toPattern;</span> } /** @@ -175,74 +176,74 @@ import java.util.Objects; */ @Override public final void applyPattern(final String pattern) { -<span class="fc bfc" id="L178" title="All 2 branches covered."> if (registry == null) {</span> -<span class="fc" id="L179"> super.applyPattern(pattern);</span> -<span class="fc" id="L180"> toPattern = super.toPattern();</span> -<span class="fc" id="L181"> return;</span> - } -<span class="fc" id="L183"> final ArrayList<Format> foundFormats = new ArrayList<>();</span> -<span class="fc" id="L184"> final ArrayList<String> foundDescriptions = new ArrayList<>();</span> -<span class="fc" id="L185"> final StringBuilder stripCustom = new StringBuilder(pattern.length());</span> - -<span class="fc" id="L187"> final ParsePosition pos = new ParsePosition(0);</span> -<span class="fc" id="L188"> final char[] c = pattern.toCharArray();</span> -<span class="fc" id="L189"> int fmtCount = 0;</span> -<span class="fc bfc" id="L190" title="All 2 branches covered."> while (pos.getIndex() < pattern.length()) {</span> -<span class="fc bfc" id="L191" title="All 3 branches covered."> switch (c[pos.getIndex()]) {</span> +<span class="fc bfc" id="L179" title="All 2 branches covered."> if (registry == null) {</span> +<span class="fc" id="L180"> super.applyPattern(pattern);</span> +<span class="fc" id="L181"> toPattern = super.toPattern();</span> +<span class="fc" id="L182"> return;</span> + } +<span class="fc" id="L184"> final ArrayList<Format> foundFormats = new ArrayList<>();</span> +<span class="fc" id="L185"> final ArrayList<String> foundDescriptions = new ArrayList<>();</span> +<span class="fc" id="L186"> final StringBuilder stripCustom = new StringBuilder(pattern.length());</span> + +<span class="fc" id="L188"> final ParsePosition pos = new ParsePosition(0);</span> +<span class="fc" id="L189"> final char[] c = pattern.toCharArray();</span> +<span class="fc" id="L190"> int fmtCount = 0;</span> +<span class="fc bfc" id="L191" title="All 2 branches covered."> while (pos.getIndex() < pattern.length()) {</span> +<span class="fc bfc" id="L192" title="All 3 branches covered."> switch (c[pos.getIndex()]) {</span> case QUOTE: -<span class="fc" id="L193"> appendQuotedString(pattern, pos, stripCustom);</span> -<span class="fc" id="L194"> break;</span> +<span class="fc" id="L194"> appendQuotedString(pattern, pos, stripCustom);</span> +<span class="fc" id="L195"> break;</span> case START_FE: -<span class="fc" id="L196"> fmtCount++;</span> -<span class="fc" id="L197"> seekNonWs(pattern, pos);</span> -<span class="fc" id="L198"> final int start = pos.getIndex();</span> -<span class="fc" id="L199"> final int index = readArgumentIndex(pattern, next(pos));</span> -<span class="fc" id="L200"> stripCustom.append(START_FE).append(index);</span> -<span class="fc" id="L201"> seekNonWs(pattern, pos);</span> -<span class="fc" id="L202"> Format format = null;</span> -<span class="fc" id="L203"> String formatDescription = null;</span> -<span class="fc bfc" id="L204" title="All 2 branches covered."> if (c[pos.getIndex()] == START_FMT) {</span> -<span class="fc" id="L205"> formatDescription = parseFormatDescription(pattern,</span> -<span class="fc" id="L206"> next(pos));</span> -<span class="fc" id="L207"> format = getFormat(formatDescription);</span> -<span class="fc bfc" id="L208" title="All 2 branches covered."> if (format == null) {</span> -<span class="fc" id="L209"> stripCustom.append(START_FMT).append(formatDescription);</span> +<span class="fc" id="L197"> fmtCount++;</span> +<span class="fc" id="L198"> seekNonWs(pattern, pos);</span> +<span class="fc" id="L199"> final int start = pos.getIndex();</span> +<span class="fc" id="L200"> final int index = readArgumentIndex(pattern, next(pos));</span> +<span class="fc" id="L201"> stripCustom.append(START_FE).append(index);</span> +<span class="fc" id="L202"> seekNonWs(pattern, pos);</span> +<span class="fc" id="L203"> Format format = null;</span> +<span class="fc" id="L204"> String formatDescription = null;</span> +<span class="fc bfc" id="L205" title="All 2 branches covered."> if (c[pos.getIndex()] == START_FMT) {</span> +<span class="fc" id="L206"> formatDescription = parseFormatDescription(pattern,</span> +<span class="fc" id="L207"> next(pos));</span> +<span class="fc" id="L208"> format = getFormat(formatDescription);</span> +<span class="fc bfc" id="L209" title="All 2 branches covered."> if (format == null) {</span> +<span class="fc" id="L210"> stripCustom.append(START_FMT).append(formatDescription);</span> } } -<span class="fc" id="L212"> foundFormats.add(format);</span> -<span class="fc bfc" id="L213" title="All 2 branches covered."> foundDescriptions.add(format == null ? null : formatDescription);</span> -<span class="pc bpc" id="L214" title="1 of 2 branches missed."> if (foundFormats.size() != fmtCount) {</span> -<span class="nc" id="L215"> throw new IllegalArgumentException("The validated expression is false");</span> +<span class="fc" id="L213"> foundFormats.add(format);</span> +<span class="fc bfc" id="L214" title="All 2 branches covered."> foundDescriptions.add(format == null ? null : formatDescription);</span> +<span class="pc bpc" id="L215" title="1 of 2 branches missed."> if (foundFormats.size() != fmtCount) {</span> +<span class="nc" id="L216"> throw new IllegalArgumentException("The validated expression is false");</span> } -<span class="pc bpc" id="L217" title="1 of 2 branches missed."> if (foundDescriptions.size() != fmtCount) {</span> -<span class="nc" id="L218"> throw new IllegalArgumentException("The validated expression is false");</span> +<span class="pc bpc" id="L218" title="1 of 2 branches missed."> if (foundDescriptions.size() != fmtCount) {</span> +<span class="nc" id="L219"> throw new IllegalArgumentException("The validated expression is false");</span> } -<span class="pc bpc" id="L220" title="1 of 2 branches missed."> if (c[pos.getIndex()] != END_FE) {</span> -<span class="nc" id="L221"> throw new IllegalArgumentException(</span> +<span class="pc bpc" id="L221" title="1 of 2 branches missed."> if (c[pos.getIndex()] != END_FE) {</span> +<span class="nc" id="L222"> throw new IllegalArgumentException(</span> "Unreadable format element at position " + start); } //$FALL-THROUGH$ default: -<span class="fc" id="L226"> stripCustom.append(c[pos.getIndex()]);</span> -<span class="fc" id="L227"> next(pos);</span> +<span class="fc" id="L227"> stripCustom.append(c[pos.getIndex()]);</span> +<span class="fc" id="L228"> next(pos);</span> } } -<span class="fc" id="L230"> super.applyPattern(stripCustom.toString());</span> -<span class="fc" id="L231"> toPattern = insertFormats(super.toPattern(), foundDescriptions);</span> -<span class="fc bfc" id="L232" title="All 2 branches covered."> if (containsElements(foundFormats)) {</span> -<span class="fc" id="L233"> final Format[] origFormats = getFormats();</span> +<span class="fc" id="L231"> super.applyPattern(stripCustom.toString());</span> +<span class="fc" id="L232"> toPattern = insertFormats(super.toPattern(), foundDescriptions);</span> +<span class="fc bfc" id="L233" title="All 2 branches covered."> if (containsElements(foundFormats)) {</span> +<span class="fc" id="L234"> final Format[] origFormats = getFormats();</span> // only loop over what we know we have, as MessageFormat on Java 1.3 // seems to provide an extra format element: -<span class="fc" id="L236"> int i = 0;</span> -<span class="fc bfc" id="L237" title="All 2 branches covered."> for (final Iterator<Format> it = foundFormats.iterator(); it.hasNext(); i++) {</span> -<span class="fc" id="L238"> final Format f = it.next();</span> -<span class="fc bfc" id="L239" title="All 2 branches covered."> if (f != null) {</span> -<span class="fc" id="L240"> origFormats[i] = f;</span> +<span class="fc" id="L237"> int i = 0;</span> +<span class="fc bfc" id="L238" title="All 2 branches covered."> for (final Iterator<Format> it = foundFormats.iterator(); it.hasNext(); i++) {</span> +<span class="fc" id="L239"> final Format f = it.next();</span> +<span class="fc bfc" id="L240" title="All 2 branches covered."> if (f != null) {</span> +<span class="fc" id="L241"> origFormats[i] = f;</span> } } -<span class="fc" id="L243"> super.setFormats(origFormats);</span> +<span class="fc" id="L244"> super.setFormats(origFormats);</span> } -<span class="fc" id="L245"> }</span> +<span class="fc" id="L246"> }</span> /** * Throws UnsupportedOperationException - see class Javadoc for details. @@ -254,7 +255,7 @@ import java.util.Objects; */ @Override public void setFormat(final int formatElementIndex, final Format newFormat) { -<span class="fc" id="L257"> throw new UnsupportedOperationException();</span> +<span class="fc" id="L258"> throw new UnsupportedOperationException();</span> } /** @@ -268,7 +269,7 @@ import java.util.Objects; @Override public void setFormatByArgumentIndex(final int argumentIndex, final Format newFormat) { -<span class="fc" id="L271"> throw new UnsupportedOperationException();</span> +<span class="fc" id="L272"> throw new UnsupportedOperationException();</span> } /** @@ -280,7 +281,7 @@ import java.util.Objects; */ @Override public void setFormats(final Format[] newFormats) { -<span class="fc" id="L283"> throw new UnsupportedOperationException();</span> +<span class="fc" id="L284"> throw new UnsupportedOperationException();</span> } /** @@ -292,7 +293,7 @@ import java.util.Objects; */ @Override public void setFormatsByArgumentIndex(final Format[] newFormats) { -<span class="fc" id="L295"> throw new UnsupportedOperationException();</span> +<span class="fc" id="L296"> throw new UnsupportedOperationException();</span> } /** @@ -303,26 +304,26 @@ import java.util.Objects; */ @Override public boolean equals(final Object obj) { -<span class="fc bfc" id="L306" title="All 2 branches covered."> if (obj == this) {</span> -<span class="fc" id="L307"> return true;</span> +<span class="fc bfc" id="L307" title="All 2 branches covered."> if (obj == this) {</span> +<span class="fc" id="L308"> return true;</span> } -<span class="fc bfc" id="L309" title="All 2 branches covered."> if (obj == null) {</span> -<span class="fc" id="L310"> return false;</span> +<span class="fc bfc" id="L310" title="All 2 branches covered."> if (obj == null) {</span> +<span class="fc" id="L311"> return false;</span> } -<span class="fc bfc" id="L312" title="All 2 branches covered."> if (!super.equals(obj)) {</span> -<span class="fc" id="L313"> return false;</span> +<span class="fc bfc" id="L313" title="All 2 branches covered."> if (!super.equals(obj)) {</span> +<span class="fc" id="L314"> return false;</span> } -<span class="pc bpc" id="L315" title="1 of 2 branches missed."> if (!Objects.equals(getClass(), obj.getClass())) {</span> -<span class="nc" id="L316"> return false;</span> +<span class="pc bpc" id="L316" title="1 of 2 branches missed."> if (!Objects.equals(getClass(), obj.getClass())) {</span> +<span class="nc" id="L317"> return false;</span> } -<span class="fc" id="L318"> final ExtendedMessageFormat rhs = (ExtendedMessageFormat) obj;</span> -<span class="pc bpc" id="L319" title="1 of 2 branches missed."> if (!Objects.equals(toPattern, rhs.toPattern)) {</span> -<span class="nc" id="L320"> return false;</span> +<span class="fc" id="L319"> final ExtendedMessageFormat rhs = (ExtendedMessageFormat) obj;</span> +<span class="pc bpc" id="L320" title="1 of 2 branches missed."> if (!Objects.equals(toPattern, rhs.toPattern)) {</span> +<span class="nc" id="L321"> return false;</span> } -<span class="pc bpc" id="L322" title="1 of 2 branches missed."> if (!Objects.equals(registry, rhs.registry)) {</span> -<span class="nc" id="L323"> return false;</span> +<span class="pc bpc" id="L323" title="1 of 2 branches missed."> if (!Objects.equals(registry, rhs.registry)) {</span> +<span class="nc" id="L324"> return false;</span> } -<span class="fc" id="L325"> return true;</span> +<span class="fc" id="L326"> return true;</span> } /** @@ -330,10 +331,10 @@ import java.util.Objects; */ @Override public int hashCode() { -<span class="fc" id="L333"> int result = super.hashCode();</span> -<span class="fc" id="L334"> result = HASH_SEED * result + Objects.hashCode(registry);</span> -<span class="fc" id="L335"> result = HASH_SEED * result + Objects.hashCode(toPattern);</span> -<span class="fc" id="L336"> return result;</span> +<span class="fc" id="L334"> int result = super.hashCode();</span> +<span class="fc" id="L335"> result = HASH_SEED * result + Objects.hashCode(registry);</span> +<span class="fc" id="L336"> result = HASH_SEED * result + Objects.hashCode(toPattern);</span> +<span class="fc" id="L337"> return result;</span> } /** @@ -343,20 +344,20 @@ import java.util.Objects; * @return Format */ private Format getFormat(final String desc) { -<span class="pc bpc" id="L346" title="1 of 2 branches missed."> if (registry != null) {</span> -<span class="fc" id="L347"> String name = desc;</span> -<span class="fc" id="L348"> String args = null;</span> -<span class="fc" id="L349"> final int i = desc.indexOf(START_FMT);</span> -<span class="fc bfc" id="L350" title="All 2 branches covered."> if (i > 0) {</span> -<span class="fc" id="L351"> name = desc.substring(0, i).trim();</span> -<span class="fc" id="L352"> args = desc.substring(i + 1).trim();</span> +<span class="pc bpc" id="L347" title="1 of 2 branches missed."> if (registry != null) {</span> +<span class="fc" id="L348"> String name = desc;</span> +<span class="fc" id="L349"> String args = null;</span> +<span class="fc" id="L350"> final int i = desc.indexOf(START_FMT);</span> +<span class="fc bfc" id="L351" title="All 2 branches covered."> if (i > 0) {</span> +<span class="fc" id="L352"> name = desc.substring(0, i).trim();</span> +<span class="fc" id="L353"> args = desc.substring(i + 1).trim();</span> } -<span class="fc" id="L354"> final FormatFactory factory = registry.get(name);</span> -<span class="fc bfc" id="L355" title="All 2 branches covered."> if (factory != null) {</span> -<span class="fc" id="L356"> return factory.getFormat(name, args, getLocale());</span> +<span class="fc" id="L355"> final FormatFactory factory = registry.get(name);</span> +<span class="fc bfc" id="L356" title="All 2 branches covered."> if (factory != null) {</span> +<span class="fc" id="L357"> return factory.getFormat(name, args, getLocale());</span> } } -<span class="fc" id="L359"> return null;</span> +<span class="fc" id="L360"> return null;</span> } /** @@ -367,37 +368,37 @@ import java.util.Objects; * @return argument index */ private int readArgumentIndex(final String pattern, final ParsePosition pos) { -<span class="fc" id="L370"> final int start = pos.getIndex();</span> -<span class="fc" id="L371"> seekNonWs(pattern, pos);</span> -<span class="fc" id="L372"> final StringBuilder result = new StringBuilder();</span> -<span class="fc" id="L373"> boolean error = false;</span> -<span class="pc bpc" id="L374" title="2 of 4 branches missed."> for (; !error && pos.getIndex() < pattern.length(); next(pos)) {</span> -<span class="fc" id="L375"> char c = pattern.charAt(pos.getIndex());</span> -<span class="pc bpc" id="L376" title="1 of 2 branches missed."> if (Character.isWhitespace(c)) {</span> -<span class="nc" id="L377"> seekNonWs(pattern, pos);</span> -<span class="nc" id="L378"> c = pattern.charAt(pos.getIndex());</span> -<span class="nc bnc" id="L379" title="All 4 branches missed."> if (c != START_FMT && c != END_FE) {</span> -<span class="nc" id="L380"> error = true;</span> -<span class="nc" id="L381"> continue;</span> +<span class="fc" id="L371"> final int start = pos.getIndex();</span> +<span class="fc" id="L372"> seekNonWs(pattern, pos);</span> +<span class="fc" id="L373"> final StringBuilder result = new StringBuilder();</span> +<span class="fc" id="L374"> boolean error = false;</span> +<span class="pc bpc" id="L375" title="2 of 4 branches missed."> for (; !error && pos.getIndex() < pattern.length(); next(pos)) {</span> +<span class="fc" id="L376"> char c = pattern.charAt(pos.getIndex());</span> +<span class="pc bpc" id="L377" title="1 of 2 branches missed."> if (Character.isWhitespace(c)) {</span> +<span class="nc" id="L378"> seekNonWs(pattern, pos);</span> +<span class="nc" id="L379"> c = pattern.charAt(pos.getIndex());</span> +<span class="nc bnc" id="L380" title="All 4 branches missed."> if (c != START_FMT && c != END_FE) {</span> +<span class="nc" id="L381"> error = true;</span> +<span class="nc" id="L382"> continue;</span> } } -<span class="pc bpc" id="L384" title="1 of 6 branches missed."> if ((c == START_FMT || c == END_FE) && result.length() > 0) {</span> +<span class="pc bpc" id="L385" title="1 of 6 branches missed."> if ((c == START_FMT || c == END_FE) && result.length() > 0) {</span> try { -<span class="fc" id="L386"> return Integer.parseInt(result.toString());</span> -<span class="nc" id="L387"> } catch (final NumberFormatException e) { // NOPMD</span> +<span class="fc" id="L387"> return Integer.parseInt(result.toString());</span> +<span class="nc" id="L388"> } catch (final NumberFormatException e) { // NOPMD</span> // we've already ensured only digits, so unless something // outlandishly large was specified we should be okay. } } -<span class="pc bpc" id="L392" title="1 of 2 branches missed."> error = !Character.isDigit(c);</span> -<span class="fc" id="L393"> result.append(c);</span> +<span class="pc bpc" id="L393" title="1 of 2 branches missed."> error = !Character.isDigit(c);</span> +<span class="fc" id="L394"> result.append(c);</span> } -<span class="nc bnc" id="L395" title="All 2 branches missed."> if (error) {</span> -<span class="nc" id="L396"> throw new IllegalArgumentException(</span> +<span class="nc bnc" id="L396" title="All 2 branches missed."> if (error) {</span> +<span class="nc" id="L397"> throw new IllegalArgumentException(</span> "Invalid format argument index at position " + start + ": " -<span class="nc" id="L398"> + pattern.substring(start, pos.getIndex()));</span> +<span class="nc" id="L399"> + pattern.substring(start, pos.getIndex()));</span> } -<span class="nc" id="L400"> throw new IllegalArgumentException(</span> +<span class="nc" id="L401"> throw new IllegalArgumentException(</span> "Unterminated format element at position " + start); } @@ -409,29 +410,29 @@ import java.util.Objects; * @return Format description String */ private String parseFormatDescription(final String pattern, final ParsePosition pos) { -<span class="fc" id="L412"> final int start = pos.getIndex();</span> -<span class="fc" id="L413"> seekNonWs(pattern, pos);</span> -<span class="fc" id="L414"> final int text = pos.getIndex();</span> -<span class="fc" id="L415"> int depth = 1;</span> -<span class="pc bpc" id="L416" title="1 of 2 branches missed."> for (; pos.getIndex() < pattern.length(); next(pos)) {</span> -<span class="pc bpc" id="L417" title="1 of 4 branches missed."> switch (pattern.charAt(pos.getIndex())) {</span> +<span class="fc" id="L413"> final int start = pos.getIndex();</span> +<span class="fc" id="L414"> seekNonWs(pattern, pos);</span> +<span class="fc" id="L415"> final int text = pos.getIndex();</span> +<span class="fc" id="L416"> int depth = 1;</span> +<span class="pc bpc" id="L417" title="1 of 2 branches missed."> for (; pos.getIndex() < pattern.length(); next(pos)) {</span> +<span class="pc bpc" id="L418" title="1 of 4 branches missed."> switch (pattern.charAt(pos.getIndex())) {</span> case START_FE: -<span class="fc" id="L419"> depth++;</span> -<span class="fc" id="L420"> break;</span> +<span class="fc" id="L420"> depth++;</span> +<span class="fc" id="L421"> break;</span> case END_FE: -<span class="fc" id="L422"> depth--;</span> -<span class="fc bfc" id="L423" title="All 2 branches covered."> if (depth == 0) {</span> -<span class="fc" id="L424"> return pattern.substring(text, pos.getIndex());</span> +<span class="fc" id="L423"> depth--;</span> +<span class="fc bfc" id="L424" title="All 2 branches covered."> if (depth == 0) {</span> +<span class="fc" id="L425"> return pattern.substring(text, pos.getIndex());</span> } break; case QUOTE: -<span class="nc" id="L428"> getQuotedString(pattern, pos);</span> -<span class="nc" id="L429"> break;</span> +<span class="nc" id="L429"> getQuotedString(pattern, pos);</span> +<span class="nc" id="L430"> break;</span> default: break; } } -<span class="nc" id="L434"> throw new IllegalArgumentException(</span> +<span class="nc" id="L435"> throw new IllegalArgumentException(</span> "Unterminated format element at position " + start); } @@ -443,40 +444,40 @@ import java.util.Objects; * @return full pattern */ private String insertFormats(final String pattern, final ArrayList<String> customPatterns) { -<span class="fc bfc" id="L446" title="All 2 branches covered."> if (!containsElements(customPatterns)) {</span> -<span class="fc" id="L447"> return pattern;</span> +<span class="fc bfc" id="L447" title="All 2 branches covered."> if (!containsElements(customPatterns)) {</span> +<span class="fc" id="L448"> return pattern;</span> } -<span class="fc" id="L449"> final StringBuilder sb = new StringBuilder(pattern.length() * 2);</span> -<span class="fc" id="L450"> final ParsePosition pos = new ParsePosition(0);</span> -<span class="fc" id="L451"> int fe = -1;</span> -<span class="fc" id="L452"> int depth = 0;</span> -<span class="fc bfc" id="L453" title="All 2 branches covered."> while (pos.getIndex() < pattern.length()) {</span> -<span class="fc" id="L454"> final char c = pattern.charAt(pos.getIndex());</span> -<span class="fc bfc" id="L455" title="All 4 branches covered."> switch (c) {</span> +<span class="fc" id="L450"> final StringBuilder sb = new StringBuilder(pattern.length() * 2);</span> +<span class="fc" id="L451"> final ParsePosition pos = new ParsePosition(0);</span> +<span class="fc" id="L452"> int fe = -1;</span> +<span class="fc" id="L453"> int depth = 0;</span> +<span class="fc bfc" id="L454" title="All 2 branches covered."> while (pos.getIndex() < pattern.length()) {</span> +<span class="fc" id="L455"> final char c = pattern.charAt(pos.getIndex());</span> +<span class="fc bfc" id="L456" title="All 4 branches covered."> switch (c) {</span> case QUOTE: -<span class="fc" id="L457"> appendQuotedString(pattern, pos, sb);</span> -<span class="fc" id="L458"> break;</span> +<span class="fc" id="L458"> appendQuotedString(pattern, pos, sb);</span> +<span class="fc" id="L459"> break;</span> case START_FE: -<span class="fc" id="L460"> depth++;</span> -<span class="fc" id="L461"> sb.append(START_FE).append(readArgumentIndex(pattern, next(pos)));</span> +<span class="fc" id="L461"> depth++;</span> +<span class="fc" id="L462"> sb.append(START_FE).append(readArgumentIndex(pattern, next(pos)));</span> // do not look for custom patterns when they are embedded, e.g. in a choice -<span class="fc bfc" id="L463" title="All 2 branches covered."> if (depth == 1) {</span> -<span class="fc" id="L464"> fe++;</span> -<span class="fc" id="L465"> final String customPattern = customPatterns.get(fe);</span> -<span class="fc bfc" id="L466" title="All 2 branches covered."> if (customPattern != null) {</span> -<span class="fc" id="L467"> sb.append(START_FMT).append(customPattern);</span> +<span class="fc bfc" id="L464" title="All 2 branches covered."> if (depth == 1) {</span> +<span class="fc" id="L465"> fe++;</span> +<span class="fc" id="L466"> final String customPattern = customPatterns.get(fe);</span> +<span class="fc bfc" id="L467" title="All 2 branches covered."> if (customPattern != null) {</span> +<span class="fc" id="L468"> sb.append(START_FMT).append(customPattern);</span> } -<span class="fc" id="L469"> }</span> +<span class="fc" id="L470"> }</span> break; case END_FE: -<span class="fc" id="L472"> depth--;</span> +<span class="fc" id="L473"> depth--;</span> //$FALL-THROUGH$ default: -<span class="fc" id="L475"> sb.append(c);</span> -<span class="fc" id="L476"> next(pos);</span> +<span class="fc" id="L476"> sb.append(c);</span> +<span class="fc" id="L477"> next(pos);</span> } -<span class="fc" id="L478"> }</span> -<span class="fc" id="L479"> return sb.toString();</span> +<span class="fc" id="L479"> }</span> +<span class="fc" id="L480"> return sb.toString();</span> } /** @@ -486,13 +487,13 @@ import java.util.Objects; * @param pos current position */ private void seekNonWs(final String pattern, final ParsePosition pos) { -<span class="fc" id="L489"> int len = 0;</span> -<span class="fc" id="L490"> final char[] buffer = pattern.toCharArray();</span> +<span class="fc" id="L490"> int len = 0;</span> +<span class="fc" id="L491"> final char[] buffer = pattern.toCharArray();</span> do { -<span class="fc" id="L492"> len = StrMatcher.splitMatcher().isMatch(buffer, pos.getIndex());</span> -<span class="fc" id="L493"> pos.setIndex(pos.getIndex() + len);</span> -<span class="pc bpc" id="L494" title="3 of 4 branches missed."> } while (len > 0 && pos.getIndex() < pattern.length());</span> -<span class="fc" id="L495"> }</span> +<span class="fc" id="L493"> len = StrMatcher.splitMatcher().isMatch(buffer, pos.getIndex());</span> +<span class="fc" id="L494"> pos.setIndex(pos.getIndex() + len);</span> +<span class="pc bpc" id="L495" title="3 of 4 branches missed."> } while (len > 0 && pos.getIndex() < pattern.length());</span> +<span class="fc" id="L496"> }</span> /** * Convenience method to advance parse position by 1. @@ -501,8 +502,8 @@ import java.util.Objects; * @return <code>pos</code> */ private ParsePosition next(final ParsePosition pos) { -<span class="fc" id="L504"> pos.setIndex(pos.getIndex() + 1);</span> -<span class="fc" id="L505"> return pos;</span> +<span class="fc" id="L505"> pos.setIndex(pos.getIndex() + 1);</span> +<span class="fc" id="L506"> return pos;</span> } /** @@ -516,29 +517,29 @@ import java.util.Objects; */ private StringBuilder appendQuotedString(final String pattern, final ParsePosition pos, final StringBuilder appendTo) { -<span class="pc bpc" id="L519" title="2 of 4 branches missed."> assert pattern.toCharArray()[pos.getIndex()] == QUOTE</span> +<span class="pc bpc" id="L520" title="2 of 4 branches missed."> assert pattern.toCharArray()[pos.getIndex()] == QUOTE</span> : "Quoted string must start with quote character"; // handle quote character at the beginning of the string -<span class="pc bpc" id="L523" title="1 of 2 branches missed."> if (appendTo != null) {</span> -<span class="fc" id="L524"> appendTo.append(QUOTE);</span> +<span class="pc bpc" id="L524" title="1 of 2 branches missed."> if (appendTo != null) {</span> +<span class="fc" id="L525"> appendTo.append(QUOTE);</span> } -<span class="fc" id="L526"> next(pos);</span> +<span class="fc" id="L527"> next(pos);</span> -<span class="fc" id="L528"> final int start = pos.getIndex();</span> -<span class="fc" id="L529"> final char[] c = pattern.toCharArray();</span> -<span class="fc" id="L530"> final int lastHold = start;</span> -<span class="pc bpc" id="L531" title="1 of 2 branches missed."> for (int i = pos.getIndex(); i < pattern.length(); i++) {</span> -<span class="fc bfc" id="L532" title="All 2 branches covered."> switch (c[pos.getIndex()]) {</span> +<span class="fc" id="L529"> final int start = pos.getIndex();</span> +<span class="fc" id="L530"> final char[] c = pattern.toCharArray();</span> +<span class="fc" id="L531"> final int lastHold = start;</span> +<span class="pc bpc" id="L532" title="1 of 2 branches missed."> for (int i = pos.getIndex(); i < pattern.length(); i++) {</span> +<span class="fc bfc" id="L533" title="All 2 branches covered."> switch (c[pos.getIndex()]) {</span> case QUOTE: -<span class="fc" id="L534"> next(pos);</span> -<span class="pc bpc" id="L535" title="1 of 2 branches missed."> return appendTo == null ? null : appendTo.append(c, lastHold,</span> -<span class="fc" id="L536"> pos.getIndex() - lastHold);</span> +<span class="fc" id="L535"> next(pos);</span> +<span class="pc bpc" id="L536" title="1 of 2 branches missed."> return appendTo == null ? null : appendTo.append(c, lastHold,</span> +<span class="fc" id="L537"> pos.getIndex() - lastHold);</span> default: -<span class="fc" id="L538"> next(pos);</span> +<span class="fc" id="L539"> next(pos);</span> } } -<span class="nc" id="L541"> throw new IllegalArgumentException(</span> +<span class="nc" id="L542"> throw new IllegalArgumentException(</span> "Unterminated quoted string at position " + start); } @@ -549,8 +550,8 @@ import java.util.Objects; * @param pos current parse position */ private void getQuotedString(final String pattern, final ParsePosition pos) { -<span class="nc" id="L552"> appendQuotedString(pattern, pos, null);</span> -<span class="nc" id="L553"> }</span> +<span class="nc" id="L553"> appendQuotedString(pattern, pos, null);</span> +<span class="nc" id="L554"> }</span> /** * Learn whether the specified Collection contains non-null elements. @@ -558,15 +559,15 @@ import java.util.Objects; * @return <code>true</code> if some Object was found, <code>false</code> otherwise. */ private boolean containsElements(final Collection<?> coll) { -<span class="pc bpc" id="L561" title="1 of 4 branches missed."> if (coll == null || coll.isEmpty()) {</span> -<span class="fc" id="L562"> return false;</span> +<span class="pc bpc" id="L562" title="1 of 4 branches missed."> if (coll == null || coll.isEmpty()) {</span> +<span class="fc" id="L563"> return false;</span> } -<span class="fc bfc" id="L564" title="All 2 branches covered."> for (final Object name : coll) {</span> -<span class="fc bfc" id="L565" title="All 2 branches covered."> if (name != null) {</span> -<span class="fc" id="L566"> return true;</span> +<span class="fc bfc" id="L565" title="All 2 branches covered."> for (final Object name : coll) {</span> +<span class="fc bfc" id="L566" title="All 2 branches covered."> if (name != null) {</span> +<span class="fc" id="L567"> return true;</span> } -<span class="fc" id="L568"> }</span> -<span class="fc" id="L569"> return false;</span> +<span class="fc" id="L569"> }</span> +<span class="fc" id="L570"> return false;</span> } } </pre><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.7.8.201612092310</span></div></body></html> \ No newline at end of file
Modified: websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup$MapStrLookup.html ============================================================================== --- websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup$MapStrLookup.html (original) +++ websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup$MapStrLookup.html Sun Mar 12 02:08:01 2017 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="../jacoco-resources/report.gif" type="image/gif"/><title>StrLookup.MapStrLookup</title><script type="text/javascript" src="../jacoco-resources/sort.js"></script></head><body onload="initialSort(['breadcrumb'])"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" class="el_session">Sessions</a></span><a href="../index.html" class="el_report">Apache Commons Text</a> > <a href="index.html" class="el_package">org.apache.commons.text</a> > <span class="el_class">StrLookup.MapStrLookup</span></div><h1>StrLookup.MapStrLookup</h1><table class="coverage" cellspacing="0" id="coveragetable"><thead><tr><td class="sortable" id="a" onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" onclick="toggleSort(this)">Methods</td></tr></thead><tfoot><tr><td>Total</td><td class="bar">0 of 23</td><td class="ctr2">100%</td><td class="bar">0 of 4</td><td class="ctr2">100%</td><td class="ctr1">0</td><t d class="ctr2">4</td><td class="ctr1">0</td><td class="ctr2">9</td><td class="ctr1">0</td><td class="ctr2">2</td></tr></tfoot><tbody><tr><td id="a0"><a href="StrLookup.java.html#L149" class="el_method">lookup(String)</a></td><td class="bar" id="b0"><img src="../jacoco-resources/greenbar.gif" width="120" height="10" title="17" alt="17"/></td><td class="ctr2" id="c0">100%</td><td class="bar" id="d0"><img src="../jacoco-resources/greenbar.gif" width="120" height="10" title="4" alt="4"/></td><td class="ctr2" id="e0">100%</td><td class="ctr1" id="f0">0</td><td class="ctr2" id="g0">3</td><td class="ctr1" id="h0">0</td><td class="ctr2" id="i0">6</td><td class="ctr1" id="j0">0</td><td class="ctr2" id="k0">1</td></tr><tr><td id="a1"><a href="StrLookup.java.html#L134" class="el_method">StrLookup.MapStrLookup(Map)</a></td><td class="bar" id="b1"><img src="../jacoco-resources/greenbar.gif" width="42" height="10" title="6" alt="6"/></td><td class="ctr2" id="c1">100%</td><td class="bar" id="d1"/> <td class="ctr2" id="e1">n/a</td><td class="ctr1" id="f1">0</td><td class="ctr2" id="g1">1</td><td class="ctr1" id="h1">0</td><td class="ctr2" id="i1">3</td><td class="ctr1" id="j1">0</td><td class="ctr2" id="k1">1</td></tr></tbody></table><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.7.8.201612092310</span></div></body></html> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="../jacoco-resources/report.gif" type="image/gif"/><title>StrLookup.MapStrLookup</title><script type="text/javascript" src="../jacoco-resources/sort.js"></script></head><body onload="initialSort(['breadcrumb'])"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" class="el_session">Sessions</a></span><a href="../index.html" class="el_report">Apache Commons Text</a> > <a href="index.html" class="el_package">org.apache.commons.text</a> > <span class="el_class">StrLookup.MapStrLookup</span></div><h1>StrLookup.MapStrLookup</h1><table class="coverage" cellspacing="0" id="coveragetable"><thead><tr><td class="sortable" id="a" onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" onclick="toggleSort(this)">Methods</td></tr></thead><tfoot><tr><td>Total</td><td class="bar">0 of 23</td><td class="ctr2">100%</td><td class="bar">0 of 4</td><td class="ctr2">100%</td><td class="ctr1">0</td><t d class="ctr2">4</td><td class="ctr1">0</td><td class="ctr2">9</td><td class="ctr1">0</td><td class="ctr2">2</td></tr></tfoot><tbody><tr><td id="a0"><a href="StrLookup.java.html#L150" class="el_method">lookup(String)</a></td><td class="bar" id="b0"><img src="../jacoco-resources/greenbar.gif" width="120" height="10" title="17" alt="17"/></td><td class="ctr2" id="c0">100%</td><td class="bar" id="d0"><img src="../jacoco-resources/greenbar.gif" width="120" height="10" title="4" alt="4"/></td><td class="ctr2" id="e0">100%</td><td class="ctr1" id="f0">0</td><td class="ctr2" id="g0">3</td><td class="ctr1" id="h0">0</td><td class="ctr2" id="i0">6</td><td class="ctr1" id="j0">0</td><td class="ctr2" id="k0">1</td></tr><tr><td id="a1"><a href="StrLookup.java.html#L135" class="el_method">StrLookup.MapStrLookup(Map)</a></td><td class="bar" id="b1"><img src="../jacoco-resources/greenbar.gif" width="42" height="10" title="6" alt="6"/></td><td class="ctr2" id="c1">100%</td><td class="bar" id="d1"/> <td class="ctr2" id="e1">n/a</td><td class="ctr1" id="f1">0</td><td class="ctr2" id="g1">1</td><td class="ctr1" id="h1">0</td><td class="ctr2" id="i1">3</td><td class="ctr1" id="j1">0</td><td class="ctr2" id="k1">1</td></tr></tbody></table><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.7.8.201612092310</span></div></body></html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup$SystemPropertiesStrLookup.html ============================================================================== --- websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup$SystemPropertiesStrLookup.html (original) +++ websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup$SystemPropertiesStrLookup.html Sun Mar 12 02:08:01 2017 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="../jacoco-resources/report.gif" type="image/gif"/><title>StrLookup.SystemPropertiesStrLookup</title><script type="text/javascript" src="../jacoco-resources/sort.js"></script></head><body onload="initialSort(['breadcrumb'])"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" class="el_session">Sessions</a></span><a href="../index.html" class="el_report">Apache Commons Text</a> > <a href="index.html" class="el_package">org.apache.commons.text</a> > <span class="el_class">StrLookup.SystemPropertiesStrLookup</span></div><h1>StrLookup.SystemPropertiesStrLookup</h1> <table class="coverage" cellspacing="0" id="coveragetable"><thead><tr><td class="sortable" id="a" onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" onclick="toggleSort(this)">Methods</td></tr></thead><tfoot><tr><td>Total</td><td class="bar">1 of 12</td><td class="ctr2">91%</td><td class="bar">0 of 2</td><td class="ct r2">100%</td><td class="ctr1">0</td><td class="ctr2">3</td><td class="ctr1">1</td><td class="ctr2">5</td><td class="ctr1">0</td><td class="ctr2">2</td></tr></tfoot><tbody><tr><td id="a0"><a href="StrLookup.java.html#L170" class="el_method">lookup(String)</a></td><td class="bar" id="b0"><img src="../jacoco-resources/redbar.gif" width="13" height="10" title="1" alt="1"/><img src="../jacoco-resources/greenbar.gif" width="106" height="10" title="8" alt="8"/></td><td class="ctr2" id="c1">88%</td><td class="bar" id="d0"><img src="../jacoco-resources/greenbar.gif" width="120" height="10" title="2" alt="2"/></td><td class="ctr2" id="e0">100%</td><td class="ctr1" id="f0">0</td><td class="ctr2" id="g0">2</td><td class="ctr1" id="h0">1</td><td class="ctr2" id="i0">4</td><td class="ctr1" id="j0">0</td><td class="ctr2" id="k0">1</td></tr><tr><td id="a1"><a href="StrLookup.java.html#L164" class="el_method">StrLookup.SystemPropertiesStrLookup()</a></td><td class="bar" id="b1"><img src="../jacoco-r esources/greenbar.gif" width="40" height="10" title="3" alt="3"/></td><td class="ctr2" id="c0">100%</td><td class="bar" id="d1"/><td class="ctr2" id="e1">n/a</td><td class="ctr1" id="f1">0</td><td class="ctr2" id="g1">1</td><td class="ctr1" id="h1">0</td><td class="ctr2" id="i1">1</td><td class="ctr1" id="j1">0</td><td class="ctr2" id="k1">1</td></tr></tbody></table><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.7.8.201612092310</span></div></body></html> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="../jacoco-resources/report.gif" type="image/gif"/><title>StrLookup.SystemPropertiesStrLookup</title><script type="text/javascript" src="../jacoco-resources/sort.js"></script></head><body onload="initialSort(['breadcrumb'])"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" class="el_session">Sessions</a></span><a href="../index.html" class="el_report">Apache Commons Text</a> > <a href="index.html" class="el_package">org.apache.commons.text</a> > <span class="el_class">StrLookup.SystemPropertiesStrLookup</span></div><h1>StrLookup.SystemPropertiesStrLookup</h1> <table class="coverage" cellspacing="0" id="coveragetable"><thead><tr><td class="sortable" id="a" onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" onclick="toggleSort(this)">Methods</td></tr></thead><tfoot><tr><td>Total</td><td class="bar">1 of 12</td><td class="ctr2">91%</td><td class="bar">0 of 2</td><td class="ct r2">100%</td><td class="ctr1">0</td><td class="ctr2">3</td><td class="ctr1">1</td><td class="ctr2">5</td><td class="ctr1">0</td><td class="ctr2">2</td></tr></tfoot><tbody><tr><td id="a0"><a href="StrLookup.java.html#L171" class="el_method">lookup(String)</a></td><td class="bar" id="b0"><img src="../jacoco-resources/redbar.gif" width="13" height="10" title="1" alt="1"/><img src="../jacoco-resources/greenbar.gif" width="106" height="10" title="8" alt="8"/></td><td class="ctr2" id="c1">88%</td><td class="bar" id="d0"><img src="../jacoco-resources/greenbar.gif" width="120" height="10" title="2" alt="2"/></td><td class="ctr2" id="e0">100%</td><td class="ctr1" id="f0">0</td><td class="ctr2" id="g0">2</td><td class="ctr1" id="h0">1</td><td class="ctr2" id="i0">4</td><td class="ctr1" id="j0">0</td><td class="ctr2" id="k0">1</td></tr><tr><td id="a1"><a href="StrLookup.java.html#L165" class="el_method">StrLookup.SystemPropertiesStrLookup()</a></td><td class="bar" id="b1"><img src="../jacoco-r esources/greenbar.gif" width="40" height="10" title="3" alt="3"/></td><td class="ctr2" id="c0">100%</td><td class="bar" id="d1"/><td class="ctr2" id="e1">n/a</td><td class="ctr1" id="f1">0</td><td class="ctr2" id="g1">1</td><td class="ctr1" id="h1">0</td><td class="ctr2" id="i1">1</td><td class="ctr1" id="j1">0</td><td class="ctr2" id="k1">1</td></tr></tbody></table><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.7.8.201612092310</span></div></body></html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup.html ============================================================================== --- websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup.html (original) +++ websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup.html Sun Mar 12 02:08:01 2017 @@ -1 +1 @@ -<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="../jacoco-resources/report.gif" type="image/gif"/><title>StrLookup</title><script type="text/javascript" src="../jacoco-resources/sort.js"></script></head><body onload="initialSort(['breadcrumb'])"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" class="el_session">Sessions</a></span><a href="../index.html" class="el_report">Apache Commons Text</a> > <a href="index.html" class="el_package">org.apache.commons.text</a> > <span class="el_class">StrLookup</span></div><h1>StrLookup</h1><table class="coverage" cellspacing="0" id="coveragetable"><thead><tr><td clas s="sortable" id="a" onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" onclick="toggleSort(this)">Methods</td></tr></thead><tfoot><tr><td>Total</td><td class="bar">0 of 23</td><td class="ctr2">100%</td><td class="bar">0 of 0</td><td class="ctr2">n/a</td><td class="ctr1">0</td><td class="ctr2">5</td><td class="ctr1">0< /td><td class="ctr2">7</td><td class="ctr1">0</td><td class="ctr2">5</td></tr></tfoot><tbody><tr><td id="a2"><a href="StrLookup.java.html#L41" class="el_method">static {...}</a></td><td class="bar" id="b0"><img src="../jacoco-resources/greenbar.gif" width="120" height="10" title="11" alt="11"/></td><td class="ctr2" id="c0">100%</td><td class="bar" id="d0"/><td class="ctr2" id="e0">n/a</td><td class="ctr1" id="f0">0</td><td class="ctr2" id="g0">1</td><td class="ctr1" id="h0">0</td><td class="ctr2" id="i0">2</td><td class="ctr1" id="j0">0</td><td class="ctr2" id="k0">1</td></tr><tr><td id="a0"><a href="StrLookup.java.html#L84" class="el_method">mapLookup(Map)</a></td><td class="bar" id="b1"><img src="../jacoco-resources/greenbar.gif" width="54" height="10" title="5" alt="5"/></td><td class="ctr2" id="c1">100%</td><td class="bar" id="d1"/><td class="ctr2" id="e1">n/a</td><td class="ctr1" id="f1">0</td><td class="ctr2" id="g1">1</td><td class="ctr1" id="h1">0</td><td class="ctr2" id="i2 ">1</td><td class="ctr1" id="j1">0</td><td class="ctr2" id="k1">1</td></tr><tr><td id="a3"><a href="StrLookup.java.html#L92" class="el_method">StrLookup()</a></td><td class="bar" id="b2"><img src="../jacoco-resources/greenbar.gif" width="32" height="10" title="3" alt="3"/></td><td class="ctr2" id="c2">100%</td><td class="bar" id="d2"/><td class="ctr2" id="e2">n/a</td><td class="ctr1" id="f2">0</td><td class="ctr2" id="g2">1</td><td class="ctr1" id="h2">0</td><td class="ctr2" id="i1">2</td><td class="ctr1" id="j2">0</td><td class="ctr2" id="k2">1</td></tr><tr><td id="a1"><a href="StrLookup.java.html#L55" class="el_method">noneLookup()</a></td><td class="bar" id="b3"><img src="../jacoco-resources/greenbar.gif" width="21" height="10" title="2" alt="2"/></td><td class="ctr2" id="c3">100%</td><td class="bar" id="d3"/><td class="ctr2" id="e3">n/a</td><td class="ctr1" id="f3">0</td><td class="ctr2" id="g3">1</td><td class="ctr1" id="h3">0</td><td class="ctr2" id="i3">1</td><td class="ctr1" id="j3">0</td><td class="ctr2" id="k3">1</td></tr><tr><td id="a4"><a href="StrLookup.java.html#L70" class="el_method">systemPropertiesLookup()</a></td><td class="bar" id="b4"><img src="../jacoco-resources/greenbar.gif" width="21" height="10" title="2" alt="2"/></td><td class="ctr2" id="c4">100%</td><td class="bar" id="d4"/><td class="ctr2" id="e4">n/a</td><td class="ctr1" id="f4">0</td><td class="ctr2" id="g4">1</td><td class="ctr1" id="h4">0</td><td class="ctr2" id="i4">1</td><td class="ctr1" id="j4">0</td><td class="ctr2" id="k4">1</td></tr></tbody></table><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.7.8.201612092310</span></div></body></html> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" lang="en"><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><link rel="stylesheet" href="../jacoco-resources/report.css" type="text/css"/><link rel="shortcut icon" href="../jacoco-resources/report.gif" type="image/gif"/><title>StrLookup</title><script type="text/javascript" src="../jacoco-resources/sort.js"></script></head><body onload="initialSort(['breadcrumb'])"><div class="breadcrumb" id="breadcrumb"><span class="info"><a href="../jacoco-sessions.html" class="el_session">Sessions</a></span><a href="../index.html" class="el_report">Apache Commons Text</a> > <a href="index.html" class="el_package">org.apache.commons.text</a> > <span class="el_class">StrLookup</span></div><h1>StrLookup</h1><table class="coverage" cellspacing="0" id="coveragetable"><thead><tr><td clas s="sortable" id="a" onclick="toggleSort(this)">Element</td><td class="down sortable bar" id="b" onclick="toggleSort(this)">Missed Instructions</td><td class="sortable ctr2" id="c" onclick="toggleSort(this)">Cov.</td><td class="sortable bar" id="d" onclick="toggleSort(this)">Missed Branches</td><td class="sortable ctr2" id="e" onclick="toggleSort(this)">Cov.</td><td class="sortable ctr1" id="f" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="g" onclick="toggleSort(this)">Cxty</td><td class="sortable ctr1" id="h" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="i" onclick="toggleSort(this)">Lines</td><td class="sortable ctr1" id="j" onclick="toggleSort(this)">Missed</td><td class="sortable ctr2" id="k" onclick="toggleSort(this)">Methods</td></tr></thead><tfoot><tr><td>Total</td><td class="bar">0 of 23</td><td class="ctr2">100%</td><td class="bar">0 of 0</td><td class="ctr2">n/a</td><td class="ctr1">0</td><td class="ctr2">5</td><td class="ctr1">0< /td><td class="ctr2">7</td><td class="ctr1">0</td><td class="ctr2">5</td></tr></tfoot><tbody><tr><td id="a2"><a href="StrLookup.java.html#L42" class="el_method">static {...}</a></td><td class="bar" id="b0"><img src="../jacoco-resources/greenbar.gif" width="120" height="10" title="11" alt="11"/></td><td class="ctr2" id="c0">100%</td><td class="bar" id="d0"/><td class="ctr2" id="e0">n/a</td><td class="ctr1" id="f0">0</td><td class="ctr2" id="g0">1</td><td class="ctr1" id="h0">0</td><td class="ctr2" id="i0">2</td><td class="ctr1" id="j0">0</td><td class="ctr2" id="k0">1</td></tr><tr><td id="a0"><a href="StrLookup.java.html#L85" class="el_method">mapLookup(Map)</a></td><td class="bar" id="b1"><img src="../jacoco-resources/greenbar.gif" width="54" height="10" title="5" alt="5"/></td><td class="ctr2" id="c1">100%</td><td class="bar" id="d1"/><td class="ctr2" id="e1">n/a</td><td class="ctr1" id="f1">0</td><td class="ctr2" id="g1">1</td><td class="ctr1" id="h1">0</td><td class="ctr2" id="i2 ">1</td><td class="ctr1" id="j1">0</td><td class="ctr2" id="k1">1</td></tr><tr><td id="a3"><a href="StrLookup.java.html#L93" class="el_method">StrLookup()</a></td><td class="bar" id="b2"><img src="../jacoco-resources/greenbar.gif" width="32" height="10" title="3" alt="3"/></td><td class="ctr2" id="c2">100%</td><td class="bar" id="d2"/><td class="ctr2" id="e2">n/a</td><td class="ctr1" id="f2">0</td><td class="ctr2" id="g2">1</td><td class="ctr1" id="h2">0</td><td class="ctr2" id="i1">2</td><td class="ctr1" id="j2">0</td><td class="ctr2" id="k2">1</td></tr><tr><td id="a1"><a href="StrLookup.java.html#L56" class="el_method">noneLookup()</a></td><td class="bar" id="b3"><img src="../jacoco-resources/greenbar.gif" width="21" height="10" title="2" alt="2"/></td><td class="ctr2" id="c3">100%</td><td class="bar" id="d3"/><td class="ctr2" id="e3">n/a</td><td class="ctr1" id="f3">0</td><td class="ctr2" id="g3">1</td><td class="ctr1" id="h3">0</td><td class="ctr2" id="i3">1</td><td class="ctr1" id="j3">0</td><td class="ctr2" id="k3">1</td></tr><tr><td id="a4"><a href="StrLookup.java.html#L71" class="el_method">systemPropertiesLookup()</a></td><td class="bar" id="b4"><img src="../jacoco-resources/greenbar.gif" width="21" height="10" title="2" alt="2"/></td><td class="ctr2" id="c4">100%</td><td class="bar" id="d4"/><td class="ctr2" id="e4">n/a</td><td class="ctr1" id="f4">0</td><td class="ctr2" id="g4">1</td><td class="ctr1" id="h4">0</td><td class="ctr2" id="i4">1</td><td class="ctr1" id="j4">0</td><td class="ctr2" id="k4">1</td></tr></tbody></table><div class="footer"><span class="right">Created with <a href="http://www.jacoco.org/jacoco">JaCoCo</a> 0.7.8.201612092310</span></div></body></html> \ No newline at end of file Modified: websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup.java.html ============================================================================== --- websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup.java.html (original) +++ websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrLookup.java.html Sun Mar 12 02:08:01 2017 @@ -31,6 +31,7 @@ import java.util.Map; * For example, it would be possible to implement a lookup that used the * key as a primary key, and looked up the value on demand from the database * + * @param <V> the type of the values supported by the lookup * @since 1.0 */ public abstract class StrLookup<V> { @@ -38,12 +39,12 @@ public abstract class StrLookup<V> /** * Lookup that always returns null. */ -<span class="fc" id="L41"> private static final StrLookup<String> NONE_LOOKUP = new MapStrLookup<>(null);</span> +<span class="fc" id="L42"> private static final StrLookup<String> NONE_LOOKUP = new MapStrLookup<>(null);</span> /** * Lookup based on system properties. */ -<span class="fc" id="L46"> private static final StrLookup<String> SYSTEM_PROPERTIES_LOOKUP = new SystemPropertiesStrLookup();</span> +<span class="fc" id="L47"> private static final StrLookup<String> SYSTEM_PROPERTIES_LOOKUP = new SystemPropertiesStrLookup();</span> //----------------------------------------------------------------------- /** @@ -52,7 +53,7 @@ public abstract class StrLookup<V> * @return a lookup that always returns null, not null */ public static StrLookup<?> noneLookup() { -<span class="fc" id="L55"> return NONE_LOOKUP;</span> +<span class="fc" id="L56"> return NONE_LOOKUP;</span> } /** @@ -67,7 +68,7 @@ public abstract class StrLookup<V> * @return a lookup using system properties, not null */ public static StrLookup<String> systemPropertiesLookup() { -<span class="fc" id="L70"> return SYSTEM_PROPERTIES_LOOKUP;</span> +<span class="fc" id="L71"> return SYSTEM_PROPERTIES_LOOKUP;</span> } /** @@ -81,7 +82,7 @@ public abstract class StrLookup<V> * @return a lookup using the map, not null */ public static <V> StrLookup<V> mapLookup(final Map<String, V> map) { -<span class="fc" id="L84"> return new MapStrLookup<>(map);</span> +<span class="fc" id="L85"> return new MapStrLookup<>(map);</span> } //----------------------------------------------------------------------- @@ -89,8 +90,8 @@ public abstract class StrLookup<V> * Constructor. */ protected StrLookup() { -<span class="fc" id="L92"> super();</span> -<span class="fc" id="L93"> }</span> +<span class="fc" id="L93"> super();</span> +<span class="fc" id="L94"> }</span> /** * Looks up a String key to a String value. @@ -131,9 +132,9 @@ public abstract class StrLookup<V> * * @param map the map of keys to values, may be null */ -<span class="fc" id="L134"> MapStrLookup(final Map<String, V> map) {</span> -<span class="fc" id="L135"> this.map = map;</span> -<span class="fc" id="L136"> }</span> +<span class="fc" id="L135"> MapStrLookup(final Map<String, V> map) {</span> +<span class="fc" id="L136"> this.map = map;</span> +<span class="fc" id="L137"> }</span> /** * Looks up a String key to a String value using the map. @@ -146,14 +147,14 @@ public abstract class StrLookup<V> */ @Override public String lookup(final String key) { -<span class="fc bfc" id="L149" title="All 2 branches covered."> if (map == null) {</span> -<span class="fc" id="L150"> return null;</span> +<span class="fc bfc" id="L150" title="All 2 branches covered."> if (map == null) {</span> +<span class="fc" id="L151"> return null;</span> } -<span class="fc" id="L152"> final Object obj = map.get(key);</span> -<span class="fc bfc" id="L153" title="All 2 branches covered."> if (obj == null) {</span> -<span class="fc" id="L154"> return null;</span> +<span class="fc" id="L153"> final Object obj = map.get(key);</span> +<span class="fc bfc" id="L154" title="All 2 branches covered."> if (obj == null) {</span> +<span class="fc" id="L155"> return null;</span> } -<span class="fc" id="L156"> return obj.toString();</span> +<span class="fc" id="L157"> return obj.toString();</span> } } @@ -161,20 +162,20 @@ public abstract class StrLookup<V> /** * Lookup implementation based on system properties. */ -<span class="fc" id="L164"> private static class SystemPropertiesStrLookup extends StrLookup<String> {</span> +<span class="fc" id="L165"> private static class SystemPropertiesStrLookup extends StrLookup<String> {</span> /** * {@inheritDoc} This implementation directly accesses system properties. */ @Override public String lookup(final String key) { -<span class="fc bfc" id="L170" title="All 2 branches covered."> if (key.length() > 0) {</span> +<span class="fc bfc" id="L171" title="All 2 branches covered."> if (key.length() > 0) {</span> try { -<span class="fc" id="L172"> return System.getProperty(key);</span> -<span class="nc" id="L173"> } catch (final SecurityException scex) {</span> +<span class="fc" id="L173"> return System.getProperty(key);</span> +<span class="nc" id="L174"> } catch (final SecurityException scex) {</span> // Squelched. All lookup(String) will return null. } } -<span class="fc" id="L177"> return null;</span> +<span class="fc" id="L178"> return null;</span> } } } Modified: websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrMatcher.java.html ============================================================================== --- websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrMatcher.java.html (original) +++ websites/production/commons/content/proper/commons-text/jacoco/org.apache.commons.text/StrMatcher.java.html Sun Mar 12 02:08:01 2017 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -277,7 +277,7 @@ public abstract class StrMatcher { * * @param chars the characters to match, must not be null */ - CharSetMatcher(final char chars[]) { + CharSetMatcher(final char[] chars) { <span class="fc" id="L281"> super();</span> <span class="fc" id="L282"> this.chars = chars.clone();</span> <span class="fc" id="L283"> Arrays.sort(this.chars);</span> @@ -371,7 +371,7 @@ public abstract class StrMatcher { } <span class="fc" id="L372"> return len;</span> } - + @Override public String toString() { <span class="nc" id="L377"> return super.toString() + ' ' + Arrays.toString(chars);</span>