From f38dd328528849161455361c0ed0b2214634f98f Mon Sep 17 00:00:00 2001 From: Julien Gouesse Date: Wed, 24 Sep 2014 23:27:40 +0200 Subject: Stops using Guava to create the lists, the sets and the maps except when it is really necessary --- ardor3d-swt/src/main/java/com/ardor3d/image/util/SWTImageUtil.java | 4 ++-- ardor3d-swt/src/main/java/com/ardor3d/input/swt/SwtMouseWrapper.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'ardor3d-swt') diff --git a/ardor3d-swt/src/main/java/com/ardor3d/image/util/SWTImageUtil.java b/ardor3d-swt/src/main/java/com/ardor3d/image/util/SWTImageUtil.java index cb6348e..7ac9068 100644 --- a/ardor3d-swt/src/main/java/com/ardor3d/image/util/SWTImageUtil.java +++ b/ardor3d-swt/src/main/java/com/ardor3d/image/util/SWTImageUtil.java @@ -11,6 +11,7 @@ package com.ardor3d.image.util; import java.nio.ByteBuffer; +import java.util.ArrayList; import java.util.List; import org.eclipse.swt.graphics.Color; @@ -19,7 +20,6 @@ import org.eclipse.swt.graphics.PaletteData; import com.ardor3d.image.Image; import com.ardor3d.image.PixelDataType; -import com.google.common.collect.Lists; /** * Utility methods for converting Ardor3D Images to SWT ImageData. @@ -65,7 +65,7 @@ public abstract class SWTImageUtil { final int width = input.getWidth(), height = input.getHeight(); // create our return list - final List rVal = Lists.newArrayList(); + final List rVal = new ArrayList(); // Calculate our modulation or "tint" values per channel final double tRed = tint != null ? tint.getRed() / 255. : 1.0; diff --git a/ardor3d-swt/src/main/java/com/ardor3d/input/swt/SwtMouseWrapper.java b/ardor3d-swt/src/main/java/com/ardor3d/input/swt/SwtMouseWrapper.java index 4067060..3b735eb 100644 --- a/ardor3d-swt/src/main/java/com/ardor3d/input/swt/SwtMouseWrapper.java +++ b/ardor3d-swt/src/main/java/com/ardor3d/input/swt/SwtMouseWrapper.java @@ -30,7 +30,6 @@ import com.ardor3d.input.MouseState; import com.ardor3d.input.MouseWrapper; import com.google.common.collect.AbstractIterator; import com.google.common.collect.EnumMultiset; -import com.google.common.collect.Maps; import com.google.common.collect.Multiset; import com.google.common.collect.PeekingIterator; @@ -51,7 +50,7 @@ public class SwtMouseWrapper implements MouseWrapper, MouseListener, MouseMoveLi private MouseState _lastState = null; private final Multiset _clicks = EnumMultiset.create(MouseButton.class); - private final EnumMap _lastClickTime = Maps.newEnumMap(MouseButton.class); + private final EnumMap _lastClickTime = new EnumMap(MouseButton.class); private final EnumSet _clickArmed = EnumSet.noneOf(MouseButton.class); public SwtMouseWrapper(final Control control) { @@ -91,7 +90,7 @@ public class SwtMouseWrapper implements MouseWrapper, MouseListener, MouseMoveLi @Override public synchronized void mouseDoubleClick(final MouseEvent mouseEvent) { - // ignoring this. We'll handle (multi)click in a uniform way + // ignoring this. We'll handle (multi)click in a uniform way } @Override -- cgit v1.2.3