Permalink
Browse files

Actually enable the uploader

  • Loading branch information...
nikkiii committed Jul 31, 2014
1 parent 5638e1f commit 40bedcdcbb7ab9bfc1662d80dafd41debb46d175
Showing with 5 additions and 3 deletions.
  1. +1 −1 src/org/sleeksnap/Constants.java
  2. +4 −2 src/org/sleeksnap/ScreenSnapper.java
@@ -60,7 +60,7 @@
public static class Version {
public static final int MAJOR = 1;
public static final int MINOR = 4;
public static final int PATCH = 8;
public static final int PATCH = 9;
private static String versionString = null;
@@ -89,6 +89,7 @@
import org.sleeksnap.uploaders.generic.GenericUploader;
import org.sleeksnap.uploaders.generic.LocalFileUploader;
import org.sleeksnap.uploaders.generic.LocalFileUploader.ImageLocalFileUploader;
import org.sleeksnap.uploaders.images.ImageScriptUploader;
import org.sleeksnap.uploaders.images.ImagebinUploader;
import org.sleeksnap.uploaders.images.ImgurUploader;
import org.sleeksnap.uploaders.images.ImmioUploader;
@@ -202,7 +203,7 @@ public static void main(String[] args) {
/**
* A map which contains uploader classes -> a list of available uploaders
*/
private HashMap<Class<? extends Upload>, Map<String, Uploader<?>>> uploaders = new HashMap<Class<? extends Upload>, Map<String, Uploader<?>>>();
private HashMap<Class<? extends Upload>, Map<String, Uploader<? extends Upload>>> uploaders = new HashMap<Class<? extends Upload>, Map<String, Uploader<? extends Upload>>>();
/**
* A map which contains the current uploader settings
@@ -811,6 +812,7 @@ private void loadUploaders() throws Exception {
registerUploaderClass(ImmioUploader.class);
registerUploaderClass(PuushUploader.class);
registerUploaderClass(ImagebinUploader.class);
registerUploaderClass(ImageScriptUploader.class);
// Text uploaders
registerUploaderClass(LaravelUploader.class);
registerUploaderClass(Paste2Uploader.class);
@@ -945,7 +947,7 @@ public void windowClosed(WindowEvent e) {
Class<? extends Upload> type = getUploaderType(uploader);
// Check for the current list of types
if (!uploaders.containsKey(type)) {
uploaders.put(type, new HashMap<String, Uploader<?>>());
uploaders.put(type, new HashMap<String, Uploader<? extends Upload>>());
}
uploader.onActivation();
uploaders.get(type).put(uploader.getClass().getName(), uploader);

0 comments on commit 40bedcd

Please sign in to comment.