aboutsummaryrefslogtreecommitdiff
path: root/jimfs/src/main
diff options
context:
space:
mode:
authorColin Decker <cgdecker@google.com>2014-01-22 15:31:43 -0800
committerColin Decker <cgdecker@google.com>2014-01-22 15:31:43 -0800
commit2b304c6c9b9acc86874156be1063efc46787f4d6 (patch)
treeeba5d92a002196e7224647c1ffe89b7efd6f211f /jimfs/src/main
parent68a70f4dcce1122311ef42fdee317e03e494cd75 (diff)
downloadjimfs-2b304c6c9b9acc86874156be1063efc46787f4d6.tar.gz
Fix a couple lines that were too long and remove useless package-info.java
Diffstat (limited to 'jimfs/src/main')
-rw-r--r--jimfs/src/main/java/com/google/jimfs/Configuration.java12
-rw-r--r--jimfs/src/main/java/com/google/jimfs/package-info.java24
2 files changed, 8 insertions, 28 deletions
diff --git a/jimfs/src/main/java/com/google/jimfs/Configuration.java b/jimfs/src/main/java/com/google/jimfs/Configuration.java
index c87484b..51da149 100644
--- a/jimfs/src/main/java/com/google/jimfs/Configuration.java
+++ b/jimfs/src/main/java/com/google/jimfs/Configuration.java
@@ -286,7 +286,8 @@ public final class Configuration {
* Sets the normalizations that will be applied to the display form of filenames. The display
* form is used in the {@code toString()} of {@code Path} objects.
*/
- public Builder setNameDisplayNormalization(PathNormalization first, PathNormalization... more) {
+ public Builder setNameDisplayNormalization(
+ PathNormalization first, PathNormalization... more) {
this.nameDisplayNormalization = checkNormalizations(Lists.asList(first, more));
return this;
}
@@ -296,12 +297,14 @@ public final class Configuration {
* file system. The canonical form is used to determine the equality of two filenames when
* performing a file lookup.
*/
- public Builder setNameCanonicalNormalization(PathNormalization first, PathNormalization... more) {
+ public Builder setNameCanonicalNormalization(
+ PathNormalization first, PathNormalization... more) {
this.nameCanonicalNormalization = checkNormalizations(Lists.asList(first, more));
return this;
}
- private ImmutableSet<PathNormalization> checkNormalizations(List<PathNormalization> normalizations) {
+ private ImmutableSet<PathNormalization> checkNormalizations(
+ List<PathNormalization> normalizations) {
PathNormalization none = null;
PathNormalization normalization = null;
PathNormalization caseFold = null;
@@ -334,7 +337,8 @@ public final class Configuration {
return Sets.immutableEnumSet(normalizations);
}
- private static void checkNormalizationNotSet(PathNormalization n, @Nullable PathNormalization set) {
+ private static void checkNormalizationNotSet(
+ PathNormalization n, @Nullable PathNormalization set) {
if (set != null) {
throw new IllegalArgumentException("can't set normalization " + n
+ ": normalization " + set + " already set");
diff --git a/jimfs/src/main/java/com/google/jimfs/package-info.java b/jimfs/src/main/java/com/google/jimfs/package-info.java
deleted file mode 100644
index 8637c41..0000000
--- a/jimfs/src/main/java/com/google/jimfs/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.
- */
-
-/**
- * Package containing the {@link com.google.jimfs.Jimfs Jimfs} class, used for creating new Jimfs
- * file systems.
- */
-@ParametersAreNonnullByDefault
-package com.google.jimfs;
-
-import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file