[libgee] Rename Future.join to Future.zip

[Maciej Marcin Piechotka <mpiechotka src gnome org>]

commit 0736429257e89e764123676c6933269c14ae784f
Author: Maciej Piechotka <uzytkownik2 gmail com>
Date:   Tue Jul 9 20:20:31 2013 +0200

    Rename Future.join to Future.zip

 gee/Makefile.am                         |    2 +-
 gee/future.vala                         |    6 +++---
 gee/{joinfuture.vala => zipfuture.vala} |    8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gee/Makefile.am b/gee/Makefile.am
index 9ee336b..3974014 100644
--- a/gee/Makefile.am
+++ b/gee/Makefile.am
@@ -42,7 +42,6 @@ libgee_0_8_la_SOURCES = \
        hazardpointer.vala \
        iterable.vala \
        iterator.vala \
-       joinfuture.vala \
        lazy.vala \
        linkedlist.vala \
        lightmapfuture.vala \
@@ -79,6 +78,7 @@ libgee_0_8_la_SOURCES = \
        treemultiset.vala \
        treeset.vala \
        unfolditerator.vala \
+       zipfuture.vala \
        $(NULL)
 
 libgee_0_8_la_VALAFLAGS = \
diff --git a/gee/future.vala b/gee/future.vala
index e548fd1..e73863e 100644
--- a/gee/future.vala
+++ b/gee/future.vala
@@ -173,7 +173,7 @@ public interface Gee.Future<G> : Object {
        }
 
        [CCode (scope = "async")]
-       public delegate C JoinFunc<A, B, C>(A a, B b);
+       public delegate C ZipFunc<A, B, C>(A a, B b);
 
        /**
         * Combines values of two futures using a function returning the combined
@@ -189,8 +189,8 @@ public interface Gee.Future<G> : Object {
         *   value eagerly by { link when_done} it is recommended to return a
         *   future from { link task} and use { link flat_map} for longer computation.
         */
-       public virtual Future<B> join<A, B> (JoinFunc<G, A, B> join_func, Future<A> second) {
-               return new JoinFuture<G, A, B> (join_func, this, second);
+       public virtual Future<B> zip<A, B> (ZipFunc<G, A, B> zip_func, Future<A> second) {
+               return new ZipFuture<G, A, B> (zip_func, this, second);
        }
 
        [CCode (scope = "async")]
diff --git a/gee/joinfuture.vala b/gee/zipfuture.vala
similarity index 95%
rename from gee/joinfuture.vala
rename to gee/zipfuture.vala
index fcdc8c7..514e776 100644
--- a/gee/joinfuture.vala
+++ b/gee/zipfuture.vala
@@ -1,4 +1,4 @@
-/* joinfuture.vala
+/* zipfuture.vala
  *
  * Copyright (C) 2013  Maciej Piechotka
  *
@@ -20,8 +20,8 @@
  *     Maciej Piechotka <uzytkownik2 gmail com>
  */
 
-internal class Gee.JoinFuture<A, B, C> : GLib.Object, Gee.Future<C> {
-       public JoinFuture (Future.JoinFunc<A, B, C> func, Future<A> left, Future<B> right) {
+internal class Gee.ZipFuture<A, B, C> : GLib.Object, Gee.Future<C> {
+       public ZipFuture (Future.ZipFunc<A, B, C> func, Future<A> left, Future<B> right) {
                _left = left;
                _right = right;
                _func = func;
@@ -172,7 +172,7 @@ internal class Gee.JoinFuture<A, B, C> : GLib.Object, Gee.Future<C> {
        private Cond _cond = Cond ();
        private Future<A> _left;
        private Future<B> _right;
-       private Future.JoinFunc<A, B, C> _func;
+       private Future.ZipFunc<A, B, C> _func;
        private C _value;
        private Future.WhenDoneArrayElement<C>[]? _when_done = new Future.WhenDoneArrayElement<C>[0];
        private Progress _progress = Progress.INIT;