[jboss-remoting-commits] JBoss Remoting SVN: r5582 - remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream.

[jboss-remoting-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2009-11-04 18:17:36 -0500 (Wed, 04 Nov 2009)
New Revision: 5582

Removed:
   remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java
Modified:
   remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java
Log:
Use Pair from JBMAR API instead

Deleted: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java	2009-11-04 21:34:33 UTC (rev 5581)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Pair.java	2009-11-04 23:17:36 UTC (rev 5582)
@@ -1,68 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting3.stream;
-
-import java.io.Serializable;
-
-/**
- * A serializable pair of values.
- *
- * @param <A> the type of the first value
- * @param <B> the type of the second value
- */
-public final class Pair<A, B> implements Serializable {
-
-    private static final long serialVersionUID = -1812076980977921946L;
-
-    private final A a;
-    private final B b;
-
-    /**
-     * Construct a new instance.
-     *
-     * @param a the first value
-     * @param b the second value
-     */
-    public Pair(final A a, final B b) {
-        this.a = a;
-        this.b = b;
-    }
-
-    /**
-     * Get the first value.
-     *
-     * @return the first value
-     */
-    public A getA() {
-        return a;
-    }
-
-    /**
-     * Get the second value.
-     *
-     * @return the second value
-     */
-    public B getB() {
-        return b;
-    }
-}

Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java	2009-11-04 21:34:33 UTC (rev 5581)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/stream/Streams.java	2009-11-04 23:17:36 UTC (rev 5582)
@@ -8,6 +8,7 @@
 import java.util.NoSuchElementException;
 import java.util.Map;
 import java.util.concurrent.Executor;
+import org.jboss.marshalling.Pair;
 import org.jboss.xnio.IoFuture;
 import org.jboss.xnio.FutureResult;
 import org.jboss.xnio.Cancellable;