Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9F974200BCC for ; Tue, 29 Nov 2016 22:11:35 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 9E79D160AFC; Tue, 29 Nov 2016 21:11:35 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5CA15160B23 for ; Tue, 29 Nov 2016 22:11:33 +0100 (CET) Received: (qmail 46898 invoked by uid 500); 29 Nov 2016 21:11:32 -0000 Mailing-List: contact notifications-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list notifications@commons.apache.org Received: (qmail 46889 invoked by uid 99); 29 Nov 2016 21:11:32 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Nov 2016 21:11:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id DC45F1A0066 for ; Tue, 29 Nov 2016 21:11:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -1.999 X-Spam-Level: X-Spam-Status: No, score=-1.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id Ru0oX2daT0Yv for ; Tue, 29 Nov 2016 21:11:15 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 8A49C5FC2A for ; Tue, 29 Nov 2016 21:11:06 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id E5262E03A6 for ; Tue, 29 Nov 2016 21:10:56 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E227F3A1A7B for ; Tue, 29 Nov 2016 21:10:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1001851 [2/41] - in /websites/production/commons/content/proper/commons-configuration: ./ cobertura/ userguide/ userguide_v1.10/ Date: Tue, 29 Nov 2016 21:10:53 -0000 To: notifications@commons.apache.org From: oheger@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20161129211056.E227F3A1A7B@svn01-us-west.apache.org> archived-at: Tue, 29 Nov 2016 21:11:35 -0000 Modified: websites/production/commons/content/proper/commons-configuration/cobertura/org.apache.commons.configuration2.AbstractConfiguration.html ============================================================================== --- websites/production/commons/content/proper/commons-configuration/cobertura/org.apache.commons.configuration2.AbstractConfiguration.html (original) +++ websites/production/commons/content/proper/commons-configuration/cobertura/org.apache.commons.configuration2.AbstractConfiguration.html Tue Nov 29 21:10:49 2016 @@ -281,13 +281,13 @@ 
      */
 131   
     public AbstractConfiguration()
-  132  15676 
     {
-  133  15680 
         interpolator = new AtomicReference<ConfigurationInterpolator>();
-  134  15680 
         initLogger(null);
-  135  15679 
         installDefaultInterpolator();
-  136  15675 
         listDelimiterHandler = DisabledListDelimiterHandler.INSTANCE;
-  137  15675 
         conversionHandler = DefaultConversionHandler.INSTANCE;
-  138  15677 
     }
+  132  15517 
     {
+  133  15517 
         interpolator = new AtomicReference<ConfigurationInterpolator>();
+  134  15517 
         initLogger(null);
+  135  15516 
         installDefaultInterpolator();
+  136  15517 
         listDelimiterHandler = DisabledListDelimiterHandler.INSTANCE;
+  137  15517 
         conversionHandler = DefaultConversionHandler.INSTANCE;
+  138  15517 
     }
 139   
 
 140   @@ -306,7 +306,7 @@ 
     public ListDelimiterHandler getListDelimiterHandler()
 147   
     {
-  148  84274 
         return listDelimiterHandler;
+  148  82179 
         return listDelimiterHandler;
 149   
     }
 150   @@ -347,7 +347,7 @@ 
             ListDelimiterHandler listDelimiterHandler)
 168   
     {
-  169  10910 
         if (listDelimiterHandler == null)
+  169  10868 
         if (listDelimiterHandler == null)
 170   
         {
 171  1 
             throw new IllegalArgumentException(
@@ -355,8 +355,8 @@ 
                     "List delimiter handler must not be null!");
 173   
         }
-  174  10916 
         this.listDelimiterHandler = listDelimiterHandler;
-  175  10923 
     }
+  174  10873 
         this.listDelimiterHandler = listDelimiterHandler;
+  175  10875 
     }
 176   
 
 177   @@ -375,7 +375,7 @@ 
     public ConversionHandler getConversionHandler()
 184   
     {
-  185  27159 
         return conversionHandler;
+  185  26973 
         return conversionHandler;
 186   
     }
 187   @@ -452,8 +452,8 @@ 
     public void setThrowExceptionOnMissing(boolean throwExceptionOnMissing)
 225   
     {
-  226  9996 
         this.throwExceptionOnMissing = throwExceptionOnMissing;
-  227  9994 
     }
+  226  9940 
         this.throwExceptionOnMissing = throwExceptionOnMissing;
