diff --git a/.classpath b/.classpath index 73991eb6..39a7d433 100644 --- a/.classpath +++ b/.classpath @@ -2,38 +2,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index 93a9863c..68386672 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ - + @@ -32,6 +32,17 @@ + + + + + + + + + + + @@ -871,4 +882,5 @@ + diff --git a/lib/ObjCBridge.jar b/lib/ObjCBridge.jar deleted file mode 100644 index f558a6f5..00000000 Binary files a/lib/ObjCBridge.jar and /dev/null differ diff --git a/lib/args4j.jar b/lib/args4j.jar deleted file mode 100644 index 09f69b22..00000000 Binary files a/lib/args4j.jar and /dev/null differ diff --git a/lib/build/bcpg.jar b/lib/build/bcpg.jar deleted file mode 100644 index b5306e06..00000000 Binary files a/lib/build/bcpg.jar and /dev/null differ diff --git a/lib/build/bcprov.jar b/lib/build/bcprov.jar deleted file mode 100644 index e1d4bb31..00000000 Binary files a/lib/build/bcprov.jar and /dev/null differ diff --git a/lib/build/httpclient.jar b/lib/build/httpclient.jar deleted file mode 100644 index b80d3796..00000000 Binary files a/lib/build/httpclient.jar and /dev/null differ diff --git a/lib/build/httpcore.jar b/lib/build/httpcore.jar deleted file mode 100644 index 99715b6a..00000000 Binary files a/lib/build/httpcore.jar and /dev/null differ diff --git a/lib/build/httpmime.jar b/lib/build/httpmime.jar deleted file mode 100644 index e748cbde..00000000 Binary files a/lib/build/httpmime.jar and /dev/null differ diff --git a/lib/build/junit.jar b/lib/build/junit.jar deleted file mode 100644 index fd2cccc5..00000000 Binary files a/lib/build/junit.jar and /dev/null differ diff --git a/lib/build/openpgp.jar b/lib/build/openpgp.jar deleted file mode 100644 index 420bcc3c..00000000 Binary files a/lib/build/openpgp.jar and /dev/null differ diff --git a/lib/commons-io.jar b/lib/commons-io.jar deleted file mode 100644 index 90035a4f..00000000 Binary files a/lib/commons-io.jar and /dev/null differ diff --git a/lib/ehcache.jar b/lib/ehcache.jar deleted file mode 100644 index ee8e0f81..00000000 Binary files a/lib/ehcache.jar and /dev/null differ diff --git a/lib/glazedlists.jar b/lib/glazedlists.jar deleted file mode 100644 index 9da35321..00000000 Binary files a/lib/glazedlists.jar and /dev/null differ diff --git a/lib/groovy.jar b/lib/groovy.jar deleted file mode 100644 index 410b9e24..00000000 Binary files a/lib/groovy.jar and /dev/null differ diff --git a/lib/icu4j.jar b/lib/icu4j.jar deleted file mode 100644 index 49a4b802..00000000 Binary files a/lib/icu4j.jar and /dev/null differ diff --git a/lib/build/ant-deb.jar b/lib/jars/ant-deb.jar similarity index 100% rename from lib/build/ant-deb.jar rename to lib/jars/ant-deb.jar diff --git a/lib/build/ant-spk.jar b/lib/jars/ant-spk.jar similarity index 100% rename from lib/build/ant-spk.jar rename to lib/jars/ant-spk.jar diff --git a/lib/build/appbundler.jar b/lib/jars/appbundler.jar similarity index 100% rename from lib/build/appbundler.jar rename to lib/jars/appbundler.jar diff --git a/lib/jacksum.jar b/lib/jars/jacksum.jar similarity index 100% rename from lib/jacksum.jar rename to lib/jars/jacksum.jar diff --git a/lib/sevenzipjbinding.jar b/lib/jars/sevenzipjbinding.jar similarity index 100% rename from lib/sevenzipjbinding.jar rename to lib/jars/sevenzipjbinding.jar diff --git a/lib/simmetrics.jar b/lib/jars/simmetrics.jar similarity index 100% rename from lib/simmetrics.jar rename to lib/jars/simmetrics.jar diff --git a/lib/xmlrpc.jar b/lib/jars/xmlrpc.jar similarity index 100% rename from lib/xmlrpc.jar rename to lib/jars/xmlrpc.jar diff --git a/lib/jna-platform.jar b/lib/jna-platform.jar deleted file mode 100644 index 8d5fe3de..00000000 Binary files a/lib/jna-platform.jar and /dev/null differ diff --git a/lib/jna.jar b/lib/jna.jar deleted file mode 100644 index b1a3922f..00000000 Binary files a/lib/jna.jar and /dev/null differ diff --git a/lib/json-io.jar b/lib/json-io.jar deleted file mode 100644 index d920d97b..00000000 Binary files a/lib/json-io.jar and /dev/null differ diff --git a/lib/json-simple.jar b/lib/json-simple.jar deleted file mode 100644 index 66347a6c..00000000 Binary files a/lib/json-simple.jar and /dev/null differ diff --git a/lib/jsoup.jar b/lib/jsoup.jar deleted file mode 100644 index aa5c798e..00000000 Binary files a/lib/jsoup.jar and /dev/null differ diff --git a/lib/miglayout-core.jar b/lib/miglayout-core.jar deleted file mode 100644 index eff5670b..00000000 Binary files a/lib/miglayout-core.jar and /dev/null differ diff --git a/lib/miglayout-swing.jar b/lib/miglayout-swing.jar deleted file mode 100644 index 25307d8e..00000000 Binary files a/lib/miglayout-swing.jar and /dev/null differ diff --git a/lib/rsyntaxtextarea.jar b/lib/rsyntaxtextarea.jar deleted file mode 100644 index d5423f83..00000000 Binary files a/lib/rsyntaxtextarea.jar and /dev/null differ diff --git a/lib/scripting/ant-commons-net.jar b/lib/scripting/ant-commons-net.jar deleted file mode 100644 index 1cb33c3e..00000000 Binary files a/lib/scripting/ant-commons-net.jar and /dev/null differ diff --git a/lib/scripting/ant-javamail.jar b/lib/scripting/ant-javamail.jar deleted file mode 100644 index ce3be56d..00000000 Binary files a/lib/scripting/ant-javamail.jar and /dev/null differ diff --git a/lib/scripting/ant-jsch.jar b/lib/scripting/ant-jsch.jar deleted file mode 100644 index 18cc4706..00000000 Binary files a/lib/scripting/ant-jsch.jar and /dev/null differ diff --git a/lib/scripting/ant-launcher.jar b/lib/scripting/ant-launcher.jar deleted file mode 100644 index 49f9ae44..00000000 Binary files a/lib/scripting/ant-launcher.jar and /dev/null differ diff --git a/lib/scripting/ant.jar b/lib/scripting/ant.jar deleted file mode 100644 index 428b2ee0..00000000 Binary files a/lib/scripting/ant.jar and /dev/null differ diff --git a/lib/scripting/commons-net.jar b/lib/scripting/commons-net.jar deleted file mode 100644 index f4f19a90..00000000 Binary files a/lib/scripting/commons-net.jar and /dev/null differ diff --git a/lib/scripting/ivy.jar b/lib/scripting/ivy.jar deleted file mode 100644 index 543de460..00000000 Binary files a/lib/scripting/ivy.jar and /dev/null differ diff --git a/lib/scripting/jsch.jar b/lib/scripting/jsch.jar deleted file mode 100644 index 725745f8..00000000 Binary files a/lib/scripting/jsch.jar and /dev/null differ diff --git a/lib/scripting/mail.jar b/lib/scripting/mail.jar deleted file mode 100644 index ca7eca7d..00000000 Binary files a/lib/scripting/mail.jar and /dev/null differ diff --git a/lib/slf4j-api.jar b/lib/slf4j-api.jar deleted file mode 100644 index 4c03fa6b..00000000 Binary files a/lib/slf4j-api.jar and /dev/null differ diff --git a/lib/slf4j-jdk14.jar b/lib/slf4j-jdk14.jar deleted file mode 100644 index b16db2e5..00000000 Binary files a/lib/slf4j-jdk14.jar and /dev/null differ diff --git a/lib/xz.jar b/lib/xz.jar deleted file mode 100644 index 2e9599ec..00000000 Binary files a/lib/xz.jar and /dev/null differ diff --git a/source/net/filebot/cli/GroovyPad.java b/source/net/filebot/cli/GroovyPad.java index d9dc082d..6d066b7d 100644 --- a/source/net/filebot/cli/GroovyPad.java +++ b/source/net/filebot/cli/GroovyPad.java @@ -121,7 +121,7 @@ public class GroovyPad extends JFrame { } protected JComponent createOutputLog() throws IOException { - output = new TextEditorPane(TextEditorPane.OVERWRITE_MODE, false); + output = new TextEditorPane(TextEditorPane.INSERT_MODE, false); output.setEditable(false); output.setReadOnly(true); output.setAutoscrolls(true); diff --git a/source/net/filebot/media/MetaAttributes.java b/source/net/filebot/media/MetaAttributes.java index 5541a52b..a300bbce 100644 --- a/source/net/filebot/media/MetaAttributes.java +++ b/source/net/filebot/media/MetaAttributes.java @@ -47,7 +47,7 @@ public class MetaAttributes { public void setObject(Object object) { try { metaAttributeView.put(METADATA_KEY, JsonWriter.objectToJson(object)); - } catch (IOException e) { + } catch (Exception e) { throw new RuntimeException(e); } } @@ -58,7 +58,7 @@ public class MetaAttributes { if (jsonObject != null && jsonObject.length() > 0) { return JsonReader.jsonToJava(jsonObject); } - } catch (IOException e) { + } catch (Exception e) { throw new RuntimeException(e); } return null; diff --git a/source/net/filebot/ui/rename/FormatDialog.java b/source/net/filebot/ui/rename/FormatDialog.java index 28f7e2ad..5d1863f9 100644 --- a/source/net/filebot/ui/rename/FormatDialog.java +++ b/source/net/filebot/ui/rename/FormatDialog.java @@ -650,7 +650,7 @@ public class FormatDialog extends JDialog { try { mode.persistentSample().setValue(info == null ? "" : JsonWriter.objectToJson(info)); persistentSampleFile.setValue(file == null ? "" : sample.getMediaFile().getAbsolutePath()); - } catch (IOException e) { + } catch (Exception e) { Logger.getLogger(FormatDialog.class.getName()).log(Level.WARNING, e.getMessage(), e); }