-Removed not necessary swingreflection calls inside EDT
This commit is contained in:
tonikelope 2016-10-14 20:19:24 +02:00
parent 61dd18e746
commit 4fea68d020
13 changed files with 244 additions and 238 deletions

View File

@ -182,8 +182,7 @@ public final class AboutDialog extends javax.swing.JDialog {
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void mcdown_url_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mcdown_url_buttonActionPerformed private void mcdown_url_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_mcdown_url_buttonActionPerformed
copyTextToClipboard(MEGA_URL); copyTextToClipboard(MEGA_URL);
JOptionPane.showMessageDialog(this, "MEGA URL was copied to clipboard!"); JOptionPane.showMessageDialog(this, "MEGA URL was copied to clipboard!");
@ -191,7 +190,7 @@ public final class AboutDialog extends javax.swing.JDialog {
private void check_version_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_check_version_buttonActionPerformed private void check_version_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_check_version_buttonActionPerformed
swingReflectionInvoke("setEnabled", check_version_button, false); check_version_button.setEnabled(false);
final AboutDialog tthis = this; final AboutDialog tthis = this;

View File

@ -14,7 +14,6 @@ import static megabasterd.MainPanel.THREAD_POOL;
import static megabasterd.MiscTools.copyTextToClipboard; import static megabasterd.MiscTools.copyTextToClipboard;
import static megabasterd.MiscTools.swingReflectionInvoke; import static megabasterd.MiscTools.swingReflectionInvoke;
import static megabasterd.MiscTools.swingReflectionInvokeAndWait; import static megabasterd.MiscTools.swingReflectionInvokeAndWait;
import static megabasterd.MiscTools.swingReflectionInvokeAndWaitForReturn;
import static megabasterd.MiscTools.updateFont; import static megabasterd.MiscTools.updateFont;
@ -105,7 +104,7 @@ public final class DownloadView extends javax.swing.JPanel implements Transferen
updateFont(slot_status_label, FONT_DEFAULT, Font.BOLD); updateFont(slot_status_label, FONT_DEFAULT, Font.BOLD);
swingReflectionInvokeAndWait("setModel", slots_spinner, new SpinnerNumberModel(_download.getMain_panel().getDefault_slots_down(), Download.MIN_WORKERS, Download.MAX_WORKERS, 1)); swingReflectionInvokeAndWait("setModel", slots_spinner, new SpinnerNumberModel(_download.getMain_panel().getDefault_slots_down(), Download.MIN_WORKERS, Download.MAX_WORKERS, 1));
swingReflectionInvoke("setEditable", swingReflectionInvokeAndWaitForReturn("getTextField", swingReflectionInvokeAndWaitForReturn("getEditor", slots_spinner)), false); swingReflectionInvoke("setEditable", ((JSpinner.DefaultEditor)slots_spinner.getEditor()).getTextField(), false);
swingReflectionInvoke("setVisible", slots_spinner, false); swingReflectionInvoke("setVisible", slots_spinner, false);
swingReflectionInvoke("setVisible", slots_label, false); swingReflectionInvoke("setVisible", slots_label, false);
swingReflectionInvoke("setVisible", pause_button, false); swingReflectionInvoke("setVisible", pause_button, false);

View File

@ -27,7 +27,6 @@ import static megabasterd.MiscTools.genID;
import static megabasterd.MiscTools.sortTree; import static megabasterd.MiscTools.sortTree;
import static megabasterd.MiscTools.swingReflectionInvoke; import static megabasterd.MiscTools.swingReflectionInvoke;
import static megabasterd.MiscTools.swingReflectionInvokeAndWait; import static megabasterd.MiscTools.swingReflectionInvokeAndWait;
import static megabasterd.MiscTools.swingReflectionInvokeAndWaitForReturn;
import static megabasterd.MiscTools.updateFont; import static megabasterd.MiscTools.updateFont;
/** /**
@ -98,7 +97,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
updateFont(skip_button, FONT_DEFAULT, Font.PLAIN); updateFont(skip_button, FONT_DEFAULT, Font.PLAIN);
updateFont(skip_rest_button, FONT_DEFAULT, Font.PLAIN); updateFont(skip_rest_button, FONT_DEFAULT, Font.PLAIN);
dir_name_textfield.addMouseListener(new ContextMenuMouseListener()); swingReflectionInvoke("addMouseListener", dir_name_textfield, new ContextMenuMouseListener());
_files = new ArrayList<>(); _files = new ArrayList<>();
@ -115,7 +114,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
for (Object o:_main_panel.getMega_accounts().keySet()) { for (Object o:_main_panel.getMega_accounts().keySet()) {
account_combobox.addItem((String)o); swingReflectionInvoke("addItem", account_combobox, (String)o);
} }
} else { } else {
@ -342,23 +341,23 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
private void add_files_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_add_files_buttonActionPerformed private void add_files_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_add_files_buttonActionPerformed
swingReflectionInvoke("setEnabled", add_files_button, false); add_files_button.setEnabled(false);
swingReflectionInvoke("setEnabled", add_folder_button, false); add_folder_button.setEnabled(false);
swingReflectionInvoke("setEnabled", file_tree, false); file_tree.setEnabled(false);
swingReflectionInvoke("setEnabled", warning_label, false); warning_label.setEnabled(false);
swingReflectionInvoke("setEnabled", dance_button, false); dance_button.setEnabled(false);
swingReflectionInvoke("setEnabled", total_file_size_label, false); total_file_size_label.setEnabled(false);
swingReflectionInvoke("setEnabled", skip_button, false); skip_button.setEnabled(false);
swingReflectionInvoke("setEnabled", skip_rest_button, false); skip_rest_button.setEnabled(false);
swingReflectionInvoke("setEnabled", account_combobox, false); account_combobox.setEnabled(false);
JFileChooser filechooser = new javax.swing.JFileChooser(); JFileChooser filechooser = new javax.swing.JFileChooser();
@ -369,8 +368,8 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
filechooser.setMultiSelectionEnabled(true); filechooser.setMultiSelectionEnabled(true);
if( filechooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION ) { if( filechooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION ) {
swingReflectionInvoke("setText", total_file_size_label, "[0 B]"); total_file_size_label.setText("[0 B]");
File[] files_selected = filechooser.getSelectedFiles(); File[] files_selected = filechooser.getSelectedFiles();
@ -378,7 +377,7 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
System.out.println(_base_path); System.out.println(_base_path);
swingReflectionInvoke("setText", dir_name_textfield, files_selected[0].getParentFile().getName()+"_"+genID(10)); dir_name_textfield.setText(files_selected[0].getParentFile().getName()+"_"+genID(10));
DefaultMutableTreeNode root = new DefaultMutableTreeNode(filechooser.getSelectedFile().getParent()); DefaultMutableTreeNode root = new DefaultMutableTreeNode(filechooser.getSelectedFile().getParent());
@ -395,47 +394,49 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
} }
boolean root_childs = ((DefaultMutableTreeNode)file_tree.getModel().getRoot()).getChildCount() > 0; boolean root_childs = ((DefaultMutableTreeNode)file_tree.getModel().getRoot()).getChildCount() > 0;
file_tree.setRootVisible(root_childs);
swingReflectionInvoke("setEnabled", account_combobox, true); account_combobox.setEnabled(true);
swingReflectionInvoke("setEnabled", add_files_button, true); add_files_button.setEnabled(true);
swingReflectionInvoke("setEnabled", add_folder_button, true); add_folder_button.setEnabled(true);
swingReflectionInvoke("setEnabled", warning_label, root_childs); warning_label.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", dance_button, root_childs); dance_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", total_file_size_label, root_childs); total_file_size_label.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", skip_button, root_childs); skip_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", skip_rest_button, root_childs); skip_rest_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", file_tree, root_childs); file_tree.setEnabled(root_childs);
}//GEN-LAST:event_add_files_buttonActionPerformed }//GEN-LAST:event_add_files_buttonActionPerformed
private void add_folder_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_add_folder_buttonActionPerformed private void add_folder_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_add_folder_buttonActionPerformed
swingReflectionInvoke("setEnabled", add_files_button, false); add_files_button.setEnabled(false);
swingReflectionInvoke("setEnabled", add_folder_button, false); add_folder_button.setEnabled(false);
swingReflectionInvoke("setEnabled", file_tree, false); file_tree.setEnabled(false);
swingReflectionInvoke("setEnabled", warning_label, false); warning_label.setEnabled(false);
swingReflectionInvoke("setEnabled", dance_button, false); dance_button.setEnabled(false);
swingReflectionInvoke("setEnabled", total_file_size_label, false); total_file_size_label.setEnabled(false);
swingReflectionInvoke("setEnabled", skip_button, false); skip_button.setEnabled(false);
swingReflectionInvoke("setEnabled", skip_rest_button, false); skip_rest_button.setEnabled(false);
account_combobox.setEnabled(false);
swingReflectionInvoke("setEnabled", account_combobox, false);
JFileChooser filechooser = new javax.swing.JFileChooser(); JFileChooser filechooser = new javax.swing.JFileChooser();
filechooser.setDialogTitle("Add directory"); filechooser.setDialogTitle("Add directory");
@ -446,13 +447,13 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
if( filechooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION ) { if( filechooser.showOpenDialog(this) == JFileChooser.APPROVE_OPTION ) {
swingReflectionInvoke("setText", total_file_size_label, "[0 B]"); total_file_size_label.setText("[0 B]");
_base_path = filechooser.getSelectedFile().getAbsolutePath(); _base_path = filechooser.getSelectedFile().getAbsolutePath();
System.out.println(_base_path); System.out.println(_base_path);
swingReflectionInvoke("setText", dir_name_textfield, filechooser.getSelectedFile().getName()+"_"+genID(10)); dir_name_textfield.setText(filechooser.getSelectedFile().getName()+"_"+genID(10));
DefaultMutableTreeNode root = new DefaultMutableTreeNode(filechooser.getSelectedFile().getAbsolutePath()); DefaultMutableTreeNode root = new DefaultMutableTreeNode(filechooser.getSelectedFile().getAbsolutePath());
@ -468,23 +469,23 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
file_tree.setRootVisible(root_childs); file_tree.setRootVisible(root_childs);
swingReflectionInvoke("setEnabled", account_combobox, true); account_combobox.setEnabled(true);
swingReflectionInvoke("setEnabled", add_files_button, true); add_files_button.setEnabled(true);
swingReflectionInvoke("setEnabled", add_folder_button, true); add_folder_button.setEnabled(true);
swingReflectionInvoke("setEnabled", warning_label, root_childs); warning_label.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", dance_button, root_childs); dance_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", total_file_size_label, root_childs);
swingReflectionInvoke("setEnabled", skip_button, root_childs);
swingReflectionInvoke("setEnabled", skip_rest_button, root_childs);
swingReflectionInvoke("setEnabled", file_tree, root_childs); total_file_size_label.setEnabled(root_childs);
skip_button.setEnabled(root_childs);
skip_rest_button.setEnabled(root_childs);
file_tree.setEnabled(root_childs);
}//GEN-LAST:event_add_folder_buttonActionPerformed }//GEN-LAST:event_add_folder_buttonActionPerformed
@ -492,13 +493,13 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
_upload = true; _upload = true;
swingReflectionInvoke("setVisible", this, false); this.setVisible(false);
}//GEN-LAST:event_dance_buttonActionPerformed }//GEN-LAST:event_dance_buttonActionPerformed
private void account_comboboxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_account_comboboxItemStateChanged private void account_comboboxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_account_comboboxItemStateChanged
String selected_item = (String)swingReflectionInvokeAndWaitForReturn("getSelectedItem", account_combobox); String selected_item = (String)account_combobox.getSelectedItem();
if(selected_item != null && !selected_item.equals(_last_selected_account)) { if(selected_item != null && !selected_item.equals(_last_selected_account)) {
_last_selected_account = selected_item; _last_selected_account = selected_item;
@ -507,19 +508,20 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
final FileGrabberDialog tthis = this; final FileGrabberDialog tthis = this;
swingReflectionInvoke("setForeground", used_space_label, Color.black); used_space_label.setForeground(Color.black);
swingReflectionInvoke("setText", used_space_label, "Checking account quota, please wait..."); used_space_label.setText("Checking account quota, please wait...");
swingReflectionInvoke("setEnabled", account_combobox, false);
swingReflectionInvoke("setEnabled", dance_button, false); account_combobox.setEnabled(false);
swingReflectionInvoke("setEnabled", add_files_button, false); dance_button.setEnabled(false);
swingReflectionInvoke("setEnabled", add_folder_button, false); add_files_button.setEnabled(false);
swingReflectionInvoke("setEnabled", dir_name_textfield, false); add_folder_button.setEnabled(false);
swingReflectionInvoke("setEnabled", total_file_size_label, false); dir_name_textfield.setEnabled(false);
swingReflectionInvoke("setEnabled", skip_button, false); total_file_size_label.setEnabled(false);
swingReflectionInvoke("setEnabled", skip_rest_button, false); skip_button.setEnabled(false);
swingReflectionInvoke("setEnabled", warning_label, false); skip_rest_button.setEnabled(false);
swingReflectionInvoke("setEnabled", file_tree, false); warning_label.setEnabled(false);
file_tree.setEnabled(false);
THREAD_POOL.execute(new Runnable(){ THREAD_POOL.execute(new Runnable(){
@Override @Override
@ -635,8 +637,8 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
swingReflectionInvoke("setEnabled", account_combobox, true); swingReflectionInvoke("setEnabled", account_combobox, true);
account_combobox.setSelectedIndex(-1); swingReflectionInvoke("setSelectedIndex", account_combobox, -1);
_last_selected_account = null; _last_selected_account = null;
swingReflectionInvoke("setForeground", used_space_label, Color.red); swingReflectionInvoke("setForeground", used_space_label, Color.red);
@ -660,23 +662,22 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
file_tree.setRootVisible(root_childs); file_tree.setRootVisible(root_childs);
swingReflectionInvoke("setEnabled", warning_label, root_childs); warning_label.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", dance_button, root_childs); dance_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", total_file_size_label, root_childs); total_file_size_label.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", skip_button, root_childs); skip_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", skip_rest_button, root_childs); skip_rest_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", file_tree, root_childs); file_tree.setEnabled(root_childs);
} }
}//GEN-LAST:event_skip_rest_buttonActionPerformed }//GEN-LAST:event_skip_rest_buttonActionPerformed
private void skip_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skip_buttonActionPerformed private void skip_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skip_buttonActionPerformed
if(deleteSelectedTreeItems(file_tree)) { if(deleteSelectedTreeItems(file_tree)) {
_genFileList(); _genFileList();
@ -685,17 +686,17 @@ public final class FileGrabberDialog extends javax.swing.JDialog {
file_tree.setRootVisible(root_childs); file_tree.setRootVisible(root_childs);
swingReflectionInvoke("setEnabled", warning_label, root_childs); warning_label.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", dance_button, root_childs); dance_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", total_file_size_label, root_childs); total_file_size_label.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", skip_button, root_childs); skip_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", skip_rest_button, root_childs); skip_rest_button.setEnabled(root_childs);
swingReflectionInvoke("setEnabled", file_tree, root_childs); file_tree.setEnabled(root_childs);
} }
}//GEN-LAST:event_skip_buttonActionPerformed }//GEN-LAST:event_skip_buttonActionPerformed

View File

@ -17,6 +17,7 @@ import static megabasterd.MiscTools.findFirstRegex;
import static megabasterd.MiscTools.formatBytes; import static megabasterd.MiscTools.formatBytes;
import static megabasterd.MiscTools.sortTree; import static megabasterd.MiscTools.sortTree;
import static megabasterd.MiscTools.swingReflectionInvoke; import static megabasterd.MiscTools.swingReflectionInvoke;
import static megabasterd.MiscTools.swingReflectionInvokeAndWait;
import static megabasterd.MiscTools.updateFont; import static megabasterd.MiscTools.updateFont;
/** /**
@ -235,8 +236,8 @@ public final class FolderLinkDialog extends javax.swing.JDialog {
if(deleteSelectedTreeItems(file_tree)) { if(deleteSelectedTreeItems(file_tree)) {
_genDownloadLiks(); _genDownloadLiks();
swingReflectionInvoke("setVisible", restore_button, true); restore_button.setVisible(true);
} }
}//GEN-LAST:event_skip_buttonActionPerformed }//GEN-LAST:event_skip_buttonActionPerformed
@ -245,7 +246,7 @@ public final class FolderLinkDialog extends javax.swing.JDialog {
_download = true; _download = true;
swingReflectionInvoke("setVisible", this, false); this.setVisible(false);
}//GEN-LAST:event_dance_buttonActionPerformed }//GEN-LAST:event_dance_buttonActionPerformed
private void skip_rest_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skip_rest_buttonActionPerformed private void skip_rest_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skip_rest_buttonActionPerformed
@ -254,28 +255,30 @@ public final class FolderLinkDialog extends javax.swing.JDialog {
_genDownloadLiks(); _genDownloadLiks();
swingReflectionInvoke("setVisible", restore_button, true); restore_button.setVisible(true);
} }
}//GEN-LAST:event_skip_rest_buttonActionPerformed }//GEN-LAST:event_skip_rest_buttonActionPerformed
private void restore_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_restore_buttonActionPerformed private void restore_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_restore_buttonActionPerformed
swingReflectionInvoke("setEnabled", restore_button, false); restore_button.setEnabled(false);
swingReflectionInvoke("setEnabled", dance_button, false); dance_button.setEnabled(false);
file_tree.setEnabled(false);
swingReflectionInvoke("setEnabled", file_tree, false);
_loadMegaDirTree(); _loadMegaDirTree();
_genDownloadLiks(); _genDownloadLiks();
swingReflectionInvoke("setEnabled", restore_button, true); restore_button.setEnabled(true);
swingReflectionInvoke("setVisible", restore_button, false); dance_button.setEnabled(true);
swingReflectionInvoke("setEnabled", dance_button, true); file_tree.setEnabled(true);
}//GEN-LAST:event_restore_buttonActionPerformed }//GEN-LAST:event_restore_buttonActionPerformed
@ -348,9 +351,9 @@ public final class FolderLinkDialog extends javax.swing.JDialog {
}while(current_node != root); }while(current_node != root);
} }
file_tree.setModel(new DefaultTreeModel(sortTree(root))); swingReflectionInvokeAndWait("setModel", file_tree, new DefaultTreeModel(sortTree(root)));
file_tree.setRootVisible(root.getChildCount() > 0); swingReflectionInvoke("setRootVisible", file_tree, root!=null?root.getChildCount() > 0:false);
swingReflectionInvoke("setEnabled", file_tree, true); swingReflectionInvoke("setEnabled", file_tree, true);

View File

@ -188,13 +188,13 @@ public class GetMegaMasterPasswordDialog extends javax.swing.JDialog {
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void cancel_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancel_buttonActionPerformed private void cancel_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancel_buttonActionPerformed
swingReflectionInvoke("setVisible", this, false); this.setVisible(false);
}//GEN-LAST:event_cancel_buttonActionPerformed }//GEN-LAST:event_cancel_buttonActionPerformed
private void ok_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ok_buttonActionPerformed private void ok_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ok_buttonActionPerformed
swingReflectionInvoke("setText", status_label, "Verifying your password, please wait..."); status_label.setText("Verifying your password, please wait...");
final GetMegaMasterPasswordDialog tthis = this; final GetMegaMasterPasswordDialog tthis = this;

View File

@ -160,12 +160,12 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
private void dance_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dance_buttonActionPerformed private void dance_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dance_buttonActionPerformed
_download=true; _download=true;
dispose();
this.setVisible(false);
}//GEN-LAST:event_dance_buttonActionPerformed }//GEN-LAST:event_dance_buttonActionPerformed
private void change_dir_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_change_dir_buttonActionPerformed private void change_dir_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_change_dir_buttonActionPerformed
javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser(); javax.swing.JFileChooser filechooser = new javax.swing.JFileChooser();
filechooser.setCurrentDirectory(new java.io.File(_download_path)); filechooser.setCurrentDirectory(new java.io.File(_download_path));
@ -179,7 +179,7 @@ public final class LinkGrabberDialog extends javax.swing.JDialog implements Clip
_download_path = file.getAbsolutePath(); _download_path = file.getAbsolutePath();
swingReflectionInvoke("setText", download_dir_label, truncateText(_download_path,80)); download_dir_label.setText(truncateText(_download_path,80));
} }
}//GEN-LAST:event_change_dir_buttonActionPerformed }//GEN-LAST:event_change_dir_buttonActionPerformed

View File

@ -59,7 +59,7 @@ import static megabasterd.Transference.MAX_TRANSFERENCE_SPEED_DEFAULT;
*/ */
public final class MainPanel { public final class MainPanel {
public static final String VERSION="1.32"; public static final String VERSION="1.33";
public static final int CONNECTION_TIMEOUT = 30000; public static final int CONNECTION_TIMEOUT = 30000;
public static final int THROTTLE_SLICE_SIZE=16*1024; public static final int THROTTLE_SLICE_SIZE=16*1024;
public static final int STREAMER_PORT = 1337; public static final int STREAMER_PORT = 1337;

View File

@ -154,10 +154,8 @@ public final class MainPanelView extends javax.swing.JFrame {
swingReflectionInvoke("setVisible", pause_all_up_button, false); swingReflectionInvoke("setVisible", pause_all_up_button, false);
swingReflectionInvoke("setEnabled", clean_all_down_menu, false); swingReflectionInvoke("setEnabled", clean_all_down_menu, false);
swingReflectionInvoke("setEnabled", clean_all_up_menu, false); swingReflectionInvoke("setEnabled", clean_all_up_menu, false);
swingReflectionInvoke("setUnitIncrement", jScrollPane_down.getVerticalScrollBar(), 20);
jScrollPane_down.getVerticalScrollBar().setUnitIncrement(20); swingReflectionInvoke("setUnitIncrement", jScrollPane_up.getVerticalScrollBar(), 20);
jScrollPane_up.getVerticalScrollBar().setUnitIncrement(20);
} }
/** /**
@ -469,16 +467,16 @@ public final class MainPanelView extends javax.swing.JFrame {
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void new_download_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_new_download_menuActionPerformed private void new_download_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_new_download_menuActionPerformed
swingReflectionInvoke("setEnabled", new_download_menu, false); new_download_menu.setEnabled(false);
final LinkGrabberDialog dialog = new LinkGrabberDialog(this, true, _main_panel.getDefault_download_path(), _main_panel.getClipboardspy()); final LinkGrabberDialog dialog = new LinkGrabberDialog(this, true, _main_panel.getDefault_download_path(), _main_panel.getClipboardspy());
_main_panel.getClipboardspy().attachObserver(dialog); _main_panel.getClipboardspy().attachObserver(dialog);
swingReflectionInvokeAndWait("setLocationRelativeTo", dialog, this); dialog.setLocationRelativeTo(this);
swingReflectionInvokeAndWait("setVisible", dialog, true); dialog.setVisible(true);
_main_panel.getClipboardspy().detachObserver(dialog); _main_panel.getClipboardspy().detachObserver(dialog);
@ -570,10 +568,11 @@ public final class MainPanelView extends javax.swing.JFrame {
getMain_panel().getDownload_manager().secureNotify(); getMain_panel().getDownload_manager().secureNotify();
swingReflectionInvoke("setEnabled", new_download_menu, true); new_download_menu.setEnabled(true);
} else { } else {
swingReflectionInvoke("setEnabled", new_download_menu, true);
new_download_menu.setEnabled(true);
} }
dialog.dispose(); dialog.dispose();
@ -581,13 +580,12 @@ public final class MainPanelView extends javax.swing.JFrame {
}//GEN-LAST:event_new_download_menuActionPerformed }//GEN-LAST:event_new_download_menuActionPerformed
private void settings_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_settings_menuActionPerformed private void settings_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_settings_menuActionPerformed
SettingsDialog dialog = new SettingsDialog(this, true); SettingsDialog dialog = new SettingsDialog(this, true);
swingReflectionInvokeAndWait("setLocationRelativeTo", dialog, this); dialog.setLocationRelativeTo(this);
swingReflectionInvokeAndWait("setVisible", dialog, true); dialog.setVisible(true);
if(dialog.isSettings_ok()) { if(dialog.isSettings_ok()) {
@ -610,13 +608,13 @@ public final class MainPanelView extends javax.swing.JFrame {
_main_panel.getStream_supervisor().setMaxBytesPerSecInput(_main_panel.getMax_dl_speed()*1024); _main_panel.getStream_supervisor().setMaxBytesPerSecInput(_main_panel.getMax_dl_speed()*1024);
swingReflectionInvoke("setForeground", getGlobal_speed_down_label(), new Color(255,0,0)); global_speed_down_label.setForeground(new Color(255,0,0));
} else { } else {
_main_panel.getStream_supervisor().setMaxBytesPerSecInput(0); _main_panel.getStream_supervisor().setMaxBytesPerSecInput(0);
swingReflectionInvoke("setForeground", getGlobal_speed_down_label(), new Color(0,128,255)); global_speed_down_label.setForeground(new Color(0,128,255));
} }
@ -624,13 +622,13 @@ public final class MainPanelView extends javax.swing.JFrame {
_main_panel.getStream_supervisor().setMaxBytesPerSecOutput(_main_panel.getMax_up_speed()*1024); _main_panel.getStream_supervisor().setMaxBytesPerSecOutput(_main_panel.getMax_up_speed()*1024);
swingReflectionInvoke("setForeground", getGlobal_speed_up_label(), new Color(255,0,0)); global_speed_up_label.setForeground(new Color(255,0,0));
} else { } else {
_main_panel.getStream_supervisor().setMaxBytesPerSecOutput(0); _main_panel.getStream_supervisor().setMaxBytesPerSecOutput(0);
swingReflectionInvoke("setForeground", getGlobal_speed_up_label(), new Color(0,128,255)); global_speed_up_label.setForeground(new Color(0,128,255));
} }
@ -660,9 +658,9 @@ public final class MainPanelView extends javax.swing.JFrame {
AboutDialog dialog = new AboutDialog(this, true); AboutDialog dialog = new AboutDialog(this, true);
swingReflectionInvokeAndWait("setLocationRelativeTo", dialog, this); dialog.setLocationRelativeTo(this);
swingReflectionInvokeAndWait("setVisible", dialog, true); dialog.setVisible(true);
}//GEN-LAST:event_about_menuActionPerformed }//GEN-LAST:event_about_menuActionPerformed
private void exit_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exit_menuActionPerformed private void exit_menuActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exit_menuActionPerformed
@ -694,7 +692,6 @@ public final class MainPanelView extends javax.swing.JFrame {
private void pause_all_down_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pause_all_down_buttonActionPerformed private void pause_all_down_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pause_all_down_buttonActionPerformed
_main_panel.getDownload_manager().pauseAll(); _main_panel.getDownload_manager().pauseAll();
}//GEN-LAST:event_pause_all_down_buttonActionPerformed }//GEN-LAST:event_pause_all_down_buttonActionPerformed
@ -704,9 +701,9 @@ public final class MainPanelView extends javax.swing.JFrame {
_main_panel.getClipboardspy().attachObserver(dialog); _main_panel.getClipboardspy().attachObserver(dialog);
swingReflectionInvokeAndWait("setLocationRelativeTo", dialog, this); dialog.setLocationRelativeTo(this);
swingReflectionInvokeAndWait("setVisible", dialog, true); dialog.setVisible(true);
_main_panel.getClipboardspy().detachObserver(dialog); _main_panel.getClipboardspy().detachObserver(dialog);
}//GEN-LAST:event_new_stream_menuActionPerformed }//GEN-LAST:event_new_stream_menuActionPerformed
@ -717,11 +714,11 @@ public final class MainPanelView extends javax.swing.JFrame {
try{ try{
swingReflectionInvoke("setEnabled", new_upload_menu, false); new_upload_menu.setEnabled(false);
swingReflectionInvokeAndWait("setLocationRelativeTo", dialog, this); dialog.setLocationRelativeTo(this);
swingReflectionInvokeAndWait("setVisible", dialog, true); dialog.setVisible(true);
if(dialog.isUpload() && dialog.getFiles().size() > 0) { if(dialog.isUpload() && dialog.getFiles().size() > 0) {
@ -821,11 +818,11 @@ public final class MainPanelView extends javax.swing.JFrame {
getMain_panel().getUpload_manager().secureNotify(); getMain_panel().getUpload_manager().secureNotify();
swingReflectionInvoke("setEnabled", new_upload_menu, true); new_upload_menu.setEnabled(true);
} else { } else {
swingReflectionInvoke("setEnabled", new_upload_menu, true); new_upload_menu.setEnabled(true);
} }
}catch(Exception ex) {} }catch(Exception ex) {}
@ -841,13 +838,11 @@ public final class MainPanelView extends javax.swing.JFrame {
private void close_all_finished_up_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_close_all_finished_up_buttonActionPerformed private void close_all_finished_up_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_close_all_finished_up_buttonActionPerformed
_main_panel.getUpload_manager().closeAllFinished(); _main_panel.getUpload_manager().closeAllFinished();
}//GEN-LAST:event_close_all_finished_up_buttonActionPerformed }//GEN-LAST:event_close_all_finished_up_buttonActionPerformed
private void pause_all_up_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pause_all_up_buttonActionPerformed private void pause_all_up_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_pause_all_up_buttonActionPerformed
_main_panel.getUpload_manager().pauseAll(); _main_panel.getUpload_manager().pauseAll();
}//GEN-LAST:event_pause_all_up_buttonActionPerformed }//GEN-LAST:event_pause_all_up_buttonActionPerformed

View File

@ -346,7 +346,7 @@
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Component id="defaut_slots_up_label" min="-2" max="-2" attributes="0"/> <Component id="defaut_slots_up_label" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="73" max="-2" attributes="0"/> <EmptySpace min="-2" pref="73" max="-2" attributes="0"/>
<Component id="default_slots_up" min="-2" max="-2" attributes="0"/> <Component id="default_slots_up_spinner" min="-2" max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</Group> </Group>
@ -384,7 +384,7 @@
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="3" attributes="0"> <Group type="103" groupAlignment="3" attributes="0">
<Component id="defaut_slots_up_label" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="defaut_slots_up_label" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="default_slots_up" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="default_slots_up_spinner" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace type="separate" max="-2" attributes="0"/> <EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="limit_upload_speed_checkbox" min="-2" max="-2" attributes="0"/> <Component id="limit_upload_speed_checkbox" min="-2" max="-2" attributes="0"/>
@ -478,7 +478,7 @@
<Property name="doubleBuffered" type="boolean" value="true"/> <Property name="doubleBuffered" type="boolean" value="true"/>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JSpinner" name="default_slots_up"> <Component class="javax.swing.JSpinner" name="default_slots_up_spinner">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Dialog" size="20" style="1"/> <Font name="Dialog" size="20" style="1"/>

View File

@ -72,7 +72,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
updateFont(cancel_button, FONT_DEFAULT, Font.PLAIN); updateFont(cancel_button, FONT_DEFAULT, Font.PLAIN);
updateFont(default_slots_down_label, FONT_DEFAULT, Font.PLAIN); updateFont(default_slots_down_label, FONT_DEFAULT, Font.PLAIN);
updateFont(default_slots_down_spinner, FONT_DEFAULT, Font.PLAIN); updateFont(default_slots_down_spinner, FONT_DEFAULT, Font.PLAIN);
updateFont(default_slots_up, FONT_DEFAULT, Font.PLAIN); updateFont(default_slots_up_spinner, FONT_DEFAULT, Font.PLAIN);
updateFont(max_downloads_label, FONT_DEFAULT, Font.PLAIN); updateFont(max_downloads_label, FONT_DEFAULT, Font.PLAIN);
updateFont(max_downloads_spinner, FONT_DEFAULT, Font.PLAIN); updateFont(max_downloads_spinner, FONT_DEFAULT, Font.PLAIN);
updateFont(max_uploads_spinner, FONT_DEFAULT, Font.PLAIN); updateFont(max_uploads_spinner, FONT_DEFAULT, Font.PLAIN);
@ -117,10 +117,10 @@ public final class SettingsDialog extends javax.swing.JDialog {
default_slots = Integer.parseInt(slots); default_slots = Integer.parseInt(slots);
} }
default_slots_down_spinner.setModel(new SpinnerNumberModel(default_slots, Download.MIN_WORKERS, Download.MAX_WORKERS, 1)); swingReflectionInvokeAndWait("setModel", default_slots_down_spinner, new SpinnerNumberModel(default_slots, Download.MIN_WORKERS, Download.MAX_WORKERS, 1));
((JSpinner.DefaultEditor)default_slots_down_spinner.getEditor()).getTextField().setEditable(false);
swingReflectionInvoke("setEditable", ((JSpinner.DefaultEditor)default_slots_down_spinner.getEditor()).getTextField(), false);
slots = DBTools.selectSettingValueFromDB("default_slots_up"); slots = DBTools.selectSettingValueFromDB("default_slots_up");
default_slots=Upload.WORKERS_DEFAULT; default_slots=Upload.WORKERS_DEFAULT;
@ -129,8 +129,10 @@ public final class SettingsDialog extends javax.swing.JDialog {
default_slots = Integer.parseInt(slots); default_slots = Integer.parseInt(slots);
} }
default_slots_up.setModel(new SpinnerNumberModel(default_slots, Upload.MIN_WORKERS, Upload.MAX_WORKERS, 1)); swingReflectionInvokeAndWait("setModel", default_slots_up_spinner, new SpinnerNumberModel(default_slots, Upload.MIN_WORKERS, Upload.MAX_WORKERS, 1));
((JSpinner.DefaultEditor)default_slots_up.getEditor()).getTextField().setEditable(false);
swingReflectionInvoke("setEditable", ((JSpinner.DefaultEditor)default_slots_up_spinner.getEditor()).getTextField(), false);
String max_down = DBTools.selectSettingValueFromDB("max_downloads"); String max_down = DBTools.selectSettingValueFromDB("max_downloads");
@ -141,8 +143,8 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
max_downloads_spinner.setModel(new SpinnerNumberModel(max_dl, 1, Download.MAX_SIM_TRANSFERENCES, 1)); swingReflectionInvokeAndWait("setModel", max_downloads_spinner, new SpinnerNumberModel(max_dl, 1, Download.MAX_SIM_TRANSFERENCES, 1));
((JSpinner.DefaultEditor)max_downloads_spinner.getEditor()).getTextField().setEditable(false); swingReflectionInvoke("setEditable",((JSpinner.DefaultEditor)max_downloads_spinner.getEditor()).getTextField(), false);
String max_up = DBTools.selectSettingValueFromDB("max_uploads"); String max_up = DBTools.selectSettingValueFromDB("max_uploads");
@ -153,10 +155,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
max_ul = Integer.parseInt(max_up); max_ul = Integer.parseInt(max_up);
} }
max_uploads_spinner.setModel(new SpinnerNumberModel(max_ul, 1, Upload.MAX_SIM_TRANSFERENCES, 1)); swingReflectionInvokeAndWait("setModel",max_uploads_spinner, new SpinnerNumberModel(max_dl, 1, Upload.MAX_SIM_TRANSFERENCES, 1));
((JSpinner.DefaultEditor)max_uploads_spinner.getEditor()).getTextField().setEditable(false); swingReflectionInvoke("setEditable",((JSpinner.DefaultEditor)max_uploads_spinner.getEditor()).getTextField(), false);
boolean limit_dl_speed = Download.LIMIT_TRANSFERENCE_SPEED_DEFAULT; boolean limit_dl_speed = Download.LIMIT_TRANSFERENCE_SPEED_DEFAULT;
@ -187,8 +188,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
} }
max_down_speed_spinner.setModel(new SpinnerNumberModel(max_download_speed, 1, Integer.MAX_VALUE, 5)); swingReflectionInvokeAndWait("setModel", max_down_speed_spinner, new SpinnerNumberModel(max_download_speed, 1, Integer.MAX_VALUE, 5));
((JSpinner.DefaultEditor)max_down_speed_spinner.getEditor()).getTextField().setEditable(true);
swingReflectionInvoke("setEditable", ((JSpinner.DefaultEditor)max_down_speed_spinner.getEditor()).getTextField(), true);
boolean limit_ul_speed = Upload.LIMIT_TRANSFERENCE_SPEED_DEFAULT; boolean limit_ul_speed = Upload.LIMIT_TRANSFERENCE_SPEED_DEFAULT;
@ -218,9 +220,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
max_upload_speed = Integer.parseInt(max_ul_speed); max_upload_speed = Integer.parseInt(max_ul_speed);
} }
max_up_speed_spinner.setModel(new SpinnerNumberModel(max_upload_speed, 1, Integer.MAX_VALUE, 5)); swingReflectionInvokeAndWait("setModel", max_up_speed_spinner, new SpinnerNumberModel(max_upload_speed, 1, Integer.MAX_VALUE, 5));
((JSpinner.DefaultEditor)max_up_speed_spinner.getEditor()).getTextField().setEditable(true); swingReflectionInvoke("setEditable", ((JSpinner.DefaultEditor)max_up_speed_spinner.getEditor()).getTextField(), true);
boolean cbc_mac = Download.VERIFY_CBC_MAC_DEFAULT; boolean cbc_mac = Download.VERIFY_CBC_MAC_DEFAULT;
@ -266,13 +268,13 @@ public final class SettingsDialog extends javax.swing.JDialog {
if(!use_slots) { if(!use_slots) {
swingReflectionInvoke("setEnabled", defaut_slots_up_label, false); swingReflectionInvoke("setEnabled", defaut_slots_up_label, false);
swingReflectionInvoke("setEnabled", default_slots_up, false); swingReflectionInvoke("setEnabled", default_slots_up_spinner, false);
} else { } else {
swingReflectionInvoke("setEnabled", max_uploads_label, true); swingReflectionInvoke("setEnabled", max_uploads_label, true);
swingReflectionInvoke("setEnabled", default_slots_up, true); swingReflectionInvoke("setEnabled", default_slots_up_spinner, true);
} }
encrypt_pass_checkbox.setSelected((_main_panel.getMega_master_pass_hash() != null)); swingReflectionInvoke("setSelected", encrypt_pass_checkbox, (_main_panel.getMega_master_pass_hash() != null));
swingReflectionInvoke("setEnabled", remove_account_button, (mega_accounts_table.getRowCount()>0)); swingReflectionInvoke("setEnabled", remove_account_button, (mega_accounts_table.getRowCount()>0));
@ -293,8 +295,8 @@ public final class SettingsDialog extends javax.swing.JDialog {
for (Object k: _main_panel.getMega_accounts().keySet()) { for (Object k: _main_panel.getMega_accounts().keySet()) {
String[] new_row_data = {(String)k, "**************************"}; String[] new_row_data = {(String)k, "**************************"};
model.addRow(new_row_data); swingReflectionInvoke("addRow", model, new Object[] {new_row_data});
} }
swingReflectionInvoke("setEnabled", mega_accounts_table, false); swingReflectionInvoke("setEnabled", mega_accounts_table, false);
@ -339,7 +341,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
String[] new_row_data = {(String)pair.getKey(), (String)data.get("password")}; String[] new_row_data = {(String)pair.getKey(), (String)data.get("password")};
model.addRow(new_row_data); swingReflectionInvoke("addRow", model, new Object[] {new_row_data});
} }
swingReflectionInvoke("setEnabled", remove_account_button, (mega_accounts_table.getRowCount()>0)); swingReflectionInvoke("setEnabled", remove_account_button, (mega_accounts_table.getRowCount()>0));
@ -386,7 +388,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
add_account_button = new javax.swing.JButton(); add_account_button = new javax.swing.JButton();
defaut_slots_up_label = new javax.swing.JLabel(); defaut_slots_up_label = new javax.swing.JLabel();
max_uploads_label = new javax.swing.JLabel(); max_uploads_label = new javax.swing.JLabel();
default_slots_up = new javax.swing.JSpinner(); default_slots_up_spinner = new javax.swing.JSpinner();
max_uploads_spinner = new javax.swing.JSpinner(); max_uploads_spinner = new javax.swing.JSpinner();
multi_slot_up_checkbox = new javax.swing.JCheckBox(); multi_slot_up_checkbox = new javax.swing.JCheckBox();
max_up_speed_label = new javax.swing.JLabel(); max_up_speed_label = new javax.swing.JLabel();
@ -587,9 +589,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
max_uploads_label.setText("Max sim uploads:"); max_uploads_label.setText("Max sim uploads:");
max_uploads_label.setDoubleBuffered(true); max_uploads_label.setDoubleBuffered(true);
default_slots_up.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N default_slots_up_spinner.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
default_slots_up.setDoubleBuffered(true); default_slots_up_spinner.setDoubleBuffered(true);
default_slots_up.setValue(2); default_slots_up_spinner.setValue(2);
max_uploads_spinner.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N max_uploads_spinner.setFont(new java.awt.Font("Dialog", 1, 20)); // NOI18N
max_uploads_spinner.setDoubleBuffered(true); max_uploads_spinner.setDoubleBuffered(true);
@ -683,7 +685,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addGroup(javax.swing.GroupLayout.Alignment.LEADING, uploads_panelLayout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.LEADING, uploads_panelLayout.createSequentialGroup()
.addComponent(defaut_slots_up_label) .addComponent(defaut_slots_up_label)
.addGap(73, 73, 73) .addGap(73, 73, 73)
.addComponent(default_slots_up, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))) .addComponent(default_slots_up_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
.addGap(0, 0, Short.MAX_VALUE))) .addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap()) .addContainerGap())
); );
@ -711,7 +713,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(uploads_panelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(defaut_slots_up_label) .addComponent(defaut_slots_up_label)
.addComponent(default_slots_up, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(default_slots_up_spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18) .addGap(18, 18, 18)
.addComponent(limit_upload_speed_checkbox) .addComponent(limit_upload_speed_checkbox)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@ -774,14 +776,14 @@ public final class SettingsDialog extends javax.swing.JDialog {
_download_path = file.getAbsolutePath(); _download_path = file.getAbsolutePath();
swingReflectionInvoke("setText", default_dir_label, truncateText(_download_path, 80)); default_dir_label.setText(truncateText(_download_path, 80));
} }
}//GEN-LAST:event_change_download_dir_buttonActionPerformed }//GEN-LAST:event_change_download_dir_buttonActionPerformed
private void cancel_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancel_buttonActionPerformed private void cancel_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancel_buttonActionPerformed
swingReflectionInvoke("setVisible", this, false); this.setVisible(false);
}//GEN-LAST:event_cancel_buttonActionPerformed }//GEN-LAST:event_cancel_buttonActionPerformed
private void ok_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ok_buttonActionPerformed private void ok_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_ok_buttonActionPerformed
@ -792,7 +794,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
insertSettingValueInDB("default_down_dir", _download_path); insertSettingValueInDB("default_down_dir", _download_path);
insertSettingValueInDB("default_slots_down", String.valueOf((int)swingReflectionInvokeAndWaitForReturn("getValue", default_slots_down_spinner))); insertSettingValueInDB("default_slots_down", String.valueOf((int)swingReflectionInvokeAndWaitForReturn("getValue", default_slots_down_spinner)));
insertSettingValueInDB("default_slots_up", String.valueOf((int)swingReflectionInvokeAndWaitForReturn("getValue", default_slots_up))); insertSettingValueInDB("default_slots_up", String.valueOf((int)swingReflectionInvokeAndWaitForReturn("getValue", default_slots_up_spinner)));
insertSettingValueInDB("use_slots_down", (boolean)swingReflectionInvokeAndWaitForReturn("isSelected", multi_slot_down_checkbox)?"yes":"no"); insertSettingValueInDB("use_slots_down", (boolean)swingReflectionInvokeAndWaitForReturn("isSelected", multi_slot_down_checkbox)?"yes":"no");
insertSettingValueInDB("use_slots_up", (boolean)swingReflectionInvokeAndWaitForReturn("isSelected", multi_slot_up_checkbox)?"yes":"no"); insertSettingValueInDB("use_slots_up", (boolean)swingReflectionInvokeAndWaitForReturn("isSelected", multi_slot_up_checkbox)?"yes":"no");
insertSettingValueInDB("max_downloads", String.valueOf((int)swingReflectionInvokeAndWaitForReturn("getValue", max_downloads_spinner))); insertSettingValueInDB("max_downloads", String.valueOf((int)swingReflectionInvokeAndWaitForReturn("getValue", max_downloads_spinner)));
@ -808,23 +810,22 @@ public final class SettingsDialog extends javax.swing.JDialog {
final DefaultTableModel model = (DefaultTableModel)mega_accounts_table.getModel(); final DefaultTableModel model = (DefaultTableModel)mega_accounts_table.getModel();
swingReflectionInvoke("setText", status, "Checking your MEGA accounts, please wait..."); status.setText("Checking your MEGA accounts, please wait...");
swingReflectionInvoke("setEnabled", ok_button, false); ok_button.setEnabled(false);
swingReflectionInvoke("setEnabled", cancel_button, false); cancel_button.setEnabled(false);
swingReflectionInvoke("setEnabled", remove_account_button, false); remove_account_button.setEnabled(false);
swingReflectionInvoke("setEnabled", add_account_button, false); add_account_button.setEnabled(false);
swingReflectionInvoke("setEnabled", delete_all_accounts_button, false); delete_all_accounts_button.setEnabled(false);
swingReflectionInvoke("setEnabled", mega_accounts_table, false);
swingReflectionInvoke("setEnabled", encrypt_pass_checkbox, false);
mega_accounts_table.setEnabled(false);
encrypt_pass_checkbox.setEnabled(false);
final SettingsDialog tthis = this; final SettingsDialog tthis = this;
THREAD_POOL.execute(new Runnable(){ THREAD_POOL.execute(new Runnable(){
@ -960,7 +961,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
}); });
} else { } else {
swingReflectionInvoke("setVisible", this, false); this.setVisible(false);
} }
@ -971,13 +972,15 @@ public final class SettingsDialog extends javax.swing.JDialog {
private void multi_slot_down_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_multi_slot_down_checkboxStateChanged private void multi_slot_down_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_multi_slot_down_checkboxStateChanged
if(!(boolean)swingReflectionInvokeAndWaitForReturn("isSelected", multi_slot_down_checkbox)) { if(!multi_slot_down_checkbox.isSelected()) {
default_slots_down_spinner.setEnabled(false);
default_slots_down_label.setEnabled(false);
swingReflectionInvoke("setEnabled", default_slots_down_spinner, false);
swingReflectionInvoke("setEnabled", default_slots_down_label, false);
} else { } else {
swingReflectionInvoke("setEnabled", default_slots_down_spinner, true);
swingReflectionInvoke("setEnabled", default_slots_down_label, true); default_slots_down_spinner.setEnabled(true);
default_slots_down_label.setEnabled(true);
} }
}//GEN-LAST:event_multi_slot_down_checkboxStateChanged }//GEN-LAST:event_multi_slot_down_checkboxStateChanged
@ -1002,7 +1005,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
if(model.getRowCount() == 0) { if(model.getRowCount() == 0) {
swingReflectionInvoke("setEnabled", remove_account_button, false); remove_account_button.setEnabled(false);
} }
}//GEN-LAST:event_remove_account_buttonActionPerformed }//GEN-LAST:event_remove_account_buttonActionPerformed
@ -1014,51 +1017,53 @@ public final class SettingsDialog extends javax.swing.JDialog {
mega_accounts_table.clearSelection(); mega_accounts_table.clearSelection();
swingReflectionInvoke("setEnabled", ok_button, true); ok_button.setEnabled(true);
}//GEN-LAST:event_add_account_buttonActionPerformed }//GEN-LAST:event_add_account_buttonActionPerformed
private void multi_slot_up_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_multi_slot_up_checkboxStateChanged private void multi_slot_up_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_multi_slot_up_checkboxStateChanged
if(!multi_slot_up_checkbox.isSelected()) {
if(!(boolean)swingReflectionInvokeAndWaitForReturn("isSelected", multi_slot_up_checkbox)) {
defaut_slots_up_label.setEnabled(false);
default_slots_up_spinner.setEnabled(false);
swingReflectionInvoke("setEnabled", defaut_slots_up_label, false);
swingReflectionInvoke("setEnabled", default_slots_up, false);
} else { } else {
swingReflectionInvoke("setEnabled", defaut_slots_up_label, true); defaut_slots_up_label.setEnabled(true);
swingReflectionInvoke("setEnabled", default_slots_up, true); default_slots_up_spinner.setEnabled(true);
} }
}//GEN-LAST:event_multi_slot_up_checkboxStateChanged }//GEN-LAST:event_multi_slot_up_checkboxStateChanged
private void limit_download_speed_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_limit_download_speed_checkboxStateChanged private void limit_download_speed_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_limit_download_speed_checkboxStateChanged
if(!(boolean)swingReflectionInvokeAndWaitForReturn("isSelected", limit_download_speed_checkbox)) { if(!limit_download_speed_checkbox.isSelected()) {
swingReflectionInvoke("setEnabled", max_down_speed_label, false); max_down_speed_label.setEnabled(false);
swingReflectionInvoke("setEnabled", max_down_speed_spinner, false); max_down_speed_spinner.setEnabled(false);
} else { } else {
swingReflectionInvoke("setEnabled", max_down_speed_label, true); max_down_speed_label.setEnabled(true);
swingReflectionInvoke("setEnabled", max_down_speed_spinner, true); max_down_speed_spinner.setEnabled(true);
} }
}//GEN-LAST:event_limit_download_speed_checkboxStateChanged }//GEN-LAST:event_limit_download_speed_checkboxStateChanged
private void limit_upload_speed_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_limit_upload_speed_checkboxStateChanged private void limit_upload_speed_checkboxStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_limit_upload_speed_checkboxStateChanged
if(!(boolean)swingReflectionInvokeAndWaitForReturn("isSelected", limit_upload_speed_checkbox)) { if(!limit_upload_speed_checkbox.isSelected()) {
max_up_speed_label.setEnabled(false);
max_up_speed_spinner.setEnabled(false);
swingReflectionInvoke("setEnabled", max_up_speed_label, false);
swingReflectionInvoke("setEnabled", max_up_speed_spinner, false);
} else { } else {
swingReflectionInvoke("setEnabled", max_up_speed_label, true); max_up_speed_label.setEnabled(true);
swingReflectionInvoke("setEnabled", max_up_speed_spinner, true); max_up_speed_spinner.setEnabled(true);
} }
}//GEN-LAST:event_limit_upload_speed_checkboxStateChanged }//GEN-LAST:event_limit_upload_speed_checkboxStateChanged
private void encrypt_pass_checkboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_encrypt_pass_checkboxActionPerformed private void encrypt_pass_checkboxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_encrypt_pass_checkboxActionPerformed
swingReflectionInvoke("setEnabled", encrypt_pass_checkbox, false); encrypt_pass_checkbox.setEnabled(false);
final SettingsDialog tthis = this; final SettingsDialog tthis = this;
@ -1165,7 +1170,9 @@ public final class SettingsDialog extends javax.swing.JDialog {
private void unlock_accounts_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_unlock_accounts_buttonActionPerformed private void unlock_accounts_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_unlock_accounts_buttonActionPerformed
swingReflectionInvoke("setEnabled", unlock_accounts_button, false);
unlock_accounts_button.setEnabled(false);
final SettingsDialog tthis = this; final SettingsDialog tthis = this;
@ -1249,18 +1256,18 @@ public final class SettingsDialog extends javax.swing.JDialog {
if(n == 1) { if(n == 1) {
try { try {
swingReflectionInvoke("setEnabled", encrypt_pass_checkbox, true); encrypt_pass_checkbox.setEnabled(true);
swingReflectionInvoke("setEnabled", mega_accounts_table, true); mega_accounts_table.setEnabled(true);
swingReflectionInvoke("setEnabled", remove_account_button, true); remove_account_button.setEnabled(true);
swingReflectionInvoke("setEnabled", add_account_button, true); add_account_button.setEnabled(true);
swingReflectionInvoke("setVisible", unlock_accounts_button, false); unlock_accounts_button.setVisible(false);
delete_all_accounts_button.setVisible(true);
swingReflectionInvoke("setVisible", delete_all_accounts_button, true);
DefaultTableModel new_model = new DefaultTableModel(new Object [][] {},new String [] {"Email", "Password"}); DefaultTableModel new_model = new DefaultTableModel(new Object [][] {},new String [] {"Email", "Password"});
mega_accounts_table.setModel(new_model); mega_accounts_table.setModel(new_model);
@ -1290,8 +1297,6 @@ public final class SettingsDialog extends javax.swing.JDialog {
Logger.getLogger(SettingsDialog.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(SettingsDialog.class.getName()).log(Level.SEVERE, null, ex);
} }
} }
swingReflectionInvoke("setEnabled", delete_all_accounts_button, true);
}//GEN-LAST:event_delete_all_accounts_buttonActionPerformed }//GEN-LAST:event_delete_all_accounts_buttonActionPerformed
@ -1304,7 +1309,7 @@ public final class SettingsDialog extends javax.swing.JDialog {
private javax.swing.JLabel default_dir_label; private javax.swing.JLabel default_dir_label;
private javax.swing.JLabel default_slots_down_label; private javax.swing.JLabel default_slots_down_label;
private javax.swing.JSpinner default_slots_down_spinner; private javax.swing.JSpinner default_slots_down_spinner;
private javax.swing.JSpinner default_slots_up; private javax.swing.JSpinner default_slots_up_spinner;
private javax.swing.JLabel defaut_slots_up_label; private javax.swing.JLabel defaut_slots_up_label;
private javax.swing.JButton delete_all_accounts_button; private javax.swing.JButton delete_all_accounts_button;
private javax.swing.JLabel down_dir_label; private javax.swing.JLabel down_dir_label;

View File

@ -114,8 +114,10 @@ public final class StreamerDialog extends javax.swing.JDialog implements Clipboa
private void dance_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dance_buttonActionPerformed private void dance_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_dance_buttonActionPerformed
swingReflectionInvoke("setEnabled", dance_button, false);
swingReflectionInvoke("setEnabled", original_link_textfield, false); dance_button.setEnabled(false);
original_link_textfield.setEnabled(false);
final StreamerDialog tthis = this; final StreamerDialog tthis = this;

View File

@ -10,6 +10,7 @@ import static java.util.logging.Logger.getLogger;
import javax.swing.JPanel; import javax.swing.JPanel;
import static megabasterd.MainPanel.THREAD_POOL; import static megabasterd.MainPanel.THREAD_POOL;
import static megabasterd.MiscTools.swingReflectionInvoke; import static megabasterd.MiscTools.swingReflectionInvoke;
import static megabasterd.MiscTools.swingReflectionInvokeAndWaitForReturn;
/** /**
* *
@ -302,9 +303,10 @@ abstract public class TransferenceManager implements Runnable, SecureNotifiable
int finish = _transference_finished_queue.size(); int finish = _transference_finished_queue.size();
if(finish > 0 && _pre_count+prov+wait+run == 0 && !_main_panel.getView().isVisible()) { if(finish > 0 && _pre_count+prov+wait+run == 0 && !(boolean)swingReflectionInvokeAndWaitForReturn("isVisible", _main_panel.getView())) {
swingReflectionInvoke("displayMessage", _main_panel.getTrayicon(), "MegaBasterd says:", "All your transferences have finished", TrayIcon.MessageType.INFO);
_main_panel.getTrayicon().displayMessage("MegaBasterd says:", "All your transferences have finished", TrayIcon.MessageType.INFO);
} }
return (_pre_count+prov+rem+wait+run+finish > 0)?"Pre: "+_pre_count+" / Pro: "+prov+" / Wait: "+wait+" / Run: "+run+" / Finish: "+finish+" / Rem: "+rem:""; return (_pre_count+prov+rem+wait+run+finish > 0)?"Pre: "+_pre_count+" / Pro: "+prov+" / Wait: "+wait+" / Run: "+run+" / Finish: "+finish+" / Rem: "+rem:"";

View File

@ -14,7 +14,6 @@ import static megabasterd.MainPanel.THREAD_POOL;
import static megabasterd.MiscTools.copyTextToClipboard; import static megabasterd.MiscTools.copyTextToClipboard;
import static megabasterd.MiscTools.swingReflectionInvoke; import static megabasterd.MiscTools.swingReflectionInvoke;
import static megabasterd.MiscTools.swingReflectionInvokeAndWait; import static megabasterd.MiscTools.swingReflectionInvokeAndWait;
import static megabasterd.MiscTools.swingReflectionInvokeAndWaitForReturn;
import static megabasterd.MiscTools.updateFont; import static megabasterd.MiscTools.updateFont;
import static megabasterd.Transference.MAX_WORKERS; import static megabasterd.Transference.MAX_WORKERS;
import static megabasterd.Transference.MIN_WORKERS; import static megabasterd.Transference.MIN_WORKERS;
@ -108,8 +107,9 @@ public final class UploadView extends javax.swing.JPanel implements Transference
updateFont(restart_button, FONT_DEFAULT, PLAIN); updateFont(restart_button, FONT_DEFAULT, PLAIN);
updateFont(slot_status_label, FONT_DEFAULT, BOLD); updateFont(slot_status_label, FONT_DEFAULT, BOLD);
swingReflectionInvokeAndWait("setModel", slots_spinner, new SpinnerNumberModel(_upload.getMain_panel().getDefault_slots_up(), MIN_WORKERS, MAX_WORKERS, 1)); swingReflectionInvokeAndWait("setModel", slots_spinner, new SpinnerNumberModel(_upload.getMain_panel().getDefault_slots_up(), MIN_WORKERS, MAX_WORKERS, 1));
swingReflectionInvoke("setEditable", swingReflectionInvokeAndWaitForReturn("getTextField", swingReflectionInvokeAndWaitForReturn("getEditor", slots_spinner)), false); swingReflectionInvoke("setEditable", ((JSpinner.DefaultEditor)slots_spinner.getEditor()).getTextField(), false);
swingReflectionInvoke("setVisible", slots_spinner, false); swingReflectionInvoke("setVisible", slots_spinner, false);
swingReflectionInvoke("setVisible", slots_label, false); swingReflectionInvoke("setVisible", slots_label, false);
swingReflectionInvoke("setVisible", pause_button, false); swingReflectionInvoke("setVisible", pause_button, false);
@ -373,32 +373,32 @@ public final class UploadView extends javax.swing.JPanel implements Transference
private void folder_link_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_folder_link_buttonActionPerformed private void folder_link_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_folder_link_buttonActionPerformed
swingReflectionInvoke("setEnabled", folder_link_button, false); folder_link_button.setEnabled(false);
swingReflectionInvoke("setText", folder_link_button, "Please wait..."); folder_link_button.setText("Please wait...");
copyTextToClipboard(_upload.getFolder_link()); copyTextToClipboard(_upload.getFolder_link());
swingReflectionInvoke("setText", folder_link_button, "Copy folder link"); folder_link_button.setText("Copy folder link");
JOptionPane.showMessageDialog(_upload.getMain_panel().getView(), "MEGA folder link was copied to clipboard!"); JOptionPane.showMessageDialog(_upload.getMain_panel().getView(), "MEGA folder link was copied to clipboard!");
swingReflectionInvoke("setEnabled", folder_link_button, true); folder_link_button.setEnabled(true);
}//GEN-LAST:event_folder_link_buttonActionPerformed }//GEN-LAST:event_folder_link_buttonActionPerformed
private void file_link_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_file_link_buttonActionPerformed private void file_link_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_file_link_buttonActionPerformed
swingReflectionInvoke("setEnabled", file_link_button, false); file_link_button.setEnabled(false);
swingReflectionInvoke("setText", file_link_button, "Please wait..."); file_link_button.setText("Please wait...");
copyTextToClipboard(_upload.getFile_link()); copyTextToClipboard(_upload.getFile_link());
swingReflectionInvoke("setText", file_link_button, "Copy file link"); file_link_button.setText("Copy file link");
JOptionPane.showMessageDialog(_upload.getMain_panel().getView(), "MEGA file link was copied to clipboard!"); JOptionPane.showMessageDialog(_upload.getMain_panel().getView(), "MEGA file link was copied to clipboard!");
swingReflectionInvoke("setEnabled", file_link_button, true); file_link_button.setEnabled(true);
}//GEN-LAST:event_file_link_buttonActionPerformed }//GEN-LAST:event_file_link_buttonActionPerformed