+  227  9942 
     }
 228   
 
 229   @@ -470,7 +470,7 @@ 
     public boolean isThrowExceptionOnMissing()
 235   
     {
-  236  14460 
         return throwExceptionOnMissing;
+  236  14405 
         return throwExceptionOnMissing;
 237   
     }
 238   @@ -497,7 +497,7 @@ 
     public ConfigurationInterpolator getInterpolator()
 249   
     {
-  250  90975 
         return interpolator.get();
+  250  91357 
         return interpolator.get();
 251   
     }
 252   @@ -522,8 +522,8 @@ 
     public final void setInterpolator(ConfigurationInterpolator ci)
 262   
     {
-  263  15720 
         interpolator.set(ci);
-  264  15721 
     }
+  263  15564 
         interpolator.set(ci);
+  264  15565 
     }
 265   
 
 266   @@ -552,15 +552,15 @@ 
             Collection<? extends Lookup> defLookups)
 278   
     {
-  279  15719 
         InterpolatorSpecification spec =
+  279  15557 
         InterpolatorSpecification spec =
 280   
                 new InterpolatorSpecification.Builder()
-  281  15715 
                         .withPrefixLookups(prefixLookups)
-  282  15716 
                         .withDefaultLookups(defLookups)
-  283  15719 
                         .withDefaultLookup(new ConfigurationLookup(this))
-  284  15718 
                         .create();
-  285  15717 
         setInterpolator(ConfigurationInterpolator.fromSpecification(spec));
-  286  15718 
     }
+  281  15557 
                         .withPrefixLookups(prefixLookups)
+  282  15558 
                         .withDefaultLookups(defLookups)
+  283  15558 
                         .withDefaultLookup(new ConfigurationLookup(this))
+  284  15558 
                         .create();
+  285  15558 
         setInterpolator(ConfigurationInterpolator.fromSpecification(spec));
+  286  15558 
     }
 287   
 
 288   @@ -607,14 +607,14 @@ 
             // do this in a loop because the ConfigurationInterpolator
 309   
             // instance may be changed by another thread
-  310  3220 
             ConfigurationInterpolator ciOld = getInterpolator();
-  311  3220 
             ConfigurationInterpolator ciNew =
+  310  3194 
             ConfigurationInterpolator ciOld = getInterpolator();
+  311  3194 
             ConfigurationInterpolator ciNew =
 312   
                     (ciOld != null) ? ciOld : new ConfigurationInterpolator();
-  313  3220 
             ciNew.registerLookups(lookups);
-  314  3220 
             success = interpolator.compareAndSet(ciOld, ciNew);
-  315  3220 
         } while (!success);
-  316  3220 
     }
+  313  3194 
             ciNew.registerLookups(lookups);
+  314  3194 
             success = interpolator.compareAndSet(ciOld, ciNew);
+  315  3194 
         } while (!success);
+  316  3194 
     }
 317   
 
 318   @@ -718,14 +718,14 @@ 
         do
 373   
         {
-  374  3210 
             ConfigurationInterpolator ciOld = getInterpolator();
-  375  3210 
             ConfigurationInterpolator ciNew =
+  374  3184 
             ConfigurationInterpolator ciOld = getInterpolator();
+  375  3184 
             ConfigurationInterpolator ciNew =
 376   
                     (ciOld != null) ? ciOld : new ConfigurationInterpolator();
-  377  3210 
             ciNew.setParentInterpolator(parent);
-  378  3210 
             success = interpolator.compareAndSet(ciOld, ciNew);
-  379  3210 
         } while (!success);
-  380  3210 
     }
+  377  3184 
             ciNew.setParentInterpolator(parent);
+  378  3184 
             success = interpolator.compareAndSet(ciOld, ciNew);
+  379  3184 
         } while (!success);
+  380  3184 
     }
 381   
 
 382   @@ -847,9 +847,9 @@ 
     private void installDefaultInterpolator()
 446   
     {
-  447  31353 
         installInterpolator(
-  448  15679 
                 ConfigurationInterpolator.getDefaultPrefixLookups(), null);
-  449  15676 
     }
+  447  31032 
         installInterpolator(
+  448  15516 
                 ConfigurationInterpolator.getDefaultPrefixLookups(), null);
+  449  15517 
     }
 450   
 
 451   @@ -939,7 +939,7 @@ 
     public ConfigurationLogger getLogger()
 497   
     {
-  498  15750 
         return log;
+  498  15580 
         return log;
 499   
     }
 500   @@ -970,8 +970,8 @@ 
     public void setLogger(ConfigurationLogger log)
 513   
     {
-  514  599 
         initLogger(log);
-  515  599 
     }
+  514  586 
         initLogger(log);
