Voomra/trader
Archived
0
Fork 0
Code Activity

add powerplay import to client

Browse Source
This commit is contained in:
iMoHax
2016-11-02 17:40:42 +03:00
parent 3fdbc1837e
commit 40050781b5
3 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/src/main/java/ru/trader/controllers/MainController.java
View File

@@ -13,6 +13,7 @@ import ru.trader.ServicesManager;
import ru.trader.World;
import ru.trader.model.*;
import ru.trader.services.MaddavoParserTask;
import ru.trader.services.PowerPlayParserTask;
import ru.trader.view.support.Localization;
import ru.trader.view.support.ViewUtils;
@@ -309,6 +310,24 @@ public class MainController {
});
}
@FXML
private void importPowerPlaySystems() {
chooseFile(new FileChooser.ExtensionFilter("PowerPlay StarSystems file (StarSystems*.csv)","StarSystems*.csv"), file -> {
PowerPlayParserTask task = new PowerPlayParserTask(file, PowerPlayParserTask.FILE_TYPE.SYSTEMS, World.getMarket());
Screeners.showProgress(Localization.getString("message.import.systems"), task, () -> ViewUtils.doFX(this::reload));
});
}
@FXML
private void importPowerPlayPrediction() {
chooseFile(new FileChooser.ExtensionFilter("PowerPlay Preparation file (Prediction*.csv)","Prediction*.csv"), file -> {
PowerPlayParserTask task = new PowerPlayParserTask(file, PowerPlayParserTask.FILE_TYPE.PREDICTION, World.getMarket());
Screeners.showProgress(Localization.getString("message.import.systems"), task, () -> ViewUtils.doFX(this::reload));
});
}
private void chooseFile(FileChooser.ExtensionFilter filter, Consumer<File> action) {
FileChooser fileChooser = new FileChooser();
fileChooser.getExtensionFilters().add(filter);

42
client/src/main/java/ru/trader/services/PowerPlayParserTask.java Normal file
View File

@@ -0,0 +1,42 @@
package ru.trader.services;
import javafx.concurrent.Task;
import ru.trader.core.Market;
import ru.trader.powerplay.PPParser;
import java.io.File;
public class PowerPlayParserTask extends Task<Void> {
private final File file;
private final FILE_TYPE type;
private final PPParser parser;
public PowerPlayParserTask(File file, FILE_TYPE type, Market market) {
this.file = file;
this.type = type;
this.parser = new PPParser(market);
}
@Override
protected void cancelled() {
parser.cancel();
}
@Override
protected Void call() throws Exception {
switch (type){
case SYSTEMS: parser.parseSystems(file);
break;
case PREDICTION: parser.parsePrediction(file);
break;
}
return null;
}
public enum FILE_TYPE {
SYSTEMS, PREDICTION
}
}

4
client/src/main/resources/view/main.fxml
View File

@@ -18,6 +18,10 @@
<MenuItem text="%market.stations" onAction="#impMadStations"/>
<MenuItem text="%market.offers" onAction="#impMadOffers"/>
</Menu>
<Menu text="PowerPlay">
<MenuItem text="StarSystem" onAction="#importPowerPlaySystems"/>
<MenuItem text="Prediction" onAction="#importPowerPlayPrediction"/>
</Menu>
<MenuItem text="XML" onAction="#importWorld"/>
<MenuItem text="EDCE JSON" onAction="#importEDCE"/>
</Menu>