knut/album
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cosmetc/compiler warnings

Browse source
This commit is contained in:
Knut Forkalsrud 2011-07-31 13:39:33 -07:00
parent f95a97aa11
commit 86a09acc4c
5 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/forkalsrud/album/exif/ComparatorFactory.java
View file

@ -28,7 +28,8 @@ public class ComparatorFactory {
Comparator<Entry> directoryFirst = new Comparator<Entry>() { Comparator<Entry> directoryFirst = new Comparator<Entry>() {
public int compare(Entry e1, Entry e2) { @Override
public int compare(Entry e1, Entry e2) {
boolean d1 = "dir".equals(e1.getType()); boolean d1 = "dir".equals(e1.getType());
boolean d2 = "dir".equals(e2.getType()); boolean d2 = "dir".equals(e2.getType());
@ -44,7 +45,8 @@ public class ComparatorFactory {
Comparator<Entry> dates = new Comparator<Entry>() { Comparator<Entry> dates = new Comparator<Entry>() {
public int compare(Entry e1, Entry e2) { @Override
public int compare(Entry e1, Entry e2) {
Date d1 = e1.getEarliest(); Date d1 = e1.getEarliest();
Date d2 = e2.getEarliest(); Date d2 = e2.getEarliest();
@ -62,7 +64,8 @@ public class ComparatorFactory {
Comparator<Entry> names = new Comparator<Entry>() { Comparator<Entry> names = new Comparator<Entry>() {
public int compare(Entry e1, Entry e2) { @Override
public int compare(Entry e1, Entry e2) {
String n1 = e1.getName(); String n1 = e1.getName();
String n2 = e2.getName(); String n2 = e2.getName();
@ -91,7 +94,8 @@ public class ComparatorFactory {
return new Comparator<T>() { return new Comparator<T>() {
public int compare(T o1, T o2) { @Override
public int compare(T o1, T o2) {
return c.compare(o2, o1); return c.compare(o2, o1);
} }
}; };

3
src/main/java/org/forkalsrud/album/exif/ComposingComparator.java
View file

@ -18,7 +18,8 @@ public class ComposingComparator<T> implements Comparator<T> {
cmp = args; cmp = args;
} }
public int compare(T o1, T o2) { @Override
public int compare(T o1, T o2) {
for (Comparator<T> c : cmp) { for (Comparator<T> c : cmp) {
int result = c.compare(o1, o2); int result = c.compare(o1, o2);

1
src/main/java/org/forkalsrud/album/exif/DirectoryEntry.java
View file

@ -17,7 +17,6 @@ import java.util.List;
import org.forkalsrud.album.db.DirectoryDatabase; import org.forkalsrud.album.db.DirectoryDatabase;
import org.forkalsrud.album.db.DirectoryProps; import org.forkalsrud.album.db.DirectoryProps;
import org.forkalsrud.album.video.MovieCoder;
/** /**
* @author knut * @author knut

2
src/main/java/org/forkalsrud/album/exif/DirectoryEntryFactory.java
View file

@ -8,12 +8,10 @@ import org.forkalsrud.album.video.MovieCoder;
public class DirectoryEntryFactory implements DirectoryEntry.ServiceApi { public class DirectoryEntryFactory implements DirectoryEntry.ServiceApi {
private DirectoryDatabase dirDb; private DirectoryDatabase dirDb;
private MovieCoder movieCoder;
private DirectoryMetadataGenerator generator; private DirectoryMetadataGenerator generator;
public DirectoryEntryFactory(DirectoryDatabase dirDb, MovieCoder movieCoder) { public DirectoryEntryFactory(DirectoryDatabase dirDb, MovieCoder movieCoder) {
this.dirDb = dirDb; this.dirDb = dirDb;
this.movieCoder = movieCoder;
this.generator = new DirectoryMetadataGenerator(movieCoder); this.generator = new DirectoryMetadataGenerator(movieCoder);
} }

1
src/main/java/org/forkalsrud/album/exif/SearchResults.java
View file

@ -11,6 +11,7 @@ public class SearchResults extends EntryWithChildren<SearchEntry> {
protected HashMap<File, SearchEntry> dupes = new HashMap<File, SearchEntry>(); protected HashMap<File, SearchEntry> dupes = new HashMap<File, SearchEntry>();
Comparator<SearchEntry> sort = new Comparator<SearchEntry>() { Comparator<SearchEntry> sort = new Comparator<SearchEntry>() {
@Override
public int compare(SearchEntry e1, SearchEntry e2) { public int compare(SearchEntry e1, SearchEntry e2) {
return Integer.valueOf(e2.score).compareTo(e1.score); return Integer.valueOf(e2.score).compareTo(e1.score);