+  515  586 
     }
 516   
 
 517   @@ -1039,8 +1039,8 @@ 
     public final Synchronizer getSynchronizer()
 551   
     {
-  552  301660 
         Synchronizer sync = synchronizer;
-  553  302247 
         return (sync != null) ? sync : NoOpSynchronizer.INSTANCE;
+  552  300566 
         Synchronizer sync = synchronizer;
+  553  300771 
         return (sync != null) ? sync : NoOpSynchronizer.INSTANCE;
 554   
     }
 555   @@ -1069,8 +1069,8 @@ 
     public final void setSynchronizer(Synchronizer synchronizer)
 567   
     {
-  568  13832 
         this.synchronizer = synchronizer;
-  569  13899 
     }
+  568  13789 
         this.synchronizer = synchronizer;
+  569  13799 
     }
 570   
 
 571   @@ -1097,23 +1097,23 @@ 
     public final void lock(LockMode mode)
 582   
     {
-  583  5935 
         switch (mode)
+  583  5629 
         switch (mode)
 584   
         {
 585   
         case READ:
-  586  2958 
             beginRead(false);
-  587  2957 
             break;
+  586  2700 
             beginRead(false);
+  587  2699 
             break;
 588   
         case WRITE:
-  589  2976 
             beginWrite(false);
-  590  2976 
             break;
+  589  2928 
             beginWrite(false);
+  590  2928 
             break;
 591   
         default:
 592  0 
             throw new IllegalArgumentException("Unsupported LockMode: " + mode);
 593   
         }
-  594  5933 
     }
+  594  5627 
     }
 595   
 
 596   @@ -1138,23 +1138,23 @@ 
     public final void unlock(LockMode mode)
 606   
     {
-  607  5933 
         switch (mode)
+  607  5627 
         switch (mode)
 608   
         {
 609   
         case READ:
-  610  2957 
             endRead();
-  611  2957 
             break;
+  610  2699 
             endRead();
+  611  2699 
             break;
 612   
         case WRITE:
-  613  2976 
             endWrite();
-  614  2976 
             break;
+  613  2928 
             endWrite();
+  614  2928 
             break;
 615   
         default:
 616  0 
             throw new IllegalArgumentException("Unsupported LockMode: " + mode);
 617   
         }
-  618  5933 
     }
+  618  5627 
     }
 619   
 
 620   @@ -1199,8 +1199,8 @@ 
     protected void beginRead(boolean optimize)
 640   
     {
-  641  92116 
         getSynchronizer().beginRead();
-  642  92424 
     }
+  641  91355 
         getSynchronizer().beginRead();
+  642  91669 
     }
 643   
 
 644   @@ -1227,8 +1227,8 @@ 
     protected void endRead()
 655   
     {
-  656  91043 
         getSynchronizer().endRead();
-  657  92693 
     }
+  656  91122 
         getSynchronizer().endRead();
+  657  91633 
     }
 658   
 
 659   @@ -1261,8 +1261,8 @@ 
     protected void beginWrite(boolean optimize)
 673   
     {
-  674  54469 
         getSynchronizer().beginWrite();
-  675  54473 
     }
+  674  54194 
         getSynchronizer().beginWrite();
+  675  54199 
     }
 676   
 
 677   @@ -1289,8 +1289,8 @@ 
     protected void endWrite()
 688   
     {
-  689  54473 
         getSynchronizer().endWrite();
-  690  54473 
     }
+  689  54199 
         getSynchronizer().endWrite();
+  690  54199 
     }
 691   
 
 692   @@ -1299,23 +1299,23 @@ 
     public final void addProperty(String key, Object value)
 694   
     {
-  695  26077 
         beginWrite(false);
+  695  26075 
         beginWrite(false);
 696   
         try
 697   
         {
-  698  26077 
             fireEvent(ConfigurationEvent.ADD_PROPERTY, key, value, true);
-  699  26077 
             addPropertyInternal(key, value);
-  700  26074 
             fireEvent(ConfigurationEvent.ADD_PROPERTY, key, value, false);
+  698  26075 
             fireEvent(ConfigurationEvent.ADD_PROPERTY, key, value, true);
+  699  26075 
             addPropertyInternal(key, value);
+  700  26072 
             fireEvent(ConfigurationEvent.ADD_PROPERTY, key, value, false);
 701   
         }
 702   
         finally
 703   
         {
-  704  26077 
             endWrite();
-  705  26074 
         }
-  706  26074 
     }
+  704  26075 
             endWrite();
+  705  26072 
         }
+  706  26072 
     }
 707   
 
 708   @@ -1342,12 +1342,12 @@ 
     protected void addPropertyInternal(String key, Object value)
 719   
     {
-  720  32130 
         for (Object obj : getListDelimiterHandler().parse(value))
+  720  32128 
         for (Object obj : getListDelimiterHandler().parse(value))
 721   
         {
-  722  35511 
             addPropertyDirect(key, obj);
-  723  35509 
         }
-  724  32128 
     }
+  722  35509 
             addPropertyDirect(key, obj);
+  723  35507 
         }
+  724  32126 
     }
 725   
 
 726   @@ -1386,8 +1386,8 @@ 
     protected String interpolate(String base)
 743   
     {
-  744  20009 
         Object result = interpolate((Object) base);
-  745  19817 
         return (result == null) ? null : result.toString();
+  744  20312 
         Object result = interpolate((Object) base);
+  745  20488 
         return (result == null) ? null : result.toString();
 746   
     }
 747   @@ -1414,8 +1414,8 @@ 
     protected Object interpolate(Object value)
 758   
     {
-  759  20443 
         ConfigurationInterpolator ci = getInterpolator();
-  760  20602 
         return (ci != null) ? ci.interpolate(value) : value;
+  759  21478 
         ConfigurationInterpolator ci = getInterpolator();
+  760  21421 
         return (ci != null) ? ci.interpolate(value) : value;
 761   
     }
 762   @@ -1448,23 +1448,23 @@ 
     public final void setProperty(String key, Object value)
 777   
     {
-  778  5686 
         beginWrite(false);
+  778  5658 
         beginWrite(false);
 779   
         try
 780   
         {
-  781  5686 
             fireEvent(ConfigurationEvent.SET_PROPERTY, key, value, true);
-  782  5686 
             setPropertyInternal(key, value);
-  783  5685 
             fireEvent(ConfigurationEvent.SET_PROPERTY, key, value, false);
+  781  5658 
             fireEvent(ConfigurationEvent.SET_PROPERTY, key, value, true);
+  782  5658 
             setPropertyInternal(key, value);
+  783  5657 
             fireEvent(ConfigurationEvent.SET_PROPERTY, key, value, false);
 784   
         }
 785   
         finally
 786   
         {
-  787  5686 
             endWrite();
-  788  5685 
         }
-  789  5685 
     }
+  787  5658 
             endWrite();
+  788  5657 
         }
