github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

renamed utility functions for clarity

Browse source
This commit is contained in:
GrayedFox 2018-05-23 16:49:48 +02:00
parent 32cb438e7c
commit 42b539c41f
No known key found for this signature in database
GPG key ID: 7FF4748DBF28C93F
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/mage/client/dialog/TableWaitingDialog.java
View file

@ -154,6 +154,7 @@ public class TableWaitingDialog extends MageDialog {
public void showDialog(UUID roomId, UUID tableId, boolean isTournament) { public void showDialog(UUID roomId, UUID tableId, boolean isTournament) {
Rectangle currentBounds = MageFrame.getDesktop().getBounds(); Rectangle currentBounds = MageFrame.getDesktop().getBounds();
Optional<UUID> chatId = SessionHandler.getTableChatId(tableId); Optional<UUID> chatId = SessionHandler.getTableChatId(tableId);
String tournamentChatDivider = PreferencesDialog.getCachedValue(KEY_TABLES_DIVIDER_LOCATION_4, null);
updateTask = new UpdateSeatsTask(SessionHandler.getSession(), roomId, tableId, this); updateTask = new UpdateSeatsTask(SessionHandler.getSession(), roomId, tableId, this);
this.roomId = roomId; this.roomId = roomId;
@ -176,7 +177,7 @@ public class TableWaitingDialog extends MageDialog {
this.setModal(false); this.setModal(false);
this.setLocation(100, 100); this.setLocation(100, 100);
this.setVisible(true); this.setVisible(true);
String tournamentChatDivider = PreferencesDialog.getCachedValue(KEY_TABLES_DIVIDER_LOCATION_4, null);
GuiDisplayUtil.restoreDividerLocations(currentBounds, tournamentChatDivider, jSplitPane1); GuiDisplayUtil.restoreDividerLocations(currentBounds, tournamentChatDivider, jSplitPane1);
} else { } else {
closeDialog(); closeDialog();
@ -193,7 +194,7 @@ public class TableWaitingDialog extends MageDialog {
this.removeDialog(); this.removeDialog();
TableUtil.saveColumnWidthAndOrderToPrefs(jTableSeats, KEY_TABLE_WAITING_COLUMNS_WIDTH, KEY_TABLE_WAITING_COLUMNS_ORDER); TableUtil.saveColumnWidthAndOrderToPrefs(jTableSeats, KEY_TABLE_WAITING_COLUMNS_WIDTH, KEY_TABLE_WAITING_COLUMNS_ORDER);
GuiDisplayUtil.saveCurrentBoundsToPrefs(); GuiDisplayUtil.saveCurrentBoundsToPrefs();
GuiDisplayUtil.setDividerLocation(KEY_TABLES_DIVIDER_LOCATION_4, this.jSplitPane1.getDividerLocation()); GuiDisplayUtil.saveDividerLocationToPrefs(KEY_TABLES_DIVIDER_LOCATION_4, this.jSplitPane1.getDividerLocation());
} }
/** /**

10
Mage.Client/src/main/java/mage/client/table/TablesPanel.java
View file

@ -231,7 +231,7 @@ public class TablesPanel extends javax.swing.JPanel {
jScrollPaneTablesActive.getViewport().setBackground(new Color(255, 255, 255, 50)); jScrollPaneTablesActive.getViewport().setBackground(new Color(255, 255, 255, 50));
jScrollPaneTablesFinished.getViewport().setBackground(new Color(255, 255, 255, 50)); jScrollPaneTablesFinished.getViewport().setBackground(new Color(255, 255, 255, 50));
saveActiveFiltersToPrefs(); restoreFilters();
setGUISize(); setGUISize();
Action openTableAction; Action openTableAction;
@ -411,12 +411,12 @@ public class TablesPanel extends javax.swing.JPanel {
private void saveDividerLocations() { private void saveDividerLocations() {
// save divider locations and divider saveDividerLocations // save divider locations and divider saveDividerLocations
GuiDisplayUtil.saveCurrentBoundsToPrefs(); GuiDisplayUtil.saveCurrentBoundsToPrefs();
GuiDisplayUtil.setDividerLocation(KEY_TABLES_DIVIDER_LOCATION_1, this.jSplitPane1.getDividerLocation()); GuiDisplayUtil.saveDividerLocationToPrefs(KEY_TABLES_DIVIDER_LOCATION_1, this.jSplitPane1.getDividerLocation());
GuiDisplayUtil.setDividerLocation(KEY_TABLES_DIVIDER_LOCATION_2, this.jSplitPaneTables.getDividerLocation()); GuiDisplayUtil.saveDividerLocationToPrefs(KEY_TABLES_DIVIDER_LOCATION_2, this.jSplitPaneTables.getDividerLocation());
GuiDisplayUtil.setDividerLocation(KEY_TABLES_DIVIDER_LOCATION_3, chatPanelMain.getSplitDividerLocation()); GuiDisplayUtil.saveDividerLocationToPrefs(KEY_TABLES_DIVIDER_LOCATION_3, chatPanelMain.getSplitDividerLocation());
} }
private void saveActiveFiltersToPrefs() { private void restoreFilters() {
TableUtil.setActiveFilters(KEY_TABLES_FILTER_SETTINGS, filterButtons); TableUtil.setActiveFilters(KEY_TABLES_FILTER_SETTINGS, filterButtons);
setTableFilter(); setTableFilter();
} }

2
Mage.Client/src/main/java/mage/client/util/gui/GuiDisplayUtil.java
View file

@ -54,7 +54,7 @@ public final class GuiDisplayUtil {
PreferencesDialog.saveValue(KEY_MAGE_PANEL_LAST_SIZE, currentBounds); PreferencesDialog.saveValue(KEY_MAGE_PANEL_LAST_SIZE, currentBounds);
} }
public static void setDividerLocation(String dividerPrefKey, int position) { public static void saveDividerLocationToPrefs(String dividerPrefKey, int position) {
PreferencesDialog.saveValue(dividerPrefKey, Integer.toString(position)); PreferencesDialog.saveValue(dividerPrefKey, Integer.toString(position));
} }