mirrors/PCUGameManager
mirrors
/
PCUGameManager
mirror of https://github.com/lantzelot-swe/PCUGameManager.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: Info slots for a specific view where shown for other views in some circumstances 

fix: Info slots are deleted when a gamelist view is deleted.
This commit is contained in:
lantzelot-swe 2022-01-01 22:17:04 +01:00
parent 17a3103fbc
commit 59f299ebd3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/se/lantz/db/DbConnector.java
View File

@ -239,10 +239,10 @@ public class DbConnector
Integer.toString(rs.getInt("rowid")), Integer.toString(rs.getInt("rowid")),
rs.getInt("Favorite"), rs.getInt("Favorite"),
viewTag != null && viewTag.contains("GIS:")); viewTag != null && viewTag.contains("GIS:"));
//Filter out all info slots that are not supposed to be shown in "all games"
if (data.isInfoSlot() && view.getGameViewId() == -1 && !viewTag.equalsIgnoreCase("GIS:-1")) if (data.isInfoSlot() && !viewTag.equalsIgnoreCase("GIS:" + view.getGameViewId()))
{ {
//Ignore all info slots not created for "all games" //Ignore all info slots not created for this specific view
} }
else else
{ {
@ -446,6 +446,8 @@ public class DbConnector
} }
insertViewFilterstmnt.executeUpdate(); insertViewFilterstmnt.executeUpdate();
} }
//Make sure SQL statement is updated correctly for new views
view.setViewFilters(view.getViewFilters());
} }
catch (SQLException e) catch (SQLException e)
{ {
@ -1094,13 +1096,17 @@ public class DbConnector
{ {
String viewFilterSql = "DELETE FROM viewfilter WHERE gameview = " + view.getGameViewId(); String viewFilterSql = "DELETE FROM viewfilter WHERE gameview = " + view.getGameViewId();
String gameViewSql = "DELETE FROM gameview WHERE viewId = " + view.getGameViewId(); String gameViewSql = "DELETE FROM gameview WHERE viewId = " + view.getGameViewId();
String infoSlotSql = "DELETE FROM gameinfo WHERE viewTag LIKE 'GIS:" + view.getGameViewId() + "'";
try (Connection conn = this.connect(); PreparedStatement viewFilterstmt = conn.prepareStatement(viewFilterSql); try (Connection conn = this.connect(); PreparedStatement viewFilterstmt = conn.prepareStatement(viewFilterSql);
PreparedStatement gameViewStmt = conn.prepareStatement(gameViewSql)) PreparedStatement gameViewStmt = conn.prepareStatement(gameViewSql);
PreparedStatement infoSlotStmt = conn.prepareStatement(infoSlotSql))
{ {
int value = viewFilterstmt.executeUpdate(); int value = viewFilterstmt.executeUpdate();
logger.debug("Executed successfully, value = {}", value); logger.debug("{} Executed successfully, value = {}", viewFilterSql, value);
value = gameViewStmt.executeUpdate(); value = gameViewStmt.executeUpdate();
logger.debug("Executed successfully, value = {}", value); logger.debug("{} Executed successfully, value = {}", gameViewSql, value);
value = infoSlotStmt.executeUpdate();
logger.debug("{} Executed successfully, value = {}", infoSlotSql, value);
} }
catch (SQLException e) catch (SQLException e)
{ {

9
src/main/java/se/lantz/gui/gameview/GameViewManager.java
View File

@ -2,10 +2,8 @@ package se.lantz.gui.gameview;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.SwingUtilities;
import se.lantz.gui.ListPanel; import se.lantz.gui.ListPanel;
import se.lantz.gui.MainPanel;
import se.lantz.gui.MainWindow; import se.lantz.gui.MainWindow;
import se.lantz.model.MainViewModel; import se.lantz.model.MainViewModel;
import se.lantz.model.data.GameView; import se.lantz.model.data.GameView;
@ -15,7 +13,7 @@ public class GameViewManager
private JComboBox<GameView> viewCombobox; private JComboBox<GameView> viewCombobox;
private final MainViewModel uiModel; private final MainViewModel uiModel;
private ListPanel mainPanel; private ListPanel mainPanel;
public GameViewManager(ListPanel mainPanel, MainViewModel uiModel) public GameViewManager(ListPanel mainPanel, MainViewModel uiModel)
{ {
this.mainPanel = mainPanel; this.mainPanel = mainPanel;
@ -59,11 +57,12 @@ public class GameViewManager
} }
} }
} }
public void deleteView(GameView view) public void deleteView(GameView view)
{ {
String message = "Do you want to delete the gamelist view \"" + view.getName() + "\"?"; String message = "Do you want to delete the gamelist view \"" + view.getName() + "\"?";
int value = JOptionPane.showConfirmDialog(MainWindow.getInstance().getMainPanel(), message, "Delete gamelist view", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); int value = JOptionPane.showConfirmDialog(MainWindow.getInstance()
.getMainPanel(), message, "Delete gamelist view", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
if (value == JOptionPane.YES_OPTION) if (value == JOptionPane.YES_OPTION)
{ {
uiModel.deleteGameView(view); uiModel.deleteGameView(view);