diff --git a/.classpath b/.classpath index 395dbde0..753d0007 100644 --- a/.classpath +++ b/.classpath @@ -13,15 +13,11 @@ - - - - - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index abec6ca3..107056a3 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,12 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 0d7f4b0e..65c94b9a 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -20,7 +20,7 @@ import com.rarchives.ripme.utils.Utils; public abstract class AbstractRipper extends Observable - implements RipperInterface { + implements RipperInterface, Runnable { private static final Logger logger = Logger.getLogger(AbstractRipper.class); @@ -221,4 +221,11 @@ public abstract class AbstractRipper } } + public void run() { + try { + rip(); + } catch (IOException e) { + logger.error("Got exception while running ripper:", e); + } + } } \ No newline at end of file diff --git a/src/main/java/com/rarchives/ripme/ui/MainWindow.java b/src/main/java/com/rarchives/ripme/ui/MainWindow.java index 1088e656..ab0edfca 100644 --- a/src/main/java/com/rarchives/ripme/ui/MainWindow.java +++ b/src/main/java/com/rarchives/ripme/ui/MainWindow.java @@ -63,7 +63,8 @@ public class MainWindow implements Runnable { URL url = new URL(ripTextfield.getText()); AbstractRipper ripper = AbstractRipper.getRipper(url); ripper.setObserver(new RipStatusHandler()); - ripper.rip(); + Thread t = new Thread(ripper); + t.start(); } catch (Exception e) { status("Error: " + e.getMessage()); return; diff --git a/src/main/java/com/rarchives/ripme/ui/RipStatusMessage.java b/src/main/java/com/rarchives/ripme/ui/RipStatusMessage.java index 3158b6eb..340a391a 100644 --- a/src/main/java/com/rarchives/ripme/ui/RipStatusMessage.java +++ b/src/main/java/com/rarchives/ripme/ui/RipStatusMessage.java @@ -5,7 +5,7 @@ public class RipStatusMessage { public enum STATUS { LOADING_RESOURCE("Loading Resource"), DOWNLOAD_STARTED("Download Started"), - DOWNLOAD_COMPLETE("Download Domplete"), + DOWNLOAD_COMPLETE("Download Complete"), DOWNLOAD_ERRORED("Download Errored"), RIP_COMPLETE("Rip Complete");