diff --git a/pom.xml b/pom.xml
index ccc328919..5d1e38240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.tonikelope
MegaBasterd
- 7.94
+ 7.95
jar
diff --git a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
index 6f3d95ba5..02182a06a 100644
--- a/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/FileGrabberDialog.java
@@ -822,7 +822,7 @@ public class FileGrabberDialog extends javax.swing.JDialog {
private void skip_rest_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skip_rest_buttonActionPerformed
- if (deleteAllExceptSelectedTreeItems(file_tree, null)) {
+ if (deleteAllExceptSelectedTreeItems(file_tree)) {
_genFileList();
diff --git a/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java
index 446476ff3..2d69f1a3a 100644
--- a/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java
+++ b/src/main/java/com/tonikelope/megabasterd/FolderLinkDialog.java
@@ -47,8 +47,6 @@ public class FolderLinkDialog extends javax.swing.JDialog {
private volatile boolean exit = false;
- private volatile MegaMutableTreeNode _subfolder_node = null;
-
public List getDownload_links() {
return Collections.unmodifiableList(_download_links);
}
@@ -323,7 +321,7 @@ public class FolderLinkDialog extends javax.swing.JDialog {
private void skip_rest_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skip_rest_buttonActionPerformed
- if (deleteAllExceptSelectedTreeItems(file_tree, _subfolder_node)) {
+ if (deleteAllExceptSelectedTreeItems(file_tree)) {
file_tree.setEnabled(false);
node_bar.setVisible(true);
skip_rest_button.setEnabled(false);
diff --git a/src/main/java/com/tonikelope/megabasterd/MainPanel.java b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
index 53cb98a45..5f125912c 100644
--- a/src/main/java/com/tonikelope/megabasterd/MainPanel.java
+++ b/src/main/java/com/tonikelope/megabasterd/MainPanel.java
@@ -70,7 +70,7 @@ import javax.swing.UIManager;
*/
public final class MainPanel {
- public static final String VERSION = "7.94";
+ public static final String VERSION = "7.95";
public static final boolean FORCE_SMART_PROXY = false; //TRUE FOR DEBUGING SMART PROXY
public static final int THROTTLE_SLICE_SIZE = 16 * 1024;
public static final int DEFAULT_BYTE_BUFFER_SIZE = 16 * 1024;
diff --git a/src/main/java/com/tonikelope/megabasterd/MiscTools.java b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
index 7c15d6c1c..300b57108 100644
--- a/src/main/java/com/tonikelope/megabasterd/MiscTools.java
+++ b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
@@ -39,6 +39,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.UnsupportedEncodingException;
import java.lang.management.ManagementFactory;
+import java.lang.reflect.InvocationTargetException;
import java.math.BigInteger;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
@@ -807,7 +808,7 @@ public class MiscTools {
return false;
}
- public static boolean deleteAllExceptSelectedTreeItems(JTree tree, DefaultMutableTreeNode custom_root) {
+ public static boolean deleteAllExceptSelectedTreeItems(JTree tree) {
TreePath[] paths = tree.getSelectionPaths();
@@ -823,12 +824,14 @@ public class MiscTools {
try {
- new_root = node_class.newInstance();
+ new_root = node_class.getDeclaredConstructor().newInstance();
- ((MutableTreeNode) new_root).setUserObject(((DefaultMutableTreeNode) tree_model.getRoot()).getUserObject());
+ ((DefaultMutableTreeNode) new_root).setUserObject(((DefaultMutableTreeNode) tree_model.getRoot()).getUserObject());
} catch (InstantiationException | IllegalAccessException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
+ } catch (NoSuchMethodException | SecurityException | IllegalArgumentException | InvocationTargetException ex) {
+ Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, null, ex);
}
for (TreePath path : paths) {
@@ -838,13 +841,13 @@ public class MiscTools {
for (Object path_element : path.getPath()) {
- if ((MutableTreeNode) path_element != (MutableTreeNode) tree_model.getRoot()) {
+ if ((DefaultMutableTreeNode) path_element != (DefaultMutableTreeNode) tree_model.getRoot()) {
if (hashmap_old.get(path_element) == null) {
Object node = null;
- if ((MutableTreeNode) path_element == (MutableTreeNode) path.getLastPathComponent()) {
+ if ((DefaultMutableTreeNode) path_element == (DefaultMutableTreeNode) path.getLastPathComponent()) {
node = path_element;
@@ -854,7 +857,7 @@ public class MiscTools {
node = node_class.newInstance();
- ((MutableTreeNode) node).setUserObject(((DefaultMutableTreeNode) path_element).getUserObject());
+ ((DefaultMutableTreeNode) node).setUserObject(((DefaultMutableTreeNode) path_element).getUserObject());
} catch (InstantiationException | IllegalAccessException ex) {
Logger.getLogger(MiscTools.class.getName()).log(Level.SEVERE, ex.getMessage());
@@ -863,11 +866,11 @@ public class MiscTools {
if (parent != null) {
- ((DefaultMutableTreeNode) parent).add((MutableTreeNode) node);
+ ((DefaultMutableTreeNode) parent).add((DefaultMutableTreeNode) node);
if (!((TreeNode) path_element).isLeaf()) {
- hashmap_old.put((MutableTreeNode) path_element, (MutableTreeNode) node);
+ hashmap_old.put((DefaultMutableTreeNode) path_element, (DefaultMutableTreeNode) node);
parent = node;
}
@@ -886,10 +889,6 @@ public class MiscTools {
}
}
- if (custom_root != null) {
- new_root = custom_root;
- }
-
tree.setModel(new DefaultTreeModel(sortTree((DefaultMutableTreeNode) new_root)));
tree.setRootVisible(new_root != null ? ((TreeNode) new_root).getChildCount() > 0 : false);
diff --git a/src/main/resources/images/mbasterd_screen.png b/src/main/resources/images/mbasterd_screen.png
index bee9af9b2..8d34ae35a 100644
Binary files a/src/main/resources/images/mbasterd_screen.png and b/src/main/resources/images/mbasterd_screen.png differ