Renamed BlockMapEntryVisitor to BlockMapEntryPlacer.

This commit is contained in:
sk89q 2014-03-31 18:51:12 -07:00
parent 6985ff5250
commit 0c14737891
2 changed files with 5 additions and 6 deletions

View File

@ -27,9 +27,9 @@ import com.sk89q.worldedit.blocks.BlockID;
import com.sk89q.worldedit.blocks.BlockType; import com.sk89q.worldedit.blocks.BlockType;
import com.sk89q.worldedit.extent.ExtentDelegate; import com.sk89q.worldedit.extent.ExtentDelegate;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.operation.BlockMapEntryPlacer;
import com.sk89q.worldedit.function.operation.Operation; import com.sk89q.worldedit.function.operation.Operation;
import com.sk89q.worldedit.function.operation.OperationQueue; import com.sk89q.worldedit.function.operation.OperationQueue;
import com.sk89q.worldedit.function.visitor.BlockMapEntryVisitor;
import java.util.*; import java.util.*;
@ -110,7 +110,7 @@ public class SimpleBlockReorder extends ExtentDelegate {
@Override @Override
public Operation commitBefore() { public Operation commitBefore() {
return new OperationQueue( return new OperationQueue(
new BlockMapEntryVisitor( new BlockMapEntryPlacer(
getExtent(), getExtent(),
Iterators.concat(stage1.iterator(), stage2.iterator())), Iterators.concat(stage1.iterator(), stage2.iterator())),
new Stage3Committer()); new Stage3Committer());

View File

@ -17,25 +17,24 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
package com.sk89q.worldedit.function.visitor; package com.sk89q.worldedit.function.operation;
import com.sk89q.worldedit.BlockVector; import com.sk89q.worldedit.BlockVector;
import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.WorldEditException;
import com.sk89q.worldedit.blocks.BaseBlock; import com.sk89q.worldedit.blocks.BaseBlock;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.function.operation.Operation;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map; import java.util.Map;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
public class BlockMapEntryVisitor implements Operation { public class BlockMapEntryPlacer implements Operation {
private final Extent extent; private final Extent extent;
private final Iterator<Map.Entry<BlockVector, BaseBlock>> iterator; private final Iterator<Map.Entry<BlockVector, BaseBlock>> iterator;
public BlockMapEntryVisitor(Extent extent, Iterator<Map.Entry<BlockVector, BaseBlock>> iterator) { public BlockMapEntryPlacer(Extent extent, Iterator<Map.Entry<BlockVector, BaseBlock>> iterator) {
checkNotNull(extent); checkNotNull(extent);
checkNotNull(iterator); checkNotNull(iterator);
this.extent = extent; this.extent = extent;