Fixed wrong import.
This commit is contained in:
parent
10658f682e
commit
23a2316157
|
@ -11,7 +11,6 @@ import java.util.Iterator;
|
||||||
import java.util.LinkedHashSet;
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
@ -54,6 +53,7 @@ import org.apache.commons.lang3.tuple.Pair;
|
||||||
|
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.base.Charsets;
|
||||||
import com.google.common.base.Function;
|
import com.google.common.base.Function;
|
||||||
|
import com.google.common.base.Objects;
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
import com.google.common.cache.CacheBuilder;
|
import com.google.common.cache.CacheBuilder;
|
||||||
import com.google.common.cache.CacheLoader;
|
import com.google.common.cache.CacheLoader;
|
||||||
|
@ -1244,7 +1244,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
|
||||||
@Override
|
@Override
|
||||||
public int hashCode()
|
public int hashCode()
|
||||||
{
|
{
|
||||||
return Objects.hash(visibilityMap, parent, operation);
|
return Objects.hashCode(visibilityMap, parent, operation);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -1257,8 +1257,8 @@ public class OBJModel implements IRetexturableModel, IModelCustomData
|
||||||
if (getClass() != obj.getClass())
|
if (getClass() != obj.getClass())
|
||||||
return false;
|
return false;
|
||||||
OBJState other = (OBJState) obj;
|
OBJState other = (OBJState) obj;
|
||||||
return Objects.equals(visibilityMap, other.visibilityMap) &&
|
return Objects.equal(visibilityMap, other.visibilityMap) &&
|
||||||
Objects.equals(parent, other.parent) &&
|
Objects.equal(parent, other.parent) &&
|
||||||
operation == other.operation;
|
operation == other.operation;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue