jashton/dnd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored choosing race and class into a single class. discovered issue when only one image exists for a race or class, the last index for the randomly chosen snapshot image is set to 0 and will forever be stuck in a while loop. Need to implement some kind of safeguards.

Browse Source
This commit is contained in:
Josh Ashton
2022-11-15 22:43:20 -07:00
parent d8c2617680
commit 69f644b676
21 changed files with 255 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dndBuilder/src/GUI/Panels/SubPanels/InfoPanel.java
+27 -16
View File
@@ -17,22 +17,16 @@ public class InfoPanel extends JPanel implements AppTheme {
private String[] holderDescriptions;
private JLabel[][] portraits;
private String[] categoryHolder;
private static String OS = null;
private static int numInfoPanelObjects = 0;
private int lastIndex;
public InfoPanel(String[] categoryHolder, String[] holderDescriptions) {
super();
numInfoPanelObjects++;
this.categoryHolder = categoryHolder;
this.holderDescriptions = holderDescriptions;
if (OS == null) {
OS = System.getProperty("os.name");
}
panelSetup();
createDescriptions();
@@ -46,9 +40,12 @@ public class InfoPanel extends JPanel implements AppTheme {
removeAll();
panelSetup();
add(descriptions[0]);
panelSetup();
add(descriptions[holderIndex]);
System.out.println();
add(portraits[holderIndex][getNextPortrait(holderIndex)]);
repaint();
@@ -56,17 +53,18 @@ public class InfoPanel extends JPanel implements AppTheme {
}
private int getNextPortrait(int holderIndex) {
Random ran = new Random();
int bound = portraits[holderIndex].length;
int newIndex = ran.nextInt(bound);
while(newIndex == lastIndex) {
/* while(newIndex == lastIndex) {
newIndex = ran.nextInt(bound);
}
}*/
lastIndex = newIndex;
@@ -116,6 +114,18 @@ public class InfoPanel extends JPanel implements AppTheme {
private void createPortraits() {
String category = "";
if(numInfoPanelObjects == 1) {
category = "Races";
} else if (numInfoPanelObjects == 2) {
category = "Classes";
}
portraits = new JLabel[categoryHolder.length][];
for (int i = 0; i < categoryHolder.length; i++) {
@@ -124,15 +134,15 @@ public class InfoPanel extends JPanel implements AppTheme {
if(OS.startsWith("Windows")) {
imagesDir = new File("dndBuilder\\src\\Resources\\Img\\" + categoryHolder[i] + "\\");
imagesDir = new File("dndBuilder\\src\\Resources\\Img\\" + category + "\\" + categoryHolder[i].toLowerCase() + "\\");
} else if (OS.startsWith("Mac")) {
imagesDir = new File("dndBuilder/src/Resources/Img/" + categoryHolder[i] + "/");
imagesDir = new File("dndBuilder/src/Resources/Img/" + category + "/" + categoryHolder[i].toLowerCase() + "/");
} else if (OS.startsWith("Linux")) {
imagesDir = new File("dndBuilder/src/Resources/Img/" + categoryHolder[i] + "/");
imagesDir = new File("dndBuilder/src/Resources/Img/" + category + "/" + categoryHolder[i].toLowerCase() + "/");
} else {
@@ -146,7 +156,6 @@ public class InfoPanel extends JPanel implements AppTheme {
int index = 0;
for (File file : dir) {
portraits[i][index] = image(file);
portraits[i][index].setOpaque(true);
portraits[i][index].setBackground(lightBrown);
@@ -156,8 +165,10 @@ public class InfoPanel extends JPanel implements AppTheme {
}
}
}
private JLabel image(File file) {