(no commit message)

diff --git a/support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java b/support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java
deleted file mode 100644 (file)
index ec8a9ee..0000000
--- a/support/general/src/main/java/org/wamblee/persistence/AbstractPersistent.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2005-2010 the original author or authors.
- * 
- * 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.wamblee.persistence;
-
-import java.io.Serializable;
-
-/**
- * Default implementation of Persistent.
- * 
- * @author Erik Brakkee
- */
-public abstract class AbstractPersistent implements Persistent {
-    /**
-     * Primary key.
-     */
-    private Serializable primaryKey;
-
-    /**
-     * Version.
-     */
-    private int version;
-
-    /**
-     * Constructs the object.
-     * 
-     */
-    protected AbstractPersistent() {
-        primaryKey = null;
-        version = -1;
-    }
-
-    /**
-     * Copy constructor.
-     * 
-     * @param aPersistent
-     *            Object to copy.
-     */
-    protected AbstractPersistent(AbstractPersistent aPersistent) {
-        primaryKey = aPersistent.primaryKey;
-        version = aPersistent.version;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.persistence.Persistent#getPrimaryKey()
-     */
-    public Serializable getPrimaryKey() {
-        return primaryKey;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.wamblee.persistence.Persistent#setPrimaryKey(java.io.Serializable)
-     */
-    public void setPrimaryKey(Serializable aKey) {
-        primaryKey = aKey;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.persistence.Persistent#getPersistedVersion()
-     */
-    public int getPersistedVersion() {
-        return version;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.wamblee.persistence.Persistent#setPersistedVersion(int)
-     */
-    public void setPersistedVersion(int aVersion) {
-        version = aVersion;
-    }
-}

diff --git a/support/general/src/main/java/org/wamblee/persistence/Persistent.java b/support/general/src/main/java/org/wamblee/persistence/Persistent.java
index 78d0e0d13b3c58a9bbfa3391759c7e05bf68d922..7b78691c2a4b00611ebe9086cf599dfe76440a02 100644 (file)
--- a/support/general/src/main/java/org/wamblee/persistence/Persistent.java
+++ b/support/general/src/main/java/org/wamblee/persistence/Persistent.java
@@ -33,7 +33,7 @@ public interface Persistent {
      * 
      * @see #setPrimaryKey(Serializable)
      */
-    Serializable getPrimaryKey();
+    Long getPrimaryKey();
 
     /**
      * Sets the primary key.
@@ -43,7 +43,7 @@ public interface Persistent {
      * 
      * @see #getPrimaryKey()
      */
-    void setPrimaryKey(Serializable aKey);
+    void setPrimaryKey(Long aKey);
 
     /**
      * Gets the version.