Remove useless singletons

This commit is contained in:
Reinhard Pointner 2017-05-25 11:21:04 +08:00
parent d36c033d92
commit e53602c98b
4 changed files with 1 additions and 7 deletions

View File

@ -20,8 +20,6 @@ import net.filebot.web.SortOrder;
public class PhotoFileMatcher implements Datasource, AutoCompleteMatcher {
public static final PhotoFileMatcher INSTANCE = new PhotoFileMatcher();
@Override
public String getIdentifier() {
return "exif";

View File

@ -17,8 +17,6 @@ import net.filebot.web.SortOrder;
public class PlainFileMatcher implements Datasource, AutoCompleteMatcher {
public static final PlainFileMatcher INSTANCE = new PlainFileMatcher();
@Override
public String getIdentifier() {
return "file";

View File

@ -143,7 +143,7 @@ public class Preset {
}
public static Datasource[] getGenericFileMatcherServices() {
return new Datasource[] { PhotoFileMatcher.INSTANCE, XattrFileMatcher.INSTANCE, PlainFileMatcher.INSTANCE };
return new Datasource[] { new PhotoFileMatcher(), new XattrFileMatcher(), new PlainFileMatcher() };
}
public static StandardRenameAction[] getSupportedActions() {

View File

@ -13,8 +13,6 @@ import net.filebot.web.SortOrder;
public class XattrFileMatcher extends XattrMetaInfoProvider implements AutoCompleteMatcher {
public static final XattrFileMatcher INSTANCE = new XattrFileMatcher();
@Override
public List<Match<File, ?>> match(Collection<File> files, boolean strict, SortOrder order, Locale locale, boolean autodetection, Component parent) throws Exception {
List<Match<File, ?>> matches = new ArrayList<Match<File, ?>>();