aboutsummaryrefslogtreecommitdiff
path: root/jimfs/src/main
diff options
context:
space:
mode:
authorColin Decker <cgdecker@google.com>2013-10-17 18:41:26 -0400
committerColin Decker <cgdecker@google.com>2013-10-17 18:53:57 -0400
commit39b138fb7ded20889e9179da9f3561d74f1fa737 (patch)
tree3a7b763a0aaceef66c70234044c7f3f8ded2011d /jimfs/src/main
parent310b24bfd1a05230d0ef030c470fa1c130bccb95 (diff)
downloadjimfs-39b138fb7ded20889e9179da9f3561d74f1fa737.tar.gz
Change Inode.id() from a long to an int.
Diffstat (limited to 'jimfs/src/main')
-rw-r--r--jimfs/src/main/java/com/google/jimfs/attribute/Inode.java6
-rw-r--r--jimfs/src/main/java/com/google/jimfs/attribute/UnixAttributeProvider.java2
-rw-r--r--jimfs/src/main/java/com/google/jimfs/internal/File.java2
-rw-r--r--jimfs/src/main/java/com/google/jimfs/internal/FileFactory.java6
4 files changed, 8 insertions, 8 deletions
diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/Inode.java b/jimfs/src/main/java/com/google/jimfs/attribute/Inode.java
index 27bac2a..be28f93 100644
--- a/jimfs/src/main/java/com/google/jimfs/attribute/Inode.java
+++ b/jimfs/src/main/java/com/google/jimfs/attribute/Inode.java
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicLong;
*/
public abstract class Inode {
- private final long id;
+ private final int id;
private final AtomicInteger links = new AtomicInteger();
@@ -41,7 +41,7 @@ public abstract class Inode {
private final ConcurrentMap<String, Object> attributes = new ConcurrentHashMap<>();
- public Inode(long id) {
+ public Inode(int id) {
this.id = id;
long now = System.currentTimeMillis(); // TODO(cgdecker): Use a Clock
@@ -53,7 +53,7 @@ public abstract class Inode {
/**
* Returns the ID of the file.
*/
- public long id() {
+ public int id() {
return id;
}
diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/UnixAttributeProvider.java b/jimfs/src/main/java/com/google/jimfs/attribute/UnixAttributeProvider.java
index 6b67c93..ee4669b 100644
--- a/jimfs/src/main/java/com/google/jimfs/attribute/UnixAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/jimfs/attribute/UnixAttributeProvider.java
@@ -114,7 +114,7 @@ final class UnixAttributeProvider extends AttributeProvider<UnixFileAttributeVie
case "dev":
return 1L;
case "ino":
- return getUniqueId(inode);
+ return inode.id();
case "nlink":
return inode.links();
}
diff --git a/jimfs/src/main/java/com/google/jimfs/internal/File.java b/jimfs/src/main/java/com/google/jimfs/internal/File.java
index 4e53f98..7ba8134 100644
--- a/jimfs/src/main/java/com/google/jimfs/internal/File.java
+++ b/jimfs/src/main/java/com/google/jimfs/internal/File.java
@@ -36,7 +36,7 @@ final class File extends Inode {
private final FileContent content;
- public File(long id, FileContent content) {
+ public File(int id, FileContent content) {
super(id);
this.content = checkNotNull(content);
}
diff --git a/jimfs/src/main/java/com/google/jimfs/internal/FileFactory.java b/jimfs/src/main/java/com/google/jimfs/internal/FileFactory.java
index 7a84663..8b68ad0 100644
--- a/jimfs/src/main/java/com/google/jimfs/internal/FileFactory.java
+++ b/jimfs/src/main/java/com/google/jimfs/internal/FileFactory.java
@@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Supplier;
-import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* Factory for creating new files and copying files. One piece of the file store implementation.
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicLong;
*/
final class FileFactory {
- private final AtomicLong idGenerator = new AtomicLong();
+ private final AtomicInteger idGenerator = new AtomicInteger();
private final RegularFileStorage storage;
@@ -40,7 +40,7 @@ final class FileFactory {
this.storage = checkNotNull(storage);
}
- private long nextFileId() {
+ private int nextFileId() {
return idGenerator.getAndIncrement();
}