Version 12, December 2010

[GpsPrune.git] / tim / prune / data / Photo.java

diff --git a/tim/prune/data/Photo.java b/tim/prune/data/Photo.java
index 7ffe35dec984511a6de8d7e522cb1aa25b4c7932..c9046743a704ca2629e8341ebef1d4497f878384 100644 (file)
--- a/tim/prune/data/Photo.java
+++ b/tim/prune/data/Photo.java
@@ -8,93 +8,23 @@ import javax.swing.ImageIcon;
 /**
  * Class to represent a photo and link to DataPoint
  */
-public class Photo
+public class Photo extends MediaFile
 {
-       /** File where photo is stored */
-       private File _file = null;
-       /** Timestamp, if any */
-       private Timestamp _timestamp = null;
-       /** Associated DataPoint if correlated */
-       private DataPoint _dataPoint = null;
        /** Size of original image */
        private Dimension _size = null;
-       /** Status of photo when loaded */
-       private Status _originalStatus = Status.NOT_CONNECTED;
-       /** Current photo status */
-       private Status _currentStatus = Status.NOT_CONNECTED;
        /** rotation flag (clockwise from 0 to 3) */
        private int _rotation = 0;
        // TODO: Need to store caption for image?
        // thumbnail for image (from exif)
        private byte[] _exifThumbnail = null;
 
-       /** Photo status */
-       public enum Status {
-               /** Photo is not connected to any point */
-               NOT_CONNECTED,
-               /** Photo has been connected to a point since it was loaded */
-               TAGGED,
-               /** Photo is connected to a point */
-               CONNECTED
-       };
-
        /**
         * Constructor
         * @param inFile File object for photo
         */
        public Photo(File inFile)
        {
-               _file = inFile;
-       }
-
-
-       /**
-        * @return File object where photo resides
-        */
-       public File getFile()
-       {
-               return _file;
-       }
-
-
-       /**
-        * Set the data point associated with the photo
-        * @param inPoint DataPoint with coordinates etc
-        */
-       public void setDataPoint(DataPoint inPoint)
-       {
-               _dataPoint = inPoint;
-               // set status according to point
-               if (inPoint == null) {
-                       setCurrentStatus(Status.NOT_CONNECTED);
-               }
-               else {
-                       setCurrentStatus(Status.CONNECTED);
-               }
-       }
-
-       /**
-        * @return the DataPoint object
-        */
-       public DataPoint getDataPoint()
-       {
-               return _dataPoint;
-       }
-
-       /**
-        * @param inTimestamp Timestamp of photo
-        */
-       public void setTimestamp(Timestamp inTimestamp)
-       {
-               _timestamp = inTimestamp;
-       }
-
-       /**
-        * @return timestamp of photo
-        */
-       public Timestamp getTimestamp()
-       {
-               return _timestamp;
+               super(inFile, null);
        }
 
        /**
@@ -116,8 +46,7 @@ public class Photo
         */
        public Dimension getSize()
        {
-               if (_size == null)
-               {
+               if (_size == null) {
                        calculateSize();
                }
                return _size;
@@ -149,46 +78,6 @@ public class Photo
                return _size.height;
        }
 
-       /**
-        * @param inStatus status of photo when loaded
-        */
-       public void setOriginalStatus(Status inStatus)
-       {
-               _originalStatus = inStatus;
-               _currentStatus = inStatus;
-       }
-
-       /**
-        * @return status of photo when it was loaded
-        */
-       public Status getOriginalStatus()
-       {
-               return _originalStatus;
-       }
-
-       /**
-        * @return current status of photo
-        */
-       public Status getCurrentStatus()
-       {
-               return _currentStatus;
-       }
-       /**
-        * @param inStatus current status of photo
-        */
-       public void setCurrentStatus(Status inStatus)
-       {
-               _currentStatus = inStatus;
-       }
-
-       /**
-        * @return true if photo is connected to a point
-        */
-       public boolean isConnected()
-       {
-               return _currentStatus != Status.NOT_CONNECTED;
-       }
-
        /**
         * @return byte array of thumbnail data
         */
@@ -214,17 +103,6 @@ public class Photo
                // remove thumbnail too
        }
 
-       /**
-        * Check if a Photo object refers to the same File as another
-        * @param inOther other Photo object
-        * @return true if the Files are the same
-        */
-       public boolean equals(Photo inOther)
-       {
-               return (inOther != null && inOther.getFile() != null && getFile() != null
-                       && inOther.getFile().equals(getFile()));
-       }
-
        /**
         * @param inRotation initial rotation value (from exif)
         */