Skip to content

Commit

Permalink
Code: Removed EveKit settings and credits
Browse files Browse the repository at this point in the history
  • Loading branch information
GoldenGnu committed Dec 14, 2019
1 parent b9a11af commit 5dbe2b0
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 614 deletions.
8 changes: 0 additions & 8 deletions credits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,6 @@ Link:
Toolkit License:
©CCP hf. All rights reserved. Used with permission.

________________________________________________________________________________
_EVEKIT_________________________________________________________________________

jEveAssets use EveKit account API

Link:
https://evekit.orbital.enterprises

________________________________________________________________________________
_FUZZWORK_______________________________________________________________________

Expand Down
1 change: 0 additions & 1 deletion src/main/java/net/nikr/eve/jeveasset/Program.java
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,6 @@ public void saveSettingsAndProfile() {

public void saveProfile() {
LOG.info("Saving Profile");
//Update EveKit Import
profileManager.saveProfile();
}

Expand Down
45 changes: 0 additions & 45 deletions src/main/java/net/nikr/eve/jeveasset/data/settings/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ public static enum SettingFlag {
private static Settings settings;
private static boolean testMode = false;

private int eveKitTransactionsHistory = 3;
private int eveKitJournalHistory = 3;
private int eveKitMarketOrdersHistory = 3;
private int eveKitIndustryJobsHistory = 3;
private int eveKitContractsHistory = 3;
//External
//Price Saved by PriceDataGetter.process() in pricedata.dat (on api update)
private Map<Integer, PriceData> priceDatas = new HashMap<Integer, PriceData>(); //TypeID : int
Expand Down Expand Up @@ -810,46 +805,6 @@ public Map<String, OverviewGroup> getOverviewGroups() {
return overviewGroups;
}

public int getEveKitTransactionsHistory() {
return eveKitTransactionsHistory;
}

public void setEveKitTransactionsHistory(int eveKitTransactionsHistory) {
this.eveKitTransactionsHistory = eveKitTransactionsHistory;
}

public int getEveKitJournalHistory() {
return eveKitJournalHistory;
}

public void setEveKitJournalHistory(int eveKitJournalHistory) {
this.eveKitJournalHistory = eveKitJournalHistory;
}

public int getEveKitMarketOrdersHistory() {
return eveKitMarketOrdersHistory;
}

public void setEveKitMarketOrdersHistory(int eveKitMarketOrdersHistory) {
this.eveKitMarketOrdersHistory = eveKitMarketOrdersHistory;
}

public int getEveKitIndustryJobsHistory() {
return eveKitIndustryJobsHistory;
}

public void setEveKitIndustryJobsHistory(int eveKitIndustryJobsHistory) {
this.eveKitIndustryJobsHistory = eveKitIndustryJobsHistory;
}

public int getEveKitContractsHistory() {
return eveKitContractsHistory;
}

public void setEveKitContractsHistory(int eveKitContractsHistory) {
this.eveKitContractsHistory = eveKitContractsHistory;
}

private static String getPathSettings() {
return FileUtil.getLocalFile(Settings.PATH_SETTINGS, !Program.isPortable());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ public AboutDialog(final Program program) {
JEditorPane jExternal = createEditorPane(
"<b>Content</b><br>"
+ "&nbsp;<a href=\"http://www.eveonline.com/\">EVE-Online</a> (api and toolkit)<br> "
+ "&nbsp;<a href=\"https://evekit.orbital.enterprises\">EveKit</a> (account api)<br> "
//+ "&nbsp;<a href=\"http://eve-marketdata.com/\">EVE-Marketdata.com</a> (price data api)<br>"
+ "&nbsp;<a href=\"https://market.fuzzwork.co.uk/api/\">fuzzwork.co.uk</a> (price data api)<br>"
+ "&nbsp;<a href=\"https://evemarketer.com/\">EveMarketer.com</a> (price data api)<br>"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
import net.nikr.eve.jeveasset.Program;
import net.nikr.eve.jeveasset.data.api.accounts.ApiType;
import net.nikr.eve.jeveasset.data.api.accounts.EsiOwner;
import net.nikr.eve.jeveasset.data.api.accounts.EveKitOwner;
import net.nikr.eve.jeveasset.gui.images.Images;
import net.nikr.eve.jeveasset.gui.shared.components.JCustomFileChooser;
import net.nikr.eve.jeveasset.gui.shared.components.JDialogCentered;
Expand Down Expand Up @@ -153,8 +152,6 @@ private enum Share {

private final DonePanel donePanel;

private EveKitOwner eveKitOwner;
private EveKitOwner editEveKitOwner;
private EsiOwner esiOwner;
private EsiOwner editEsiOwner;
private AccountImportCard currentCard;
Expand Down Expand Up @@ -243,25 +240,24 @@ protected void windowShown() { }
protected void save() { }

public void add() {
show(null, AccountImportCard.ADD_ESI, null, null);
show(null, AccountImportCard.ADD_ESI, null);
}

public void shareExport() {
show(Share.EXPORT, AccountImportCard.ADD_ESI, null, null);
show(Share.EXPORT, AccountImportCard.ADD_ESI, null);
}

public void shareImport() {
show(Share.IMPORT, AccountImportCard.SHARE_IMPORT, null, null);
show(Share.IMPORT, AccountImportCard.SHARE_IMPORT, null);
}

public void editEsi(final EsiOwner editEsiOwner) {
show(null, AccountImportCard.ADD_ESI, null, editEsiOwner);
show(null, AccountImportCard.ADD_ESI, editEsiOwner);
}

private void show(Share share, AccountImportCard accountImportCard, final EveKitOwner editEveKitOwner, final EsiOwner editEsiOwner) {
private void show(Share share, AccountImportCard accountImportCard, final EsiOwner editEsiOwner) {
currentCard = accountImportCard;
this.share = share;
this.editEveKitOwner = editEveKitOwner;
this.editEsiOwner = editEsiOwner;
if (editEsiOwner != null) { //Edit ESI
jType.setVisible(false);
Expand Down Expand Up @@ -379,14 +375,6 @@ private void showDoneTab() {
}

private void done() {
if (apiType == ApiType.EVEKIT) {
if (editEveKitOwner != null) { //Edit
program.getProfileManager().getEveKitOwners().remove(editEveKitOwner);
}
apiManager.forceUpdate();
program.getProfileManager().getEveKitOwners().add(eveKitOwner);
apiManager.updateTable();
}
if (apiType == ApiType.ESI && share != Share.EXPORT) {
if (editEsiOwner != null) { //Edit
program.getProfileManager().getEsiOwners().remove(editEsiOwner);
Expand Down
Loading

0 comments on commit 5dbe2b0

Please sign in to comment.