Skip to content

FileLocation improvements #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ctrueden merged 2 commits into from
Oct 16, 2018
Merged

FileLocation improvements #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9cf223
AbstractLocation: implement a sensible toString()
ctrueden Oct 16, 2018
d9eac4e
FileLocation: require non-Null arguments
Feb 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/java/org/scijava/io/location/AbstractLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

package org.scijava.io.location;

import java.net.URI;
import java.util.Objects;

/**
Expand All @@ -58,4 +59,13 @@ public boolean equals(final Object obj) {
return Objects.equals(getURI(), other.getURI());
}

@Override
public String toString() {
final String prefix = getClass().getSimpleName() + ":";
final URI uri = getURI();
if (uri != null) return prefix + uri;
final String name = getName();
if (name != null) return prefix + name;
return prefix + defaultName();
}
}
2 changes: 2 additions & 0 deletions src/main/java/org/scijava/io/location/FileLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.net.URI;
import java.util.Collections;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;

/**
Expand All @@ -52,6 +53,7 @@ public class FileLocation extends AbstractLocation implements
private final File file;

public FileLocation(final File file) {
Objects.requireNonNull(file);
this.file = file;
}

Expand Down