diff --git a/resources/images/tour/collections-mutable-diagram.dot b/resources/images/tour/collections-mutable-diagram.dot index 20058a973d..03d032eadf 100644 --- a/resources/images/tour/collections-mutable-diagram.dot +++ b/resources/images/tour/collections-mutable-diagram.dot @@ -18,6 +18,7 @@ digraph MutableCollections { WeakHashMap [color="#4A5659"]; LinkedHashMap [color="#4A5659"]; ListMap [color="#4A5659"]; + TreeMap [color="#4A5659"]; ImmutableMapAdaptor [color="#4A5659"]; ArraySeq [color="#4A5659"]; ArrayBuffer [color="#4A5659"]; @@ -37,6 +38,7 @@ digraph MutableCollections { Iterable -> Map; Iterable -> Seq [penwidth="4"]; Iterable -> Set; + Iterable -> PriorityQueue; Map -> HashMap [penwidth="4"]; Map -> WeakHashMap; Map -> OpenHashMap; @@ -44,6 +46,7 @@ digraph MutableCollections { Map -> ObservableMap; Map -> SynchronizedMap; Map -> ImmutableMapAdaptor; + Map -> TreeMap; Map -> ListMap; Map -> MultiMap; Set -> HashSet [penwidth="4"]; @@ -57,7 +60,6 @@ digraph MutableCollections { Seq -> IndexedSeq [penwidth="4"]; Seq -> Buffer; Seq -> Stack; - Seq -> PriorityQueue; Seq -> ArrayStack; LinearSeq -> MutableList [penwidth="4"]; LinearSeq -> LinkedList; @@ -74,6 +76,10 @@ digraph MutableCollections { MutableList -> Queue; Queue -> SynchronizedQueue; + {rank=same; + Iterable; + PriorityQueue; + SynchronizedPriorityQueue} {rank=same; Map; Set} @@ -81,6 +87,7 @@ digraph MutableCollections { WeakHashMap; LinkedHashMap; ListMap; + ObservableMap; ImmutableMapAdaptor; BitSet; LinkedHashSet; @@ -89,7 +96,6 @@ digraph MutableCollections { {rank=same; HashMap; OpenHashMap; - ObservableMap; SynchronizedMap; MultiMap; HashSet; @@ -100,14 +106,12 @@ digraph MutableCollections { Buffer; LinearSeq; Stack; - PriorityQueue; ArrayStack} {rank=same; ArraySeq; ArrayBuffer; SynchronizedBuffer; SynchronizedStack; - SynchronizedPriorityQueue; MutableList; LinkedList} {rank=same; @@ -116,6 +120,4 @@ digraph MutableCollections { ListBuffer; Queue; DoubleLinkedList} - {rank=same; - SynchronizedQueue} } diff --git a/resources/images/tour/collections-mutable-diagram.svg b/resources/images/tour/collections-mutable-diagram.svg index 8b59edd5c6..a4e7ff4630 100644 --- a/resources/images/tour/collections-mutable-diagram.svg +++ b/resources/images/tour/collections-mutable-diagram.svg @@ -4,11 +4,11 @@ - + MutableCollections - + HashSet @@ -36,116 +36,121 @@ WeakHashMap - -WeakHashMap + +WeakHashMap LinkedHashMap - -LinkedHashMap + +LinkedHashMap ListMap - -ListMap + +ListMap + + +TreeMap + +TreeMap -ImmutableMapAdaptor - -ImmutableMapAdaptor +ImmutableMapAdaptor + +ImmutableMapAdaptor -ArraySeq - -ArraySeq +ArraySeq + +ArraySeq -ArrayBuffer - -ArrayBuffer +ArrayBuffer + +ArrayBuffer -StringBuilder - -StringBuilder +StringBuilder + +StringBuilder -ListBuffer - -ListBuffer +ListBuffer + +ListBuffer -Stack - -Stack +Stack + +Stack -SynchronizedStack - -SynchronizedStack +SynchronizedStack + +SynchronizedStack -Stack->SynchronizedStack - - +Stack->SynchronizedStack + + -ArrayStack - -ArrayStack +ArrayStack + +ArrayStack -PriorityQueue - -PriorityQueue +PriorityQueue + +PriorityQueue -SynchronizedPriorityQueue - -SynchronizedPriorityQueue +SynchronizedPriorityQueue + +SynchronizedPriorityQueue -PriorityQueue->SynchronizedPriorityQueue - - +PriorityQueue->SynchronizedPriorityQueue + + -SynchronizedQueue - -SynchronizedQueue +SynchronizedQueue + +SynchronizedQueue -MutableList - -MutableList +MutableList + +MutableList -Queue - -Queue +Queue + +Queue -MutableList->Queue - - +MutableList->Queue + + -LinkedList - -LinkedList +LinkedList + +LinkedList -DoubleLinkedList - -DoubleLinkedList +DoubleLinkedList + +DoubleLinkedList -Traversable +Traversable Traversable -Iterable +Iterable Iterable @@ -154,18 +159,23 @@ + +Iterable->PriorityQueue + + + -Map - -Map +Map + +Map Iterable->Map - - + + -Seq +Seq Seq @@ -175,239 +185,239 @@ -Set +Set Set Iterable->Set - - + + -Map->HashMap - - +Map->HashMap + + -Map->OpenHashMap - - +Map->OpenHashMap + + -Map->WeakHashMap - - +Map->WeakHashMap + + -Map->LinkedHashMap - - +Map->LinkedHashMap + + -Map->ListMap - - +Map->ListMap + + + + +Map->TreeMap + + -Map->ImmutableMapAdaptor - - +Map->ImmutableMapAdaptor + + -ObservableMap - -ObservableMap +ObservableMap + +ObservableMap -Map->ObservableMap - - +Map->ObservableMap + + -SynchronizedMap +SynchronizedMap SynchronizedMap -Map->SynchronizedMap - - +Map->SynchronizedMap + + -MultiMap +MultiMap MultiMap -Map->MultiMap - - +Map->MultiMap + + -Seq->Stack - - +Seq->Stack + + -Seq->ArrayStack - - - - -Seq->PriorityQueue - - +Seq->ArrayStack + + -LinearSeq - -LinearSeq +LinearSeq + +LinearSeq -Seq->LinearSeq - - +Seq->LinearSeq + + -IndexedSeq - -IndexedSeq +IndexedSeq + +IndexedSeq -Seq->IndexedSeq - - +Seq->IndexedSeq + + -Buffer - -Buffer +Buffer + +Buffer -Seq->Buffer - - +Seq->Buffer + + -Set->HashSet +Set->HashSet -Set->ImmutableSetAdaptor +Set->ImmutableSetAdaptor -Set->LinkedHashSet +Set->LinkedHashSet -ObservableSet +ObservableSet ObservableSet -Set->ObservableSet +Set->ObservableSet -SynchronizedSet +SynchronizedSet SynchronizedSet -Set->SynchronizedSet +Set->SynchronizedSet -SortedSet +SortedSet SortedSet -Set->SortedSet +Set->SortedSet -BitSet +BitSet BitSet -SortedSet->BitSet +SortedSet->BitSet -LinearSeq->MutableList - - +LinearSeq->MutableList + + -LinearSeq->LinkedList - - +LinearSeq->LinkedList + + -LinearSeq->DoubleLinkedList - - +LinearSeq->DoubleLinkedList + + -IndexedSeq->ArraySeq - - +IndexedSeq->ArraySeq + + -IndexedSeq->ArrayBuffer - - +IndexedSeq->ArrayBuffer + + -IndexedSeq->StringBuilder - - +IndexedSeq->StringBuilder + + -Buffer->ArrayBuffer - - +Buffer->ArrayBuffer + + -Buffer->ListBuffer - - +Buffer->ListBuffer + + -ObservableBuffer - -ObservableBuffer +ObservableBuffer + +ObservableBuffer -Buffer->ObservableBuffer - - +Buffer->ObservableBuffer + + -SynchronizedBuffer - -SynchronizedBuffer +SynchronizedBuffer + +SynchronizedBuffer -Buffer->SynchronizedBuffer - - +Buffer->SynchronizedBuffer + + -Queue->SynchronizedQueue - - +Queue->SynchronizedQueue + +