+  789  5657 
     }
 790   
 
 791   @@ -1691,19 +1691,19 @@ 
     public final Iterator<String> getKeys()
 921   
     {
-  922  450 
         beginRead(false);
+  922  432 
         beginRead(false);
 923   
         try
 924   
         {
-  925  900 
             return getKeysInternal();
+  925  864 
             return getKeysInternal();
 926   
         }
 927   
         finally
 928   
         {
-  929  450 
             endRead();
+  929  432 
             endRead();
 930   
         }
 931   @@ -1818,19 +1818,19 @@ 
     public final Object getProperty(String key)
 988   
     {
-  989  53608 
         beginRead(false);
+  989  53243 
         beginRead(false);
 990   
         try
 991   
         {
-  992  108195 
             return getPropertyInternal(key);
+  992  107656 
             return getPropertyInternal(key);
 993   
         }
 994   
         finally
 995   
         {
-  996  52950 
             endRead();
+  996  53607 
             endRead();
 997   
         }
 998   @@ -1873,19 +1873,19 @@ 
     public final boolean isEmpty()
 1017   
     {
-  1018  1232 
         beginRead(false);
+  1018  1220 
         beginRead(false);
 1019   
         try
 1020   
         {
-  1021  2464 
             return isEmptyInternal();
+  1021  2440 
             return isEmptyInternal();
 1022   
         }
 1023   
         finally
 1024   
         {
-  1025  1232 
             endRead();
+  1025  1220 
             endRead();
 1026   
         }
 1027   @@ -1993,19 +1993,19 @@ 
     public final boolean containsKey(String key)
 1082   
     {
-  1083  2385 
         beginRead(false);
+  1083  2384 
         beginRead(false);
 1084   
         try
 1085   
         {
-  1086  4770 
             return containsKeyInternal(key);
+  1086  4768 
             return containsKeyInternal(key);
 1087   
         }
 1088   
         finally
 1089   
         {
-  1090  2385 
             endRead();
+  1090  2384 
             endRead();
 1091   
         }
 1092   @@ -2139,7 +2139,7 @@  1163   
     {
 1164  132 
         Boolean b = convert(Boolean.class, key, null, true);
-  1165  123 
         return checkNonNullValue(key, b).booleanValue();
+  1165  126 
         return checkNonNullValue(key, b).booleanValue();
 1166   
     }
 1167   @@ -2150,7 +2150,7 @@ 
     public boolean getBoolean(String key, boolean defaultValue)
 1170   
     {
-  1171  1877 
         return getBoolean(key, Boolean.valueOf(defaultValue)).booleanValue();
+  1171  1861 
         return getBoolean(key, Boolean.valueOf(defaultValue)).booleanValue();
 1172   
     }
 1173   @@ -2183,7 +2183,7 @@ 
     public Boolean getBoolean(String key, Boolean defaultValue)
 1187   
     {
-  1188  4450 
         return convert(Boolean.class, key, defaultValue, false);
+  1188  4426 
         return convert(Boolean.class, key, defaultValue, false);
 1189   
     }
 1190   @@ -2466,7 +2466,7 @@ 
     public String getString(String key)
 1343   
     {
-  1344  12055 
         return convert(String.class, key, null, true);
+  1344  12049 
         return convert(String.class, key, null, true);
 1345   
     }
 1346   @@ -2477,8 +2477,8 @@ 
     public String getString(String key, String defaultValue)
 1349   
     {
-  1350  10299 
         String result = convert(String.class, key, null, false);
-  1351  10245 
         return (result != null) ? result : interpolate(defaultValue);
+  1350  10195 
         String result = convert(String.class, key, null, false);
+  1351  10138 
         return (result != null) ? result : interpolate(defaultValue);
 1352   
     }
 1353   @@ -2615,7 +2615,7 @@ 
     public List<Object> getList(String key)
 1424   
     {
-  1425  14373 
         return getList(key, new ArrayList<Object>());
+  1425  15116 
         return getList(key, new ArrayList<Object>());
 1426   
     }
 1427   @@ -2626,43 +2626,43 @@ 
     public List<Object> getList(String key, List<?> defaultValue)
 1430   
     {
-  1431  14652 
         Object value = getProperty(key);
+  1431  15267 
         Object value = getProperty(key);
 1432   
         List<Object> list;
 1433   
 
-  1434  15833 
         if (value instanceof String)
+  1434  15431 
         if (value instanceof String)
 1435   
         {
-  1436  14932 
             list = new ArrayList<Object>(1);
-  1437  14928 
             list.add(interpolate((String) value));
+  1436  14953 
             list = new ArrayList<Object>(1);
+  1437  14972 
             list.add(interpolate((String) value));
 1438   
         }
-  1439  937 
         else if (value instanceof List)
+  1439  922 
         else if (value instanceof List)
 1440   
         {
-  1441  189 
             list = new ArrayList<Object>();
-  1442  189 
             List<?> l = (List<?>) value;
+  1441  178 
             list = new ArrayList<Object>();
+  1442  178 
             List<?> l = (List<?>) value;
 1443   
 
 1444   
             // add the interpolated elements in the new list
-  1445  188 
             for (Object elem : l)
+  1445  178 
             for (Object elem : l)
 1446   
             {
-  1447  692 
                 list.add(interpolate(elem));
-  1448  692 
             }
-  1449  186 
         }
-  1450  748 
         else if (value == null)
+  1447  673 
                 list.add(interpolate(elem));
+  1448  672 
             }
+  1449  178 
         }
+  1450  744 
         else if (value == null)
 1451   
         {
 1452   
             // This is okay because we just return this list to the caller
 1453   
             @SuppressWarnings("unchecked")
-  1454  738 
             List<Object> resultList = (List<Object>) defaultValue;
-  1455  738 
             list = resultList;
-  1456  738 
         }
+  1454  734 
             List<Object> resultList = (List<Object>) defaultValue;
+  1455  734 
             list = resultList;
+  1456  734 
         }
 1457  10 
         else if (value.getClass().isArray())
 1458   
         {
@@ -2683,7 +2683,7 @@  1468  0 
                     + value.getClass().getName());
 1469   
         }
-  1470  14837 
         return list;
+  1470  15689 
         return list;
 1471   
     }
 1472   @@ -2919,32 +2919,32 @@ 
     public void copy(Configuration c)
 1596   
     {
-  1597  213 
         if (c != null)
+  1597  195 
         if (c != null)
 1598   
         {
-  1599  212 
             c.lock(LockMode.READ);
+  1599  194 
             c.lock(LockMode.READ);
 1600   
             try
 1601   
             {
-  1602  212 
                 for (Iterator<String> it = c.getKeys(); it.hasNext();)
+  1602  194 
                 for (Iterator<String> it = c.getKeys(); it.hasNext();)
 1603   
                 {
-  1604  3962 
                     String key = it.next();
-  1605  3962 
                     Object value = encodeForCopy(c.getProperty(key));
[... 123 lines stripped ...]