Move disposition class to model

Signed-off-by: jruesga <jorge@ruesga.com>

2 files changed, 1 insertions, 86 deletions

diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/Disposition.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/Disposition.java
deleted file mode 100644
index 008522a..0000000
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/Disposition.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2013 The CyanogenMod Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.cyanogenmod.wallpapers.photophase.preferences;
-
-import org.cyanogenmod.wallpapers.photophase.PhotoFrame;
-
-/**
- * A class that holds a {@link PhotoFrame} disposition.
- */
-public class Disposition {
-    /**
-     * Column
-     */
-    public int x;
-    /**
-     * Row
-     */
-    public int y;
-    /**
-     * Columns width
-     */
-    public int w;
-    /**
-     * Rows height
-     */
-    public int h;
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + h;
-        result = prime * result + w;
-        result = prime * result + x;
-        result = prime * result + y;
-        return result;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        Disposition other = (Disposition) obj;
-        if (h != other.h)
-            return false;
-        if (w != other.w)
-            return false;
-        if (x != other.x)
-            return false;
-        if (y != other.y)
-            return false;
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public String toString() {
-        return "Disposition [x=" + x + ", y=" + y + ", w=" + w + ", h=" + h + "]";
-    }
-}
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
index 8d04258..deaac53 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/PreferencesProvider.java
@@ -22,6 +22,7 @@ import android.content.SharedPreferences.Editor;
 
 import org.cyanogenmod.wallpapers.photophase.GLESUtil.GLColor;
 import org.cyanogenmod.wallpapers.photophase.effects.Effects.EFFECTS;
+import org.cyanogenmod.wallpapers.photophase.model.Disposition;
 import org.cyanogenmod.wallpapers.photophase.transitions.Transitions.TRANSITIONS;
 
 import java.util.ArrayList;