diff options
Diffstat (limited to 'jimfs/src/main')
-rw-r--r-- | jimfs/src/main/java/com/google/jimfs/Configuration.java | 2 | ||||
-rw-r--r-- | jimfs/src/main/java/com/google/jimfs/Normalization.java (renamed from jimfs/src/main/java/com/google/jimfs/path/Normalization.java) | 2 | ||||
-rw-r--r-- | jimfs/src/main/java/com/google/jimfs/PathType.java (renamed from jimfs/src/main/java/com/google/jimfs/path/PathType.java) | 2 | ||||
-rw-r--r-- | jimfs/src/main/java/com/google/jimfs/UnixPathType.java (renamed from jimfs/src/main/java/com/google/jimfs/path/UnixPathType.java) | 2 | ||||
-rw-r--r-- | jimfs/src/main/java/com/google/jimfs/WindowsPathType.java (renamed from jimfs/src/main/java/com/google/jimfs/path/WindowsPathType.java) | 2 | ||||
-rw-r--r-- | jimfs/src/main/java/com/google/jimfs/internal/PathService.java | 6 | ||||
-rw-r--r-- | jimfs/src/main/java/com/google/jimfs/internal/package-info.java | 2 | ||||
-rw-r--r-- | jimfs/src/main/java/com/google/jimfs/path/package-info.java | 24 |
8 files changed, 8 insertions, 34 deletions
diff --git a/jimfs/src/main/java/com/google/jimfs/Configuration.java b/jimfs/src/main/java/com/google/jimfs/Configuration.java index d5540bd..8f2e4c0 100644 --- a/jimfs/src/main/java/com/google/jimfs/Configuration.java +++ b/jimfs/src/main/java/com/google/jimfs/Configuration.java @@ -22,8 +22,6 @@ import static com.google.common.base.Preconditions.checkState; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import com.google.jimfs.path.Normalization; -import com.google.jimfs.path.PathType; import java.nio.file.attribute.BasicFileAttributeView; import java.util.Collections; diff --git a/jimfs/src/main/java/com/google/jimfs/path/Normalization.java b/jimfs/src/main/java/com/google/jimfs/Normalization.java index e64c5c7..78996dd 100644 --- a/jimfs/src/main/java/com/google/jimfs/path/Normalization.java +++ b/jimfs/src/main/java/com/google/jimfs/Normalization.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.jimfs.path; +package com.google.jimfs; import com.google.common.base.Ascii; import com.google.common.base.Objects; diff --git a/jimfs/src/main/java/com/google/jimfs/path/PathType.java b/jimfs/src/main/java/com/google/jimfs/PathType.java index c840787..ee8ca16 100644 --- a/jimfs/src/main/java/com/google/jimfs/path/PathType.java +++ b/jimfs/src/main/java/com/google/jimfs/PathType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.jimfs.path; +package com.google.jimfs; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/jimfs/src/main/java/com/google/jimfs/path/UnixPathType.java b/jimfs/src/main/java/com/google/jimfs/UnixPathType.java index 95d55dc..d329e08 100644 --- a/jimfs/src/main/java/com/google/jimfs/path/UnixPathType.java +++ b/jimfs/src/main/java/com/google/jimfs/UnixPathType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.jimfs.path; +package com.google.jimfs; import static com.google.common.base.Preconditions.checkArgument; diff --git a/jimfs/src/main/java/com/google/jimfs/path/WindowsPathType.java b/jimfs/src/main/java/com/google/jimfs/WindowsPathType.java index 72a3f81..846ca17 100644 --- a/jimfs/src/main/java/com/google/jimfs/path/WindowsPathType.java +++ b/jimfs/src/main/java/com/google/jimfs/WindowsPathType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.jimfs.path; +package com.google.jimfs; import java.nio.file.InvalidPathException; import java.util.Iterator; diff --git a/jimfs/src/main/java/com/google/jimfs/internal/PathService.java b/jimfs/src/main/java/com/google/jimfs/internal/PathService.java index ba6c9cf..112fc98 100644 --- a/jimfs/src/main/java/com/google/jimfs/internal/PathService.java +++ b/jimfs/src/main/java/com/google/jimfs/internal/PathService.java @@ -19,15 +19,15 @@ package com.google.jimfs.internal; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkState; -import static com.google.jimfs.path.PathType.ParseResult; +import static com.google.jimfs.PathType.ParseResult; import com.google.common.base.Functions; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.jimfs.path.Normalization; -import com.google.jimfs.path.PathType; +import com.google.jimfs.Normalization; +import com.google.jimfs.PathType; import java.net.URI; import java.nio.file.FileSystem; diff --git a/jimfs/src/main/java/com/google/jimfs/internal/package-info.java b/jimfs/src/main/java/com/google/jimfs/internal/package-info.java index d8019e3..976a7c0 100644 --- a/jimfs/src/main/java/com/google/jimfs/internal/package-info.java +++ b/jimfs/src/main/java/com/google/jimfs/internal/package-info.java @@ -48,7 +48,7 @@ * * The implementation of {@link java.nio.file.Path} for the file system is {@link JimfsPath}. Paths * are created by a {@link PathService} with help from the file system's configured - * {@link com.google.jimfs.path.PathType PathType}. + * {@link com.google.jimfs.PathType PathType}. * * <p>Paths are made up of {@link com.google.jimfs.internal.Name Name} objects, which also serve as the * file names in directories. Names are basically enhanced strings that may have different notions diff --git a/jimfs/src/main/java/com/google/jimfs/path/package-info.java b/jimfs/src/main/java/com/google/jimfs/path/package-info.java deleted file mode 100644 index 349731e..0000000 --- a/jimfs/src/main/java/com/google/jimfs/path/package-info.java +++ /dev/null @@ -1,24 +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. - */ - -/** - * This package contains classes used for configuring the representation and handling of file - * system paths. - */ -@ParametersAreNonnullByDefault -package com.google.jimfs.path; - -import javax.annotation.ParametersAreNonnullByDefault;
\ No newline at end of file |