Move AdaptObjectIntProcedureToProcedure to be a top-level class.

eclipse-collections/src/main/java/org/eclipse/collections/impl/block/procedure/AdaptObjectIntProcedureToProcedure.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016 Goldman Sachs.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompany this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.eclipse.collections.impl.block.procedure;
+
+import org.eclipse.collections.api.block.procedure.Procedure;
+import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure;
+import org.eclipse.collections.impl.Counter;
+
+public final class AdaptObjectIntProcedureToProcedure<V> implements Procedure<V>
+{
+    private static final long serialVersionUID = 1L;
+
+    private final Counter index;
+    private final ObjectIntProcedure<? super V> objectIntProcedure;
+
+    public AdaptObjectIntProcedureToProcedure(ObjectIntProcedure<? super V> objectIntProcedure)
+    {
+        this.objectIntProcedure = objectIntProcedure;
+        this.index = new Counter();
+    }
+
+    public void value(V each)
+    {
+        this.objectIntProcedure.value(each, this.index.getCount());
+        this.index.increment();
+    }
+}

eclipse-collections/src/main/java/org/eclipse/collections/impl/lazy/FlatCollectIterable.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Goldman Sachs.
+ * Copyright (c) 2016 Goldman Sachs.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * and Eclipse Distribution License v. 1.0 which accompany this distribution.
@@ -19,8 +19,8 @@
 import org.eclipse.collections.api.block.procedure.Procedure;
 import org.eclipse.collections.api.block.procedure.Procedure2;
 import org.eclipse.collections.api.block.procedure.primitive.ObjectIntProcedure;
-import org.eclipse.collections.impl.Counter;
 import org.eclipse.collections.impl.block.factory.Predicates;
+import org.eclipse.collections.impl.block.procedure.AdaptObjectIntProcedureToProcedure;
 import org.eclipse.collections.impl.lazy.iterator.FlatCollectIterator;
 import org.eclipse.collections.impl.utility.Iterate;
 
@@ -158,24 +158,4 @@ public Iterator<V> iterator()
     {
         return new FlatCollectIterator<T, V>(this.adapted, this.function);
     }
-
-    private static final class AdaptObjectIntProcedureToProcedure<V> implements Procedure<V>
-    {
-        private static final long serialVersionUID = 1L;
-
-        private final Counter index;
-        private final ObjectIntProcedure<? super V> objectIntProcedure;
-
-        private AdaptObjectIntProcedureToProcedure(ObjectIntProcedure<? super V> objectIntProcedure)
-        {
-            this.objectIntProcedure = objectIntProcedure;
-            this.index = new Counter();
-        }
-
-        public void value(V each)
-        {
-            this.objectIntProcedure.value(each, this.index.getCount());
-            this.index.increment();
-        }
-    }
 }

serialization-tests/src/test/java/org/eclipse/collections/impl/block/procedure/AdaptObjectIntProcedureToProcedureTest.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016 Goldman Sachs.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v. 1.0 which accompany this distribution.
+ * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ */
+
+package org.eclipse.collections.impl.block.procedure;
+
+import org.eclipse.collections.impl.test.Verify;
+import org.junit.Test;
+
+public class AdaptObjectIntProcedureToProcedureTest
+{
+    @Test
+    public void serializedForm()
+    {
+        Verify.assertSerializedForm(
+                1L,
+                "rO0ABXNyAE9vcmcuZWNsaXBzZS5jb2xsZWN0aW9ucy5pbXBsLmJsb2NrLnByb2NlZHVyZS5BZGFw\n"
+                        + "dE9iamVjdEludFByb2NlZHVyZVRvUHJvY2VkdXJlAAAAAAAAAAECAAJMAAVpbmRleHQAJkxvcmcv\n"
+                        + "ZWNsaXBzZS9jb2xsZWN0aW9ucy9pbXBsL0NvdW50ZXI7TAASb2JqZWN0SW50UHJvY2VkdXJldABK\n"
+                        + "TG9yZy9lY2xpcHNlL2NvbGxlY3Rpb25zL2FwaS9ibG9jay9wcm9jZWR1cmUvcHJpbWl0aXZlL09i\n"
+                        + "amVjdEludFByb2NlZHVyZTt4cHNyACRvcmcuZWNsaXBzZS5jb2xsZWN0aW9ucy5pbXBsLkNvdW50\n"
+                        + "ZXIAAAAAAAAAAQwAAHhwdwQAAAAAeHA=",
+                new AdaptObjectIntProcedureToProcedure<Object>(null));
+    }
+}