diff options
Diffstat (limited to 'jimfs')
17 files changed, 12 insertions, 41 deletions
diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/AbstractAttributeView.java b/jimfs/src/main/java/com/google/jimfs/attribute/AbstractAttributeView.java index faf3162..fe6cf11 100644 --- a/jimfs/src/main/java/com/google/jimfs/attribute/AbstractAttributeView.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/AbstractAttributeView.java @@ -18,8 +18,6 @@ package com.google.jimfs.attribute; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.jimfs.common.IoSupplier; - import java.io.IOException; import java.nio.file.attribute.FileAttributeView; diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/AttributeViewProvider.java b/jimfs/src/main/java/com/google/jimfs/attribute/AttributeViewProvider.java index 27648b2..435df94 100644 --- a/jimfs/src/main/java/com/google/jimfs/attribute/AttributeViewProvider.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/AttributeViewProvider.java @@ -16,8 +16,6 @@ package com.google.jimfs.attribute; -import com.google.jimfs.common.IoSupplier; - import java.nio.file.attribute.FileAttributeView; /** diff --git a/jimfs/src/main/java/com/google/jimfs/common/IoSupplier.java b/jimfs/src/main/java/com/google/jimfs/attribute/IoSupplier.java index 38d29ad..a2e3b1d 100644 --- a/jimfs/src/main/java/com/google/jimfs/common/IoSupplier.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/IoSupplier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.jimfs.common; +package com.google.jimfs.attribute; import java.io.IOException; diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/providers/AclAttributeProvider.java b/jimfs/src/main/java/com/google/jimfs/attribute/providers/AclAttributeProvider.java index efd2d99..b901db6 100644 --- a/jimfs/src/main/java/com/google/jimfs/attribute/providers/AclAttributeProvider.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/providers/AclAttributeProvider.java @@ -25,7 +25,7 @@ import com.google.jimfs.attribute.AbstractAttributeView; import com.google.jimfs.attribute.Attribute; import com.google.jimfs.attribute.AttributeStore; import com.google.jimfs.attribute.AttributeViewProvider; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.io.IOException; import java.nio.file.attribute.AclEntry; diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/providers/BasicAttributeProvider.java b/jimfs/src/main/java/com/google/jimfs/attribute/providers/BasicAttributeProvider.java index 61d3543..de7545a 100644 --- a/jimfs/src/main/java/com/google/jimfs/attribute/providers/BasicAttributeProvider.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/providers/BasicAttributeProvider.java @@ -24,7 +24,7 @@ import com.google.jimfs.attribute.AttributeProvider; import com.google.jimfs.attribute.AttributeReader; import com.google.jimfs.attribute.AttributeStore; import com.google.jimfs.attribute.AttributeViewProvider; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.io.IOException; import java.nio.file.attribute.BasicFileAttributeView; diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/providers/DosAttributeProvider.java b/jimfs/src/main/java/com/google/jimfs/attribute/providers/DosAttributeProvider.java index abe0bdd..2c6cc54 100644 --- a/jimfs/src/main/java/com/google/jimfs/attribute/providers/DosAttributeProvider.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/providers/DosAttributeProvider.java @@ -23,7 +23,7 @@ import com.google.jimfs.attribute.Attribute; import com.google.jimfs.attribute.AttributeReader; import com.google.jimfs.attribute.AttributeStore; import com.google.jimfs.attribute.AttributeViewProvider; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.io.IOException; import java.nio.file.attribute.BasicFileAttributeView; diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/providers/OwnerAttributeProvider.java b/jimfs/src/main/java/com/google/jimfs/attribute/providers/OwnerAttributeProvider.java index 1d26162..dbbcc34 100644 --- a/jimfs/src/main/java/com/google/jimfs/attribute/providers/OwnerAttributeProvider.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/providers/OwnerAttributeProvider.java @@ -24,7 +24,7 @@ import com.google.jimfs.attribute.AbstractAttributeView; import com.google.jimfs.attribute.Attribute; import com.google.jimfs.attribute.AttributeStore; import com.google.jimfs.attribute.AttributeViewProvider; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.io.IOException; import java.nio.file.attribute.FileOwnerAttributeView; diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/providers/PosixAttributeProvider.java b/jimfs/src/main/java/com/google/jimfs/attribute/providers/PosixAttributeProvider.java index 1d9273c3..0cd577d 100644 --- a/jimfs/src/main/java/com/google/jimfs/attribute/providers/PosixAttributeProvider.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/providers/PosixAttributeProvider.java @@ -26,7 +26,7 @@ import com.google.jimfs.attribute.Attribute; import com.google.jimfs.attribute.AttributeReader; import com.google.jimfs.attribute.AttributeStore; import com.google.jimfs.attribute.AttributeViewProvider; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.io.IOException; import java.nio.file.attribute.BasicFileAttributeView; diff --git a/jimfs/src/main/java/com/google/jimfs/attribute/providers/UserDefinedAttributeProvider.java b/jimfs/src/main/java/com/google/jimfs/attribute/providers/UserDefinedAttributeProvider.java index 64089f1..fea82d4 100644 --- a/jimfs/src/main/java/com/google/jimfs/attribute/providers/UserDefinedAttributeProvider.java +++ b/jimfs/src/main/java/com/google/jimfs/attribute/providers/UserDefinedAttributeProvider.java @@ -22,7 +22,7 @@ import com.google.jimfs.attribute.AbstractAttributeView; import com.google.jimfs.attribute.AttributeProvider; import com.google.jimfs.attribute.AttributeStore; import com.google.jimfs.attribute.AttributeViewProvider; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/jimfs/src/main/java/com/google/jimfs/common/package-info.java b/jimfs/src/main/java/com/google/jimfs/common/package-info.java deleted file mode 100644 index 225325c..0000000 --- a/jimfs/src/main/java/com/google/jimfs/common/package-info.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2013 Google Inc. - * - * 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 containing common interfaces and classes that don't belong anywhere else. - */ -@ParametersAreNonnullByDefault -package com.google.jimfs.common; - -import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file diff --git a/jimfs/src/main/java/com/google/jimfs/internal/AttributeService.java b/jimfs/src/main/java/com/google/jimfs/internal/AttributeService.java index 6bdcae3..4d8ed86 100644 --- a/jimfs/src/main/java/com/google/jimfs/internal/AttributeService.java +++ b/jimfs/src/main/java/com/google/jimfs/internal/AttributeService.java @@ -28,7 +28,7 @@ import com.google.jimfs.attribute.AttributeProvider; import com.google.jimfs.attribute.AttributeReader; import com.google.jimfs.attribute.AttributeStore; import com.google.jimfs.attribute.AttributeViewProvider; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.nio.file.FileStore; import java.nio.file.FileSystem; diff --git a/jimfs/src/main/java/com/google/jimfs/internal/FileSystemView.java b/jimfs/src/main/java/com/google/jimfs/internal/FileSystemView.java index 3ec73d3..b440206 100644 --- a/jimfs/src/main/java/com/google/jimfs/internal/FileSystemView.java +++ b/jimfs/src/main/java/com/google/jimfs/internal/FileSystemView.java @@ -26,7 +26,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Lists; import com.google.jimfs.Jimfs; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.io.IOException; import java.nio.file.DirectoryNotEmptyException; diff --git a/jimfs/src/main/java/com/google/jimfs/internal/JimfsFileStore.java b/jimfs/src/main/java/com/google/jimfs/internal/JimfsFileStore.java index e28f185..3c606d1 100644 --- a/jimfs/src/main/java/com/google/jimfs/internal/JimfsFileStore.java +++ b/jimfs/src/main/java/com/google/jimfs/internal/JimfsFileStore.java @@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; import com.google.jimfs.Jimfs; import com.google.jimfs.attribute.AttributeStore; -import com.google.jimfs.common.IoSupplier; +import com.google.jimfs.attribute.IoSupplier; import java.io.IOException; import java.nio.file.FileStore; diff --git a/jimfs/src/test/java/com/google/jimfs/attribute/AbstractAttributeProviderTest.java b/jimfs/src/test/java/com/google/jimfs/attribute/AbstractAttributeProviderTest.java index a80af73..9c11200 100644 --- a/jimfs/src/test/java/com/google/jimfs/attribute/AbstractAttributeProviderTest.java +++ b/jimfs/src/test/java/com/google/jimfs/attribute/AbstractAttributeProviderTest.java @@ -20,7 +20,6 @@ import static org.truth0.Truth.ASSERT; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import com.google.jimfs.common.IoSupplier; import org.junit.Before; import org.junit.Test; diff --git a/jimfs/src/test/java/com/google/jimfs/attribute/TestAttributeProvider.java b/jimfs/src/test/java/com/google/jimfs/attribute/TestAttributeProvider.java index 1bde87c..c02a78d 100644 --- a/jimfs/src/test/java/com/google/jimfs/attribute/TestAttributeProvider.java +++ b/jimfs/src/test/java/com/google/jimfs/attribute/TestAttributeProvider.java @@ -17,7 +17,6 @@ package com.google.jimfs.attribute; import com.google.common.collect.ImmutableSet; -import com.google.jimfs.common.IoSupplier; import java.io.IOException; import java.nio.file.attribute.FileTime; diff --git a/jimfs/src/test/java/com/google/jimfs/attribute/providers/AttributeProviderTest.java b/jimfs/src/test/java/com/google/jimfs/attribute/providers/AttributeProviderTest.java index 5e576aa..a237ef1 100644 --- a/jimfs/src/test/java/com/google/jimfs/attribute/providers/AttributeProviderTest.java +++ b/jimfs/src/test/java/com/google/jimfs/attribute/providers/AttributeProviderTest.java @@ -22,8 +22,8 @@ import static org.truth0.Truth.ASSERT; import com.google.common.collect.ImmutableMap; import com.google.jimfs.attribute.AttributeProvider; import com.google.jimfs.attribute.AttributeStore; +import com.google.jimfs.attribute.IoSupplier; import com.google.jimfs.attribute.TestAttributeStore; -import com.google.jimfs.common.IoSupplier; import org.junit.Before; diff --git a/jimfs/src/test/java/com/google/jimfs/internal/AttributeServiceTest.java b/jimfs/src/test/java/com/google/jimfs/internal/AttributeServiceTest.java index 39093bc..b1038a8 100644 --- a/jimfs/src/test/java/com/google/jimfs/internal/AttributeServiceTest.java +++ b/jimfs/src/test/java/com/google/jimfs/internal/AttributeServiceTest.java @@ -23,12 +23,12 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.jimfs.AttributeViews; import com.google.jimfs.attribute.BasicFileAttribute; +import com.google.jimfs.attribute.IoSupplier; import com.google.jimfs.attribute.TestAttributeProvider; import com.google.jimfs.attribute.TestAttributeView; import com.google.jimfs.attribute.TestAttributes; import com.google.jimfs.attribute.providers.BasicAttributeProvider; import com.google.jimfs.attribute.providers.OwnerAttributeProvider; -import com.google.jimfs.common.IoSupplier; import org.junit.Before; import org.junit.Test; |