/*
 * Copyright (c) 2016, Stein Eldar johnsen
 *
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. 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. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */
package net.morimekta.util;

import java.util.Objects;

/**
 * Container to ease passing around a tuple of two objects. This object
 * provides a sensible implementation of equals(), returning true if equals()
 * is true on each of the contained objects.
 */
public class Pair<F, S> {
    public final F first;
    public final S second;

    /**
     * Constructor for a Pair.
     *
     * @param first First part of pair.
     * @param second Second part of pair.
     */
    public Pair(F first, S second) {
        this.first = first;
        this.second = second;
    }

    /**
     * Convenience method for creating an appropriately typed pair.
     *
     * @param <A> First type.
     * @param <B> Second type.
     * @param a First part.
     * @param b Second part.
     * @return The resulting pair.
     */
    public static <A, B> Pair<A, B> create(A a, B b) {
        return new Pair<>(a, b);
    }

    @Override
    public boolean equals(Object o) {
        if (o == this) {
            return true;
        }
        if (o == null || !(getClass().equals(o.getClass()))) {
            return false;
        }
        Pair<?, ?> other = (Pair<?, ?>) o;

        return (Objects.equals(first, other.first) &&
                Objects.equals(second, other.second));
    }

    @Override
    public int hashCode() {
        return Objects.hash(Pair.class, first, second);
    }

    @Override
    public String toString() {
        return String.format("(%s,%s)",
                             Objects.toString(first),
                             Objects.toString(second));
    }
}

@@ -1136,29 +1136,111 @@
     
-public final F first;
+/**%0A     * The first value.%0A     */%0A    public final F first;%0A%0A    /**%0A     * The second value.%0A     */
 %0A   
@@ -1833,32 +1833,356 @@
 %3E(a, b);%0A    %7D%0A%0A
+    /**%0A     * Convenience method to get the first value.%0A     *%0A     * @return The first value.%0A     */%0A    public F getFirst() %7B%0A        return first;%0A    %7D%0A%0A    /**%0A     * Convenience method to get the second value.%0A     *%0A     * @return The second value.%0A     */%0A    public S getSecond() %7B%0A        return second;%0A    %7D%0A%0A
     @Override%0A  

Add convenience method for pair getFirst getSecond.