Thread: [Joafip-svn] SF.net SVN: joafip:[3021] trunk (Page 4)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3021
          http://joafip.svn.sourceforge.net/joafip/?rev=3021&view=rev
Author:   luc_peuvrier
Date:     2012-04-20 01:43:56 +0000 (Fri, 20 Apr 2012)
Log Message:
-----------
data record key moved to joafip-kvstore because of common usage

Modified Paths:
--------------
    trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java
    trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.java

Added Paths:
-----------
    trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/DataRecordKey.java

Removed Paths:
-------------
    trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java

Deleted: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java
===================================================================

--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java	2012-04-19 02:51:34 UTC (rev 3020)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java	2012-04-20 01:43:56 UTC (rev 3021)
@@ -1,83 +0,0 @@
-/*
- * Copyright 2012 Luc Peuvrier
- *
- * This file is a part of JOAFIP.
- * 
- * JOAFIP is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License.
- * 
- * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
- * Licensed under the LGPL License, Version 3, 29 June 2007 (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.gnu.org/licenses/lgpl.html
- *
- * JOAFIP is distributed in the hope that it will be useful, but
- * 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 net.sf.joafip.heapfile.record.entity;
-
-import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.kvstore.record.entity.IDataRecordKey;
-import net.sf.joafip.kvstore.record.service.IDataRecordKeyManager;
-import net.sf.joafip.kvstore.service.HeapException;
-
-/**
- * 
- * @author luc peuvrier
- * 
- */
-@NotStorableClass
-public class DataRecordKey implements IDataRecordKey {
-
-	private final IDataRecordKeyManager dataRecordKeyManager;
-
-	private final byte[] data;
-
-	private transient Object key;
-
-	public DataRecordKey(final IDataRecordKeyManager dataRecordKeyManager,
-			final byte[] data) {// NOPMD
-		super();
-		this.dataRecordKeyManager = dataRecordKeyManager;
-		this.data = data;
-	}
-
-	@Override
-	public int getKeyHashcode() {
-		return 0;
-	}
-
-	@Override
-	public int compareTo(final IDataRecordKey dataRecordKey)
-			throws HeapException {
-		return dataRecordKeyManager.compareDataRecordKey(this, dataRecordKey);
-	}
-
-	@Override
-	public int getKeyDataSize() {
-		return data.length;
-	}
-
-	@Override
-	public byte[] getKeyData() {
-		return data; // NOPMD
-	}
-
-	@Override
-	public Object getKey() throws HeapException {
-		if (key == null) {
-			key = dataRecordKeyManager.unmarshall(data);
-		}
-		return key;
-	}
-
-	public void setKey(final Object key) {
-		this.key = key;
-	}
-}

Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java	2012-04-19 02:51:34 UTC (rev 3020)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/HeapRecord.java	2012-04-20 01:43:56 UTC (rev 3021)
@@ -22,6 +22,7 @@
 import net.sf.joafip.NotStorableClass;
 import net.sf.joafip.kvstore.entity.AbstractFileStorable;
 import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordKey;
 import net.sf.joafip.kvstore.record.entity.IDataRecordKey;
 import net.sf.joafip.kvstore.record.service.HeapElementManager;
 import net.sf.joafip.kvstore.record.service.IHeapElementManager;

Modified: trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.java
===================================================================
--- trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.java	2012-04-19 02:51:34 UTC (rev 3020)
+++ trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/service/DataRecordKeyManager.java	2012-04-20 01:43:56 UTC (rev 3021)
@@ -29,8 +29,8 @@
 import java.util.Comparator;
 
 import net.sf.joafip.NotStorableClass;
-import net.sf.joafip.heapfile.record.entity.DataRecordKey;
 import net.sf.joafip.kvstore.record.entity.DataRecordIdentifier;
+import net.sf.joafip.kvstore.record.entity.DataRecordKey;
 import net.sf.joafip.kvstore.service.HeapException;
 
 /**

Copied: trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/DataRecordKey.java (from rev 3020, trunk/joafip-heapfile/src/main/java/net/sf/joafip/heapfile/record/entity/DataRecordKey.java)
===================================================================
--- trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/DataRecordKey.java	                        (rev 0)
+++ trunk/joafip-kvstore/src/main/java/net/sf/joafip/kvstore/record/entity/DataRecordKey.java	2012-04-20 01:43:56 UTC (rev 3021)
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2012 Luc Peuvrier
+ *
+ * This file is a part of JOAFIP.
+ * 
+ * JOAFIP is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License.
+ * 
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+ * Licensed under the LGPL License, Version 3, 29 June 2007 (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.gnu.org/licenses/lgpl.html
+ *
+ * JOAFIP is distributed in the hope that it will be useful, but
+ * 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 net.sf.joafip.kvstore.record.entity;
+
+import net.sf.joafip.NotStorableClass;
+import net.sf.joafip.kvstore.record.service.IDataRecordKeyManager;
+import net.sf.joafip.kvstore.service.HeapException;
+
+/**
+ * 
+ * @author luc peuvrier
+ * 
+ */
+@NotStorableClass
+public class DataRecordKey implements IDataRecordKey {
+
+	private final IDataRecordKeyManager dataRecordKeyManager;
+
+	private final byte[] data;
+
+	private transient Object key;
+
+	public DataRecordKey(final IDataRecordKeyManager dataRecordKeyManager,
+			final byte[] data) {// NOPMD
+		super();
+		this.dataRecordKeyManager = dataRecordKeyManager;
+		this.data = data;
+	}
+
+	@Override
+	public int getKeyHashcode() {
+		return 0;
+	}
+
+	@Override
+	public int compareTo(final IDataRecordKey dataRecordKey)
+			throws HeapException {
+		return dataRecordKeyManager.compareDataRecordKey(this, dataRecordKey);
+	}
+
+	@Override
+	public int getKeyDataSize() {
+		return data.length;
+	}
+
+	@Override
+	public byte[] getKeyData() {
+		return data; // NOPMD
+	}
+
+	@Override
+	public Object getKey() throws HeapException {
+		if (key == null) {
+			key = dataRecordKeyManager.unmarshall(data);
+		}
+		return key;
+	}
+
+	public void setKey(final Object key) {
+		this.key = key;
+	}
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Joafip-svn] SF.net SVN: joafip:[3021] trunk (Page 4)

joafip-svn