فهرست منبع

Factor skill level up into a DialogBuilder class, renaming it.

(cherry picked from commit c53c623c3d3ead52f9efeebac0e0b8d43e5c1a72)
Sam Jaffe 8 سال پیش
والد
کامیت
3ab3fd807f

+ 28 - 0
src/org/leumasjaffe/charsheet/view/builders/DialogBuilder.java

@@ -0,0 +1,28 @@
+package org.leumasjaffe.charsheet.view.builders;
+
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+
+import org.leumasjaffe.charsheet.model.DDCharacter;
+import org.leumasjaffe.charsheet.model.DDCharacterClass;
+import org.leumasjaffe.charsheet.view.skills.SkillLevelUpDialog;
+
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class DialogBuilder {
+	private void createDialogue(final String title, final int x, final int y, final JPanel panel) {
+		final JDialog dialog = new JDialog();
+		dialog.setTitle(title);
+		dialog.setModalityType(JDialog.DEFAULT_MODALITY_TYPE);
+		dialog.setSize(x, y);
+
+		dialog.setContentPane(panel);
+		dialog.setVisible(true);
+		dialog.pack();
+	}
+	
+	public void createSkillDialog(DDCharacter chara, DDCharacterClass dclass) {
+		createDialogue("Level Up - Skill Allocation", 510, 600, new SkillLevelUpDialog(chara, dclass));
+	}
+}

+ 2 - 10
src/org/leumasjaffe/charsheet/view/dev/DeveloperMenu.java

@@ -2,14 +2,13 @@ package org.leumasjaffe.charsheet.view.dev;
 
 import java.util.stream.Collectors;
 
-import javax.swing.JDialog;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 
 import org.leumasjaffe.charsheet.model.DDCharacter;
 import org.leumasjaffe.charsheet.model.DDCharacterClass;
-import org.leumasjaffe.charsheet.view.skills.SkillLevelUpDialogue;
+import org.leumasjaffe.charsheet.view.builders.DialogBuilder;
 
 public class DeveloperMenu extends JMenu {
 	/**
@@ -26,14 +25,7 @@ public class DeveloperMenu extends JMenu {
 			String clazz = (String) JOptionPane.showInputDialog(this.getParent(), "Which Class is Leveling Up?", "Level Up - Skill", 
 					JOptionPane.QUESTION_MESSAGE, null, choices, choices[0]);
 			if (clazz != null) {
-				final JDialog dialog = new JDialog();
-				dialog.setTitle("Level Up - Skill Allocation");
-				dialog.setModal(true);
-				dialog.setSize(510, 600);
-
-				dialog.setContentPane(new SkillLevelUpDialogue(model[0], model[0].getClasses().stream().filter(c -> c.getName().equals(clazz)).findFirst().get()));
-				dialog.setVisible(true);
-				dialog.pack();
+				DialogBuilder.createSkillDialog(model[0], model[0].getClasses().stream().filter(c -> c.getName().equals(clazz)).findFirst().get());
 			}
 		});
 		add(mntmLevelUp);

+ 2 - 2
src/org/leumasjaffe/charsheet/view/skills/SkillLevelUpDialogue.java

@@ -27,14 +27,14 @@ import javax.swing.JDialog;
 import java.awt.Dimension;
 
 @FieldDefaults(level=AccessLevel.PRIVATE, makeFinal=true)
-public class SkillLevelUpDialogue extends JPanel {
+public class SkillLevelUpDialog extends JPanel {
 
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
 	
-	public SkillLevelUpDialogue(final DDCharacter chara, final DDCharacterClass cclass) {
+	public SkillLevelUpDialog(final DDCharacter chara, final DDCharacterClass cclass) {
 		final IntValue pointsAvaliable = new IntValue(Math.max(1, cclass.getSkillPoints() + Ability.modifier(chara.getAbilities().getBase().getInt().value())));
 		
 		GridBagLayout gridBagLayout = new GridBagLayout();