1 files changed, 7 insertions, 57 deletions
diff --git a/lib/domain/libimagdiary/src/entry.rs b/lib/domain/libimagdiary/src/entry.rs
index 4e654f5e..40206404 100644
--- a/lib/domain/libimagdiary/src/entry.rs
+++ b/lib/domain/libimagdiary/src/entry.rs
@@ -17,74 +17,24 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use std::ops::Deref;
-use std::ops::DerefMut;
-
-use libimagstore::store::FileLockEntry;
-use libimagentryedit::edit::Edit;
-use libimagentryedit::error::Result as EditResult;
-use libimagrt::runtime::Runtime;
+use libimagstore::store::Entry;
 
 use diaryid::DiaryId;
 use diaryid::FromStoreId;
+use error::Result;
 
-#[derive(Debug)]
-pub struct Entry<'a>(FileLockEntry<'a>);
-
-impl<'a> Deref for Entry<'a> {
-    type Target = FileLockEntry<'a>;
-
-    fn deref(&self) -> &FileLockEntry<'a> {
-        &self.0
-    }
-
-}
-
-impl<'a> DerefMut for Entry<'a> {
-
-    fn deref_mut(&mut self) -> &mut FileLockEntry<'a> {
-        &mut self.0
-    }
-
+pub trait DiaryEntry {
+    fn diary_id(&self) -> Result<DiaryId>;
 }
 
-impl<'a> Entry<'a> {
-
-    pub fn new(fle: FileLockEntry<'a>) -> Entry<'a> {
-        Entry(fle)
-    }
+impl DiaryEntry for Entry {
 
     /// Get the diary id for this entry.
     ///
     /// TODO: calls Option::unwrap() as it assumes that an existing Entry has an ID that is parsable
-    pub fn diary_id(&self) -> DiaryId {
-        DiaryId::from_storeid(&self.0.get_location().clone()).unwrap()
-    }
-
-}
-
-impl<'a> Into<FileLockEntry<'a>> for Entry<'a> {
-
-    fn into(self) -> FileLockEntry<'a> {
-        self.0
-    }
-
-}
-
-impl<'a> From<FileLockEntry<'a>> for Entry<'a> {
-
-    fn from(fle: FileLockEntry<'a>) -> Entry<'a> {
-        Entry::new(fle)
+    fn diary_id(&self) -> Result<DiaryId> {
+        DiaryId::from_storeid(&self.get_location().clone())
     }
 
 }
 
-impl<'a> Edit for Entry<'a> {
-
-    fn edit_content(&mut self, rt: &Runtime) -> EditResult<()> {
-        self.0.edit_content(rt)
-    }
-
-}
-
-