Mirrors/megabasterd
1
0
Fork 0
mirror of https://github.com/tonikelope/megabasterd.git synced 2025-05-02 07:34:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

-Streamer folder link fix.

Browse Source 
-Single instance running sockets
-Queues refactoring
...2
This commit is contained in:
tonikelope 2016-09-30 20:38:57 +02:00
parent 29caf50c28
commit 75d621bd20
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/megabasterd/TransferenceManager.java
View File

@ -16,7 +16,7 @@ import static java.util.logging.Logger.getLogger;
abstract public class TransferenceManager implements Runnable, SecureNotifiable { abstract public class TransferenceManager implements Runnable, SecureNotifiable {
private final ConcurrentLinkedQueue<Transference> _transference_provision_queue; private final ConcurrentLinkedQueue<Transference> _transference_provision_queue;
private final ConcurrentLinkedQueue<Transference> _transference_start_queue; private final ConcurrentLinkedQueue<Transference> _transference_waitstart_queue;
private final ConcurrentLinkedQueue<Transference> _transference_remove_queue; private final ConcurrentLinkedQueue<Transference> _transference_remove_queue;
private final ConcurrentLinkedQueue<Transference> _transference_finished_queue; private final ConcurrentLinkedQueue<Transference> _transference_finished_queue;
private final ConcurrentLinkedQueue<Transference> _transference_running_list; private final ConcurrentLinkedQueue<Transference> _transference_running_list;
@ -60,7 +60,7 @@ abstract public class TransferenceManager implements Runnable, SecureNotifiable
_main_panel = main_panel; _main_panel = main_panel;
_scroll_panel = scroll_panel; _scroll_panel = scroll_panel;
_secure_notify_lock = new Object(); _secure_notify_lock = new Object();
_transference_start_queue = new ConcurrentLinkedQueue(); _transference_waitstart_queue = new ConcurrentLinkedQueue();
_transference_provision_queue = new ConcurrentLinkedQueue(); _transference_provision_queue = new ConcurrentLinkedQueue();
_transference_remove_queue = new ConcurrentLinkedQueue(); _transference_remove_queue = new ConcurrentLinkedQueue();
_transference_finished_queue = new ConcurrentLinkedQueue(); _transference_finished_queue = new ConcurrentLinkedQueue();
@ -116,7 +116,7 @@ abstract public class TransferenceManager implements Runnable, SecureNotifiable
} }
public ConcurrentLinkedQueue<Transference> getTransference_start_queue() { public ConcurrentLinkedQueue<Transference> getTransference_start_queue() {
return _transference_start_queue; return _transference_waitstart_queue;
} }
public ConcurrentLinkedQueue<Transference> getTransference_remove_queue() { public ConcurrentLinkedQueue<Transference> getTransference_remove_queue() {
@ -146,9 +146,9 @@ abstract public class TransferenceManager implements Runnable, SecureNotifiable
public void closeAllWaiting() public void closeAllWaiting()
{ {
_transference_remove_queue.addAll(new ArrayList(_transference_start_queue)); _transference_remove_queue.addAll(new ArrayList(_transference_waitstart_queue));
_transference_start_queue.clear(); _transference_waitstart_queue.clear();
secureNotify(); secureNotify();
} }
@ -177,7 +177,7 @@ abstract public class TransferenceManager implements Runnable, SecureNotifiable
public void sortTransferenceStartQueue() public void sortTransferenceStartQueue()
{ {
ArrayList<Transference> trans_list = new ArrayList(_transference_start_queue); ArrayList<Transference> trans_list = new ArrayList(_transference_waitstart_queue);
trans_list.sort(new Comparator<Transference> () { trans_list.sort(new Comparator<Transference> () {
@ -188,9 +188,9 @@ abstract public class TransferenceManager implements Runnable, SecureNotifiable
} }
}); });
_transference_start_queue.clear(); _transference_waitstart_queue.clear();
_transference_start_queue.addAll(trans_list); _transference_waitstart_queue.addAll(trans_list);
} }
public void checkButtonsAndMenus(javax.swing.JButton close_all_finished_button, javax.swing.JButton pause_all_button, public void checkButtonsAndMenus(javax.swing.JButton close_all_finished_button, javax.swing.JButton pause_all_button,
@ -216,7 +216,7 @@ abstract public class TransferenceManager implements Runnable, SecureNotifiable
} }
swingReflectionInvoke("setEnabled", clean_all_waiting_trans_menu, !_transference_start_queue.isEmpty()); swingReflectionInvoke("setEnabled", clean_all_waiting_trans_menu, !_transference_waitstart_queue.isEmpty());
if(!_transference_finished_queue.isEmpty()) { if(!_transference_finished_queue.isEmpty()) {
@ -232,7 +232,17 @@ abstract public class TransferenceManager implements Runnable, SecureNotifiable
public String getStatus() { public String getStatus() {
return "Prov("+_transference_provision_queue.size()+") / Rem("+_transference_remove_queue.size()+") / Wait("+_transference_start_queue.size()+") / Run("+_transference_running_list.size()+") / Finish("+_transference_finished_queue.size()+")"; int prov = _transference_provision_queue.size();
int rem = _transference_remove_queue.size();
int wait = _transference_waitstart_queue.size();
int run = _transference_running_list.size();
int finish = _transference_finished_queue.size();
return (prov+rem+wait+run+finish > 0)?"Prov("+prov+") / Rem("+rem+") / Wait("+wait+") / Run("+run+") / Finish("+finish+")":"";
} }
} }

2
src/megabasterd/UploadManager.java
View File

@ -189,7 +189,7 @@ public final class UploadManager extends TransferenceManager {
checkButtonsAndMenus(getMain_panel().getView().getClose_all_finished_up_button(), getMain_panel().getView().getPause_all_up(), getMain_panel().getView().getClean_all_up_menu()); checkButtonsAndMenus(getMain_panel().getView().getClose_all_finished_up_button(), getMain_panel().getView().getPause_all_up(), getMain_panel().getView().getClean_all_up_menu());
if(!this.getMain_panel().getView().isPre_processing_uploads()) { if(!getMain_panel().getView().isPre_processing_uploads()) {
swingReflectionInvoke("setText", getMain_panel().getView().getStatus_up_label(), getStatus()); swingReflectionInvoke("setText", getMain_panel().getView().getStatus_up_label(), getStatus());
} }
} }