mirrors/ns-usbloader
1
0
Fork 0
mirror of https://github.com/developersu/ns-usbloader.git synced 2025-05-14 07:04:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Frontend complete

Browse source
This commit is contained in:
Dmitry Isaenko 2019-03-19 17:44:39 +03:00
parent 863c69affa
commit 65f084591a
5 changed files with 130 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/main/java/nsusbloader/Controllers/NSLMainController.java
View file

@ -2,6 +2,7 @@ package nsusbloader.Controllers;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.concurrent.Task;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.*;
@ -20,7 +21,6 @@ import nsusbloader.USB.UsbCommunications;
import java.io.File;
import java.net.*;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.ResourceBundle;
@ -54,7 +54,7 @@ public class NSLMainController implements Initializable {
@FXML
private Label nsIpLbl;
private UsbCommunications usbCommunications;
private Task<Void> usbNetCommunications;
private Thread workThread;
private String previouslyOpenedPath;
@ -200,8 +200,8 @@ public class NSLMainController implements Initializable {
for (File item: nspToUpload)
logArea.appendText(" "+item.getAbsolutePath()+"\n");
}
usbCommunications = new UsbCommunications(nspToUpload, choiceProtocol.getSelectionModel().getSelectedItem());
workThread = new Thread(usbCommunications);
usbNetCommunications = new UsbCommunications(nspToUpload, choiceProtocol.getSelectionModel().getSelectedItem());
workThread = new Thread(usbNetCommunications);
workThread.setDaemon(true);
workThread.start();
}
@ -212,24 +212,31 @@ public class NSLMainController implements Initializable {
String nsIP = nsIpTextField.getText();
List<File> nspToUpload;
if (!SettingsTabController.getExpertModeSelected()) {
if ((nspToUpload = tableFilesListController.getFilesForUpload()) == null) {
logArea.setText(resourceBundle.getString("logsNoFolderFileSelected"));
return;
}
else {
logArea.setText(resourceBundle.getString("logsFilesToUploadTitle")+"\n");
for (File item: nspToUpload)
logArea.appendText(" "+item.getAbsolutePath()+"\n");
}
NETCommunications netCommunications = new NETCommunications(nspToUpload, nsIP); // TODO: move somewhere
workThread = new Thread(netCommunications);
workThread.setDaemon(true);
workThread.start();
if ((nspToUpload = tableFilesListController.getFilesForUpload()) == null) {
logArea.setText(resourceBundle.getString("logsNoFolderFileSelected"));
return;
}
else {
// TODO; pass to another constructor
logArea.setText(resourceBundle.getString("logsFilesToUploadTitle")+"\n");
for (File item: nspToUpload)
logArea.appendText(" "+item.getAbsolutePath()+"\n");
}
if (!SettingsTabController.getExpertModeSelected())
usbNetCommunications = new NETCommunications(nspToUpload, nsIP, false, "", "", "");
else {
usbNetCommunications = new NETCommunications(
nspToUpload,
nsIP,
SettingsTabController.getNotServeSelected(),
SettingsTabController.getAutoIpSelected()?"":SettingsTabController.getHostIp(),
SettingsTabController.getRandPortSelected()?"":SettingsTabController.getHostPort(),
SettingsTabController.getNotServeSelected()?SettingsTabController.getHostExtra():""
);
}
workThread = new Thread(usbNetCommunications);
workThread.setDaemon(true);
workThread.start();
}
}
}
@ -238,7 +245,7 @@ public class NSLMainController implements Initializable {
* */
private void stopBtnAction(){
if (workThread != null && workThread.isAlive()){
usbCommunications.cancel(false); // TODO: add something abstract to use also for network
usbNetCommunications.cancel(false); // TODO: add something abstract to use also for network
}
}
/**

7
src/main/java/nsusbloader/Controllers/NSLRowModel.java
View file

@ -50,11 +50,14 @@ public class NSLRowModel {
case FAILED:
this.status = "Failed";
break;
case UNKNOWN:
case INDETERMINATE:
this.status = "...";
break;
case UNKNOWN:
this.status = "Unknown";
break;
case INCORRECT_FILE_FAILED:
this.status = "Failed: Incorrect file";
this.status = "Failed: Bad file";
markForUpload = false;
break;
}

2
src/main/java/nsusbloader/Controllers/NSTableViewController.java
View file

@ -225,7 +225,7 @@ public class NSTableViewController implements Initializable {
for (NSLRowModel model: rowsObsLst){
if (model.isMarkForUpload()){
files.add(model.getNspFile());
model.setStatus(EFileStatus.UNKNOWN);
model.setStatus(EFileStatus.INDETERMINATE);
}
}
if (!files.isEmpty()) {