Skip to content

Commit

Permalink
Missing file
Browse files Browse the repository at this point in the history
implement saving column order
  • Loading branch information
Ljaysoft committed Aug 24, 2016
1 parent 9b3c067 commit 504a35f
Show file tree
Hide file tree
Showing 3 changed files with 130 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

@@ -1,6 +1,7 @@
package me.corriekay.pokegoutil.GUI.controller;

import javafx.beans.property.Property;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
Expand Down Expand Up @@ -55,7 +56,35 @@ private void initialize() {
pokemonTableView.getColumns().addAll(columns);
pokemonTableView.setItems(PokemonBagManager.getAllPokemon());
pokemonTableView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
pokemonTableView.getColumns().addListener((ListChangeListener) c -> {
saveOrderToConfig();
});
}

private ArrayList<ColumnID> getColumnOrderFromConfig() {
ArrayList<ColumnID> list = new ArrayList<>();
String config = ConfigNew.getConfig().getString(ConfigKey.COLUMN_ORDER_POKEMON_TABLE);
if (config == null || config.isEmpty())
return list;
String[] split = config.split("-");
ColumnID[] ids = ColumnID.values();
for (String s : split) {
list.add(ids[Integer.valueOf(s)]);
}
return list;
}

private void saveOrderToConfig() {
String columnOrder = "";
int i = 0;
for (Object c : getColumns()){
if (i!=0)
columnOrder+="-";
columnOrder += String.valueOf(ColumnID.get(((TableColumn)c).getText()).ordinal());
i++;
}

ConfigNew.getConfig().setString(ConfigKey.COLUMN_ORDER_POKEMON_TABLE,columnOrder);
}

public ObservableList getColumns() {
Expand Down Expand Up @@ -182,28 +211,4 @@ private void setColumns() {
columns.add(col);
} );
}

private ArrayList<ColumnID> getColumnOrderFromConfig() {
ArrayList<ColumnID> list = new ArrayList<>();
String config = ConfigNew.getConfig().getString(ConfigKey.COLUMN_ORDER_POKEMON_TABLE);
if (config == null || config.isEmpty())
return list;
for (String s : config.split(".")) {
list.add(ColumnID.get(s));
}
return list;
}

private void saveOrderToConfig() {
String columnOrder = "";
int i = 0;
for (TableColumn c : columns){
if (i!=0)
columnOrder.concat(".");
columnOrder = String.valueOf(ColumnID.valueOf(c.getText()).ordinal());
i++;
}

ConfigNew.getConfig().setString(ConfigKey.COLUMN_ORDER_POKEMON_TABLE,columnOrder);
}
}
98 changes: 98 additions & 0 deletions src/me/corriekay/pokegoutil/GUI/enums/ColumnID.java
@@ -0,0 +1,98 @@
package me.corriekay.pokegoutil.GUI.enums;

import java.util.HashMap;
import java.util.Map;

/**
* data types:
* 0 String - Nickname
* 1 Integer - Pokemon Number
* 2 String - Type / Pokemon
* 3 String(Percentage) - IV Rating
* 4 Double - Level
* 5 Integer - Attack
* 6 Integer - Defense
* 7 Integer - Stamina
* 8 String - Type 1
* 9 String - Type 2
* 10 String - Move 1
* 11 String - Move 2
* 12 Integer - CP
* 13 Integer - HP
* 14 Integer - Max CP (Current)
* 15 Integer - Max CP
* 16 Integer - Max Evolved CP (Current)
* 17 Integer - Max Evolved CP
* 18 Integer - Candies of type
* 19 String(Nullable Int) - Candies to Evolve
* 20 Integer - Star Dust to level
* 21 String - Pokeball Type
* 22 String(Date) - Caught at
* 23 Boolean - Favorite
* 24 Long - duelAbility
* 25 Integer - gymOffense
* 26 Integer - gymDefense
* 27 String(Percentage) - Move 1 Rating
* 28 String(Percentage) - Move 2 Rating
* 29 String(Nullable Int) - CP Evolved
* 30 String(Nullable Int) - Evolvable
* 31 Long - duelAbility IV
* 32 Double - gymOffense IV
* 33 Long - gymDefense IV
*/
public enum ColumnID {
NUMBER("Number"),
NICKNAME("Nickname"),
SPECIES("Species"),
IV("IV %"),
LEVEL("Lvl"),
ATTACK("Atk"),
DEFENSE("Def"),
STAMINA("Stam"),
TYPE1("Type 1"),
TYPE2("Type 2"),
MOVE1("Move 1"),
MOVE2("Move 2"),
CP("CP"),
HP("HP"),
MAXCPCURRENT("Max CP (Current)"),
MAXCP("Max CP"),
MAXEVOLVEDCPCURRENT("Max Evolved CP (Current)"),
MAXEVOLVEDCP("Max Evolved CP"),
CANDIES("Candies"),
CANDIES2EVOLVE("To evolve"),
STARDUST2LVL("Stardust"),
CAUGHTPOKEBALL("Caught With"),
CAUGHTDATE("Time Caught"),
FAVORITE("Favorite"),
DUELABILITY("Duel Ability"),
GYMOFFENSE("Gym Offense"),
GYMDEFENSE("Gym Defense"),
MOVE1RATING("Move 1 Rating"),
MOVE2RATING("Move 2 Rating"),
CPEVOLVED("CP Evolved"),
EVOLVABLE("Evolvable"),
DUELABILITYIV("Duel Ability IV"),
GYMOFFENSEIV("Gym Offense IV"),
GYMDEFENSEIV("Gym Defense IV");

private static final Map<String,ColumnID> titleMap = new HashMap();

static {
for(ColumnID id : ColumnID.values())
titleMap.put(id.getTitle(),id);
}

private String title;

private ColumnID(String title) {
this.title = title;
}

public String getTitle() { return title; }

public static ColumnID get(String title) {
return titleMap.get(title);
}

}

0 comments on commit 504a35f

Please sign in to comment.