ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/jtreg/util/Collections/RacingCollections.java
(Generate patch)

Comparing jsr166/src/test/jtreg/util/Collections/RacingCollections.java (file contents):
Revision 1.7 by jsr166, Tue Sep 15 06:41:44 2015 UTC vs.
Revision 1.8 by jsr166, Wed Jan 4 04:46:18 2017 UTC

# Line 184 | Line 184 | public class RacingCollections {
184      }
185  
186      private static List<Map<Integer, Boolean>> newConcurrentMaps() {
187 <        List<Map<Integer, Boolean>> list =
188 <            new ArrayList<Map<Integer, Boolean>>();
187 >        List<Map<Integer, Boolean>> list = new ArrayList<>();
188          list.add(new ConcurrentHashMap<Integer, Boolean>());
189          list.add(new ConcurrentSkipListMap<Integer, Boolean>());
190          return list;
# Line 196 | Line 195 | public class RacingCollections {
195          list.add(new Hashtable<Integer, Boolean>());
196          list.add(new HashMap<Integer, Boolean>());
197          list.add(new TreeMap<Integer, Boolean>());
198 <        Comparator<Integer> cmp = new Comparator<Integer>() {
198 >        Comparator<Integer> cmp = new Comparator<>() {
199              public int compare(Integer x, Integer y) {
200                  return x - y;
201              }};
# Line 205 | Line 204 | public class RacingCollections {
204      }
205  
206      private static List<Set<Integer>> newConcurrentSets() {
207 <        List<Set<Integer>> list = new ArrayList<Set<Integer>>();
207 >        List<Set<Integer>> list = new ArrayList<>();
208          list.add(new ConcurrentSkipListSet<Integer>());
209          list.add(new CopyOnWriteArraySet<Integer>());
210          return list;
# Line 220 | Line 219 | public class RacingCollections {
219      }
220  
221      private static List<List<Integer>> newConcurrentLists() {
222 <        List<List<Integer>> list = new ArrayList<List<Integer>>();
222 >        List<List<Integer>> list = new ArrayList<>();
223          list.add(new CopyOnWriteArrayList<Integer>());
224          return list;
225      }
# Line 233 | Line 232 | public class RacingCollections {
232      }
233  
234      private static List<Queue<Integer>> newConcurrentQueues() {
235 <        List<Queue<Integer>> list =
237 <            new ArrayList<Queue<Integer>>(newConcurrentDeques());
235 >        List<Queue<Integer>> list = new ArrayList<>(newConcurrentDeques());
236          list.add(new ArrayBlockingQueue<Integer>(10));
237          list.add(new LinkedBlockingQueue<Integer>(10));
238          list.add(new LinkedTransferQueue<Integer>());
# Line 243 | Line 241 | public class RacingCollections {
241      }
242  
243      private static List<Queue<Integer>> newQueues() {
244 <        List<Queue<Integer>> list =
247 <            new ArrayList<Queue<Integer>>(newDeques());
244 >        List<Queue<Integer>> list = new ArrayList<>(newDeques());
245          list.add(new LinkedBlockingQueue<Integer>(10));
246          return list;
247      }
248  
249      private static List<Deque<Integer>> newConcurrentDeques() {
250 <        List<Deque<Integer>> list = new ArrayList<Deque<Integer>>();
250 >        List<Deque<Integer>> list = new ArrayList<>();
251          list.add(new LinkedBlockingDeque<Integer>(10));
252          list.add(new ConcurrentLinkedDeque<Integer>());
253          return list;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines