Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[7465] branches/cdomui/code/src/java/pcgen/gui
|
From: <cpm...@us...> - 2008-08-10 04:43:11
|
Revision: 7465
http://pcgen.svn.sourceforge.net/pcgen/?rev=7465&view=rev
Author: cpmeister
Date: 2008-08-10 04:43:18 +0000 (Sun, 10 Aug 2008)
Log Message:
-----------
UI update
Modified Paths:
--------------
branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java
branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java
branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java
branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form
branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java
Added Paths:
-----------
branches/cdomui/code/src/java/pcgen/gui/facade/StatFacade.java
branches/cdomui/code/src/java/pcgen/gui/generator/PurchaseModeGenerator.java
branches/cdomui/code/src/java/pcgen/gui/proto/dialog/
branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionBox.java
branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionDialog.java
Removed Paths:
-------------
branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.form
branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java
branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java
branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionDialog.java
Modified: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-10 03:55:37 UTC (rev 7464)
+++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-10 04:43:18 UTC (rev 7465)
@@ -20,6 +20,7 @@
*/
package pcgen.gui;
+import java.awt.event.ItemEvent;
import java.beans.PropertyChangeEvent;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -31,6 +32,7 @@
import java.awt.Insets;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.ItemListener;
import java.beans.PropertyChangeListener;
import java.util.List;
import javax.swing.AbstractAction;
@@ -50,14 +52,18 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.ListDataEvent;
import javax.swing.event.ListDataListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import javax.swing.table.TableColumnModel;
-import javax.swing.table.TableModel;
import pcgen.gui.facade.ClassFacade;
import pcgen.gui.facade.RaceFacade;
+import pcgen.gui.facade.StatFacade;
import pcgen.gui.generator.Generator;
-import pcgen.gui.tools.ComboSelectionBox;
+import pcgen.gui.generator.PurchaseModeGenerator;
+import pcgen.gui.util.ComboSelectionBox;
import pcgen.gui.util.DefaultGenericComboBoxModel;
import pcgen.gui.util.GenericComboBoxModel;
import pcgen.gui.util.event.DocumentChangeAdapter;
@@ -80,6 +86,7 @@
private final ComboSelectionBox raceSelectionBox;
private final TitledPanel statPanel;
private final ComboSelectionBox statSelectionBox;
+ private final JButton statRollButton;
private final StatTablePane statTablePane;
private final TitledPanel classPanel;
private final JCheckBox classGenerationCheckBox1;
@@ -108,6 +115,7 @@
this.raceSelectionBox = new ComboSelectionBox();
this.statPanel = new TitledPanel("Stats");
this.statSelectionBox = new ComboSelectionBox();
+ this.statRollButton = new JButton();
this.statTablePane = new StatTablePane();
this.classPanel = new TitledPanel("Classes");
this.classGenerationCheckBox1 = new JCheckBox();
@@ -268,11 +276,38 @@
{//Initialize statPanel
statPanel.setLayout(new GridBagLayout());
{//Initialize statSelectionBox
+ statSelectionBox.addItemListener(
+ new ItemListener()
+ {
+ public void itemStateChanged(ItemEvent e)
+ {
+ if (e.getStateChange() == ItemEvent.SELECTED)
+ {
+ @SuppressWarnings("unchecked")
+ Generator<Integer> statGenerator = (Generator<Integer>) e.getItem();
+ StatTableModel model = statTablePane.getModel();
+
+ if (statGenerator instanceof PurchaseModeGenerator)
+ {
+ model.setPurchaseMode(true);
+ }
+ else
+ {
+ model.setPurchaseMode(false);
+ }
+ }
+ }
+
+ });
}
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new Insets(2, 0, 2, 0);
statPanel.add(statSelectionBox, gridBagConstraints);
+ {//Initialize statRollButton
+ statRollButton.setAction(new RollStatsAction());
+ //statRollButton.addActionListener(new ActionListener);
+ }
{//Initialize statTablePane
}
@@ -285,8 +320,10 @@
classPanel.setLayout(new GridBagLayout());
gridBagConstraints = new GridBagConstraints();
+ gridBagConstraints.gridwidth = 2;
classPanel.add(new JLabel(), gridBagConstraints);
+ gridBagConstraints.gridwidth = 1;
gridBagConstraints.anchor = GridBagConstraints.WEST;
gridBagConstraints.weightx = 1.0;
gridBagConstraints.insets = new Insets(0, 4, 0, 0);
@@ -296,9 +333,11 @@
gridBagConstraints.weightx = 0.5;
classPanel.add(new JLabel("Level Generation"), gridBagConstraints);
SelectClassRowAction rowAction;
+ JLabel label;
{//Initialize classGenerationCheckBox1
- classGenerationCheckBox1.setText("1st Class:");
+ label = new JLabel("1st Class:");
rowAction = new SelectClassRowAction(classGenerationCheckBox1,
+ label,
classSelectionBox1,
levelComboBox1);
classGenerationCheckBox1.setAction(rowAction);
@@ -309,11 +348,13 @@
{//Initialize levelComboBox1
}
- initClassSelectionRow(classGenerationCheckBox1, classSelectionBox1,
+ initClassSelectionRow(classGenerationCheckBox1, label,
+ classSelectionBox1,
levelComboBox1);
{//Initialize classGenerationCheckBox2
- classGenerationCheckBox2.setText("2nd Class:");
+ label = new JLabel("2nd Class:");
SelectClassRowAction action = new SelectClassRowAction(classGenerationCheckBox2,
+ label,
classSelectionBox2,
levelComboBox2);
rowAction.setRowAction(action);
@@ -326,11 +367,13 @@
{//Initialize levelComboBox2
}
- initClassSelectionRow(classGenerationCheckBox2, classSelectionBox2,
+ initClassSelectionRow(classGenerationCheckBox2, label,
+ classSelectionBox2,
levelComboBox2);
{//Initialize classGenerationCheckBox3
- classGenerationCheckBox3.setText("3rd Class:");
+ label = new JLabel("3rd Class:");
SelectClassRowAction action = new SelectClassRowAction(classGenerationCheckBox3,
+ label,
classSelectionBox3,
levelComboBox3);
rowAction.setRowAction(action);
@@ -343,7 +386,8 @@
{//Initialize levelComboBox3
}
- initClassSelectionRow(classGenerationCheckBox3, classSelectionBox3,
+ initClassSelectionRow(classGenerationCheckBox3, label,
+ classSelectionBox3,
levelComboBox3);
}
gridBagConstraints = new GridBagConstraints();
@@ -359,16 +403,22 @@
gridBagConstraints.insets = new Insets(4, 4, 4, 4);
initControlButton(okAction, buttonSize, gridBagConstraints);
initControlButton(cancelAction, buttonSize, gridBagConstraints);
+
+ pack();
}
private void initClassSelectionRow(JCheckBox classGenerationBox,
+ JLabel label,
ComboSelectionBox classSelectionBox,
JComboBox levelComboBox)
{
GridBagConstraints gridBagConstraints = new GridBagConstraints();
- gridBagConstraints.anchor = GridBagConstraints.EAST;
+
classPanel.add(classGenerationBox, gridBagConstraints);
+ gridBagConstraints.anchor = GridBagConstraints.EAST;
+ classPanel.add(label, gridBagConstraints);
+
gridBagConstraints.fill = GridBagConstraints.BOTH;
gridBagConstraints.insets = new Insets(2, 0, 2, 4);
classPanel.add(classSelectionBox, gridBagConstraints);
@@ -500,6 +550,27 @@
}
+ private class RollStatsAction extends AbstractAction
+ {
+
+ public RollStatsAction()
+ {
+ super("Roll");
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ @SuppressWarnings("unchecked")
+ Generator<Integer> statGenerator = (Generator<Integer>) statSelectionBox.getSelectedItem();
+ StatTableModel model = statTablePane.getModel();
+ for ( int i = 0; i < model.getRowCount(); i++)
+ {
+ model.setValueAt(statGenerator.getRandom(), i, 1);
+ }
+ }
+
+ }
+
private static class ExclusiveComboBoxModel extends DefaultComboBoxModel
implements ListDataListener
{
@@ -587,16 +658,17 @@
{
private JCheckBox actionBox;
+ private JLabel label;
private ComboSelectionBox selectionBox;
private JComboBox comboBox;
private SelectClassRowAction rowAction;
- public SelectClassRowAction(JCheckBox actionBox,
+ public SelectClassRowAction(JCheckBox actionBox, JLabel label,
ComboSelectionBox selectionBox,
JComboBox comboBox)
{
- super(actionBox.getText());
this.actionBox = actionBox;
+ this.label = label;
this.selectionBox = selectionBox;
this.comboBox = comboBox;
}
@@ -610,6 +682,7 @@
public void setEnabled(boolean newValue)
{
super.setEnabled(newValue);
+ label.setEnabled(newValue);
newValue &= actionBox.isSelected();
selectionBox.setEnabled(newValue);
comboBox.setEnabled(newValue);
@@ -658,11 +731,102 @@
}
- private static class StatTablePane extends JScrollPane
+ private class StatTableModel extends AbstractTableModel
{
+ private final String[] columns = new String[]{"Base Score",
+ "Racial Adj",
+ "Total",
+ "Mod",
+ "Cost"
+ };
+ private List<StatFacade> stats;
+ private boolean purchaseMode;
+
+ public StatTableModel(CharacterCreationManager manager)
+ {
+ stats = manager.getStats();
+ }
+
+ @Override
+ public Class<?> getColumnClass(int columnIndex)
+ {
+ switch (columnIndex)
+ {
+ case 0:
+ return StatFacade.class;
+ default:
+ return Integer.class;
+ }
+ }
+
+ @Override
+ public String getColumnName(int column)
+ {
+ switch (column)
+ {
+ case 0:
+ return null;
+ default:
+ return columns[column - 1];
+ }
+ }
+
+ public boolean getPurchaseMode()
+ {
+ return purchaseMode;
+ }
+
+ public void setPurchaseMode(boolean purchaseMode)
+ {
+ //todo
+ this.purchaseMode = purchaseMode;
+ fireTableStructureChanged();
+ }
+
+ @Override
+ public boolean isCellEditable(int rowIndex, int columnIndex)
+ {
+ if (columnIndex == 1)
+ {
+ return true;
+ }
+ return false;
+ }
+
+ public int getRowCount()
+ {
+ return stats.size();
+ }
+
+ public int getColumnCount()
+ {
+ if (purchaseMode)
+ {
+ return 6;
+ }
+ return 5;
+ }
+
+ public Object getValueAt(int rowIndex, int columnIndex)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setValueAt(Object aValue, int rowIndex, int columnIndex)
+ {
+ super.setValueAt(aValue, rowIndex, columnIndex);
+ }
+
+ }
+
+ private static class StatTablePane extends JScrollPane implements TableModelListener
+ {
+
private final JTable rowTable;
private final JTable statTable;
+ private StatTableModel model;
public StatTablePane()
{
@@ -675,7 +839,6 @@
private void initComponents()
{
-
rowTable.setPreferredScrollableViewportSize(new Dimension(75, 0));
rowTable.setAutoCreateColumnsFromModel(false);
rowTable.setFocusable(false);
@@ -689,11 +852,8 @@
setViewportView(statTable);
}
- public void setTableModel(TableModel model)
+ private void createDefaultColumnsFromModel()
{
- rowTable.setModel(model);
- statTable.setModel(model);
-
TableColumnModel columnModel = statTable.getColumnModel();
while (columnModel.getColumnCount() > 0)
{
@@ -708,6 +868,27 @@
}
}
+ public StatTableModel getModel()
+ {
+ return model;
+ }
+
+ public void setTableModel(StatTableModel model)
+ {
+ if (this.model != null)
+ {
+ this.model.removeTableModelListener(this);
+ }
+ this.model = model;
+ if (this.model != null)
+ {
+ this.model.addTableModelListener(this);
+ }
+ rowTable.setModel(model);
+ statTable.setModel(model);
+ createDefaultColumnsFromModel();
+ }
+
public void setUpperLeft(Component upperLeft)
{
setCorner(JScrollPane.UPPER_LEFT_CORNER, upperLeft);
@@ -744,5 +925,13 @@
return super.getPreferredSize();
}
+ public void tableChanged(TableModelEvent e)
+ {
+ if (e.getFirstRow() == TableModelEvent.HEADER_ROW)
+ {
+ createDefaultColumnsFromModel();
+ }
+ }
+
}
}
Modified: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java 2008-08-10 03:55:37 UTC (rev 7464)
+++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java 2008-08-10 04:43:18 UTC (rev 7465)
@@ -25,6 +25,7 @@
import pcgen.cdom.enumeration.Gender;
import pcgen.gui.facade.ClassFacade;
import pcgen.gui.facade.RaceFacade;
+import pcgen.gui.facade.StatFacade;
import pcgen.gui.generator.Generator;
/**
@@ -68,6 +69,8 @@
public List<Generator<Integer>> getStatGenerators();
+ public List<StatFacade> getStats();
+
public List<Generator<Integer>> getClassLevelGenerators();
}
Deleted: branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.form
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.form 2008-08-10 03:55:37 UTC (rev 7464)
+++ branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.form 2008-08-10 04:43:18 UTC (rev 7465)
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
- <AuxValues>
- <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
- <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
- <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
- <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,66,0,0,1,-33"/>
- </AuxValues>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
- <SubComponents>
- <Container class="pcgen.gui.util.panes.FlippingSplitPane" name="flippingSplitPane1">
- <Properties>
- <Property name="dividerSize" type="int" value="7"/>
- <Property name="continuousLayout" type="boolean" value="true"/>
- <Property name="oneTouchExpandable" type="boolean" value="true"/>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
- <SubComponents>
- <Container class="pcgen.gui.util.panes.FlippingSplitPane" name="flippingSplitPane2">
- <Properties>
- <Property name="dividerSize" type="int" value="7"/>
- <Property name="orientation" type="int" value="0"/>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
- <JSplitPaneConstraints position="right"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
- <SubComponents>
- <Component class="pcgen.gui.util.panes.InfoPane" name="infoPane1">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
- <JSplitPaneConstraints position="top"/>
- </Constraint>
- </Constraints>
- </Component>
- </SubComponents>
- </Container>
- <Container class="javax.swing.JPanel" name="jPanel1">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
- <JSplitPaneConstraints position="left"/>
- </Constraint>
- </Constraints>
-
- <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
- </Container>
- </SubComponents>
- </Container>
- <Component class="javax.swing.JSeparator" name="jSeparator1">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="3" insetsLeft="0" insetsBottom="3" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JLabel" name="jLabel1">
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JButton" name="jButton1">
- <Properties>
- <Property name="text" type="java.lang.String" value="Cancel"/>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[90, 23]"/>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[90, 23]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JButton" name="jButton2">
- <Properties>
- <Property name="text" type="java.lang.String" value="<- Back"/>
- <Property name="enabled" type="boolean" value="false"/>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[90, 23]"/>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[90, 23]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JButton" name="jButton3">
- <Properties>
- <Property name="text" type="java.lang.String" value="Next ->"/>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[90, 23]"/>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[90, 23]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- <Component class="javax.swing.JButton" name="jButton4">
- <Properties>
- <Property name="text" type="java.lang.String" value="Finish"/>
- <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[90, 23]"/>
- </Property>
- <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[90, 23]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
- </SubComponents>
-</Form>
\ No newline at end of file
Deleted: branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java 2008-08-10 03:55:37 UTC (rev 7464)
+++ branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java 2008-08-10 04:43:18 UTC (rev 7465)
@@ -1,111 +0,0 @@
-/*
- * DeityPanel.java
- *
- * Created on June 27, 2008, 12:17 PM
- */
-
-package pcgen.gui.dialog;
-
-/**
- *
- * @author Connor Petty <cpm...@us...>
- */
-public class DeityPanel extends javax.swing.JPanel {
-
- /** Creates new form DeityPanel */
- public DeityPanel() {
- initComponents();
- }
-
- /** This method is called from within the constructor to
- * initialize the form.
- * WARNING: Do NOT modify this code. The content of this method is
- * always regenerated by the Form Editor.
- */
- // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
- private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
-
- flippingSplitPane1 = new pcgen.gui.util.panes.FlippingSplitPane();
- flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane();
- infoPane1 = new pcgen.gui.tools.InfoPane();
- jPanel1 = new javax.swing.JPanel();
- jSeparator1 = new javax.swing.JSeparator();
- jLabel1 = new javax.swing.JLabel();
- jButton1 = new javax.swing.JButton();
- jButton2 = new javax.swing.JButton();
- jButton3 = new javax.swing.JButton();
- jButton4 = new javax.swing.JButton();
-
- setLayout(new java.awt.GridBagLayout());
-
- flippingSplitPane1.setDividerSize(7);
- flippingSplitPane1.setContinuousLayout(true);
- flippingSplitPane1.setOneTouchExpandable(true);
-
- flippingSplitPane2.setDividerSize(7);
- flippingSplitPane2.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
- flippingSplitPane2.setTopComponent(infoPane1);
-
- flippingSplitPane1.setRightComponent(flippingSplitPane2);
- flippingSplitPane1.setLeftComponent(jPanel1);
-
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.weighty = 1.0;
- add(flippingSplitPane1, gridBagConstraints);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.insets = new java.awt.Insets(3, 0, 3, 0);
- add(jSeparator1, gridBagConstraints);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.weightx = 1.0;
- add(jLabel1, gridBagConstraints);
-
- jButton1.setText("Cancel");
- jButton1.setMinimumSize(new java.awt.Dimension(90, 23));
- jButton1.setPreferredSize(new java.awt.Dimension(90, 23));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
- add(jButton1, gridBagConstraints);
-
- jButton2.setText("<- Back");
- jButton2.setEnabled(false);
- jButton2.setMinimumSize(new java.awt.Dimension(90, 23));
- jButton2.setPreferredSize(new java.awt.Dimension(90, 23));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
- add(jButton2, gridBagConstraints);
-
- jButton3.setText("Next ->");
- jButton3.setMinimumSize(new java.awt.Dimension(90, 23));
- jButton3.setPreferredSize(new java.awt.Dimension(90, 23));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
- add(jButton3, gridBagConstraints);
-
- jButton4.setText("Finish");
- jButton4.setMinimumSize(new java.awt.Dimension(90, 23));
- jButton4.setPreferredSize(new java.awt.Dimension(90, 23));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
- add(jButton4, gridBagConstraints);
- }// </editor-fold>//GEN-END:initComponents
-
-
- // Variables declaration - do not modify//GEN-BEGIN:variables
- private pcgen.gui.util.panes.FlippingSplitPane flippingSplitPane1;
- private pcgen.gui.util.panes.FlippingSplitPane flippingSplitPane2;
- private pcgen.gui.tools.InfoPane infoPane1;
- private javax.swing.JButton jButton1;
- private javax.swing.JButton jButton2;
- private javax.swing.JButton jButton3;
- private javax.swing.JButton jButton4;
- private javax.swing.JLabel jLabel1;
- private javax.swing.JPanel jPanel1;
- private javax.swing.JSeparator jSeparator1;
- // End of variables declaration//GEN-END:variables
-
-}
Modified: branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java 2008-08-10 03:55:37 UTC (rev 7464)
+++ branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java 2008-08-10 04:43:18 UTC (rev 7465)
@@ -29,4 +29,6 @@
public boolean isAcceptableAlignment(int alignment);
+ public int getRacialAdj(StatFacade stat);
+
}
Added: branches/cdomui/code/src/java/pcgen/gui/facade/StatFacade.java
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/facade/StatFacade.java (rev 0)
+++ branches/cdomui/code/src/java/pcgen/gui/facade/StatFacade.java 2008-08-10 04:43:18 UTC (rev 7465)
@@ -0,0 +1,37 @@
+/*
+ * StatFacade.java
+ * Copyright 2008 Connor Petty <cpm...@us...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Created on Aug 9, 2008, 8:53:56 PM
+ */
+package pcgen.gui.facade;
+
+/**
+ *
+ * @author Connor Petty <cpm...@us...>
+ */
+public interface StatFacade
+{
+
+ public int getBaseScore();
+
+ public void setBaseScore(int score);
+
+ @Override
+ public String toString();
+
+}
Added: branches/cdomui/code/src/java/pcgen/gui/generator/PurchaseModeGenerator.java
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/generator/PurchaseModeGenerator.java (rev 0)
+++ branches/cdomui/code/src/java/pcgen/gui/generator/PurchaseModeGenerator.java 2008-08-10 04:43:18 UTC (rev 7465)
@@ -0,0 +1,48 @@
+/*
+ * PurchaseModeGenerator.java
+ * Copyright 2008 Connor Petty <cpm...@us...>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Created on Aug 9, 2008, 3:30:17 PM
+ */
+package pcgen.gui.generator;
+
+/**
+ *
+ * @author Connor Petty <cpm...@us...>
+ */
+public interface PurchaseModeGenerator extends Generator<Integer>
+{
+
+ public int getMinScore();
+
+ public int getMaxScore();
+
+ /**
+ *
+ * @param score
+ * @return
+ */
+ public int getScoreCost(int score);
+
+ /**
+ *
+ *
+ * @return the number of points that can be distrubuted
+ */
+ public Integer getRandom();
+
+}
Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form 2008-08-10 03:55:37 UTC (rev 7464)
+++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form 2008-08-10 04:43:18 UTC (rev 7465)
@@ -43,7 +43,7 @@
<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
- <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-62,0,0,2,5"/>
+ <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,2,33,0,0,2,63"/>
</AuxValues>
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
@@ -197,10 +197,10 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents>
- <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox1">
+ <Component class="pcgen.gui.util.ComboSelectionBox" name="comboSelectionBox1">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
- <BorderConstraints direction="Center"/>
+ <BorderConstraints direction="First"/>
</Constraint>
</Constraints>
</Component>
@@ -224,7 +224,7 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
- <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox5">
+ <Component class="pcgen.gui.util.ComboSelectionBox" name="comboSelectionBox5">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
@@ -234,7 +234,7 @@
<Container class="javax.swing.JScrollPane" name="jScrollPane1">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="100" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
@@ -243,11 +243,12 @@
<Component class="javax.swing.JTable" name="jTable1">
<Properties>
<Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
- <Table columnCount="4" rowCount="6">
+ <Table columnCount="5" rowCount="6">
<Column editable="true" title="Base Score" type="java.lang.Integer"/>
<Column editable="false" title="Racial Adj" type="java.lang.Integer"/>
<Column editable="false" title="Total" type="java.lang.Integer"/>
<Column editable="false" title="Mod" type="java.lang.Integer"/>
+ <Column editable="true" title="Cost" type="java.lang.Object"/>
</Table>
</Property>
</Properties>
@@ -274,21 +275,10 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
<SubComponents>
- <Component class="javax.swing.JCheckBox" name="jCheckBox1">
- <Properties>
- <Property name="selected" type="boolean" value="true"/>
- <Property name="text" type="java.lang.String" value="Generate Class Levels"/>
- </Properties>
- <Constraints>
- <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
- </Component>
<Component class="javax.swing.JLabel" name="jLabel6">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="2" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
@@ -314,15 +304,25 @@
</Component>
<Component class="javax.swing.JCheckBox" name="jCheckBox2">
<Properties>
+ <Property name="horizontalTextPosition" type="int" value="4"/>
+ </Properties>
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="javax.swing.JLabel" name="jLabel1">
+ <Properties>
<Property name="text" type="java.lang.String" value="1st Class:"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
- <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox2">
+ <Component class="pcgen.gui.util.ComboSelectionBox" name="comboSelectionBox2">
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/>
@@ -346,9 +346,9 @@
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JLabel" name="jLabel2">
+ <Component class="javax.swing.JCheckBox" name="jCheckBox3">
<Properties>
- <Property name="text" type="java.lang.String" value="2nd Class:"/>
+ <Property name="horizontalTextPosition" type="int" value="4"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -356,12 +356,19 @@
</Constraint>
</Constraints>
</Component>
- <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox3">
+ <Component class="javax.swing.JLabel" name="jLabel2">
<Properties>
- <Property name="enabled" type="boolean" value="false"/>
+ <Property name="text" type="java.lang.String" value="2nd Class:"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="pcgen.gui.util.ComboSelectionBox" name="comboSelectionBox3">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
@@ -384,9 +391,9 @@
</Constraint>
</Constraints>
</Component>
- <Component class="javax.swing.JLabel" name="jLabel3">
+ <Component class="javax.swing.JCheckBox" name="jCheckBox4">
<Properties>
- <Property name="text" type="java.lang.String" value="3rd Class:"/>
+ <Property name="horizontalTextPosition" type="int" value="4"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
@@ -394,12 +401,19 @@
</Constraint>
</Constraints>
</Component>
- <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox4">
+ <Component class="javax.swing.JLabel" name="jLabel3">
<Properties>
- <Property name="enabled" type="boolean" value="false"/>
+ <Property name="text" type="java.lang.String" value="3rd Class:"/>
</Properties>
<Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
+ <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="13" weightX="0.0" weightY="0.0"/>
+ </Constraint>
+ </Constraints>
+ </Component>
+ <Component class="pcgen.gui.util.ComboSelectionBox" name="comboSelectionBox4">
+ <Constraints>
+ <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
<GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/>
</Constraint>
</Constraints>
Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java 2008-08-10 03:55:37 UTC (rev 7464)
+++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java 2008-08-10 04:43:18 UTC (rev 7465)
@@ -7,8 +7,6 @@
package pcgen.gui.proto;
import java.awt.Dimension;
-import javax.swing.JButton;
-import javax.swing.JScrollPane;
/**
*
@@ -52,24 +50,26 @@
jPanel4 = new javax.swing.JPanel();
jComboBox4 = new javax.swing.JComboBox();
jPanel2 = new javax.swing.JPanel();
- comboSelectionBox1 = new pcgen.gui.tools.ComboSelectionBox();
+ comboSelectionBox1 = new pcgen.gui.util.ComboSelectionBox();
jPanel5 = new javax.swing.JPanel();
- comboSelectionBox5 = new pcgen.gui.tools.ComboSelectionBox();
+ comboSelectionBox5 = new pcgen.gui.util.ComboSelectionBox();
jScrollPane1 = new javax.swing.JScrollPane();
jTable1 = new javax.swing.JTable();
jPanel6 = new javax.swing.JPanel();
- jCheckBox1 = new javax.swing.JCheckBox();
jLabel6 = new javax.swing.JLabel();
jLabel7 = new javax.swing.JLabel();
jLabel5 = new javax.swing.JLabel();
jCheckBox2 = new javax.swing.JCheckBox();
- comboSelectionBox2 = new pcgen.gui.tools.ComboSelectionBox();
+ jLabel1 = new javax.swing.JLabel();
+ comboSelectionBox2 = new pcgen.gui.util.ComboSelectionBox();
jComboBox2 = new javax.swing.JComboBox();
+ jCheckBox3 = new javax.swing.JCheckBox();
jLabel2 = new javax.swing.JLabel();
- comboSelectionBox3 = new pcgen.gui.tools.ComboSelectionBox();
+ comboSelectionBox3 = new pcgen.gui.util.ComboSelectionBox();
jComboBox6 = new javax.swing.JComboBox();
+ jCheckBox4 = new javax.swing.JCheckBox();
jLabel3 = new javax.swing.JLabel();
- comboSelectionBox4 = new pcgen.gui.tools.ComboSelectionBox();
+ comboSelectionBox4 = new pcgen.gui.util.ComboSelectionBox();
jComboBox7 = new javax.swing.JComboBox();
jLabel8 = new javax.swing.JLabel();
okButton = new javax.swing.JButton();
@@ -170,7 +170,7 @@
jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Race", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12)));
jPanel2.setLayout(new java.awt.BorderLayout());
- jPanel2.add(comboSelectionBox1, java.awt.BorderLayout.CENTER);
+ jPanel2.add(comboSelectionBox1, java.awt.BorderLayout.PAGE_START);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
@@ -189,22 +189,22 @@
jTable1.setModel(new javax.swing.table.DefaultTableModel(
new Object [][] {
- {null, null, null, null},
- {null, null, null, null},
- {null, null, null, null},
- {null, null, null, null},
- {null, null, null, null},
- {null, null, null, null}
+ {null, null, null, null, null},
+ {null, null, null, null, null},
+ {null, null, null, null, null},
+ {null, null, null, null, null},
+ {null, null, null, null, null},
+ {null, null, null, null, null}
},
new String [] {
- "Base Score", "Racial Adj", "Total", "Mod"
+ "Base Score", "Racial Adj", "Total", "Mod", "Cost"
}
) {
Class[] types = new Class [] {
- java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class
+ java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Object.class
};
boolean[] canEdit = new boolean [] {
- true, false, false, false
+ true, false, false, false, true
};
public Class getColumnClass(int columnIndex) {
@@ -219,6 +219,7 @@
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
+ gridBagConstraints.ipady = 100;
gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 0);
jPanel5.add(jScrollPane1, gridBagConstraints);
@@ -230,14 +231,9 @@
jPanel6.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Classes", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12)));
jPanel6.setLayout(new java.awt.GridBagLayout());
-
- jCheckBox1.setSelected(true);
- jCheckBox1.setText("Generate Class Levels");
gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
- jPanel6.add(jCheckBox1, gridBagConstraints);
- jPanel6.add(jLabel6, new java.awt.GridBagConstraints());
+ gridBagConstraints.gridwidth = 2;
+ jPanel6.add(jLabel6, gridBagConstraints);
jLabel7.setText("Class Generation");
gridBagConstraints = new java.awt.GridBagConstraints();
@@ -254,9 +250,16 @@
gridBagConstraints.insets = new java.awt.Insets(0, 4, 0, 0);
jPanel6.add(jLabel5, gridBagConstraints);
- jCheckBox2.setText("1st Class:");
- jPanel6.add(jCheckBox2, new java.awt.GridBagConstraints());
+ jCheckBox2.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
+ jPanel6.add(jCheckBox2, gridBagConstraints);
+
+ jLabel1.setText("1st Class:");
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
+ jPanel6.add(jLabel1, gridBagConstraints);
+ gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 4);
jPanel6.add(comboSelectionBox2, gridBagConstraints);
@@ -268,12 +271,15 @@
gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 2);
jPanel6.add(jComboBox2, gridBagConstraints);
+ jCheckBox3.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
+ jPanel6.add(jCheckBox3, gridBagConstraints);
+
jLabel2.setText("2nd Class:");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
jPanel6.add(jLabel2, gridBagConstraints);
-
- comboSelectionBox3.setEnabled(false);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 4);
@@ -287,12 +293,15 @@
gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 2);
jPanel6.add(jComboBox6, gridBagConstraints);
+ jCheckBox4.setHorizontalTextPosition(javax.swing.SwingConstants.RIGHT);
+ gridBagConstraints = new java.awt.GridBagConstraints();
+ gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
+ jPanel6.add(jCheckBox4, gridBagConstraints);
+
jLabel3.setText("3rd Class:");
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
jPanel6.add(jLabel3, gridBagConstraints);
-
- comboSelectionBox4.setEnabled(false);
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 4);
@@ -379,21 +388,23 @@
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton cancelButton;
- private pcgen.gui.tools.ComboSelectionBox comboSelectionBox1;
- private pcgen.gui.tools.ComboSelectionBox comboSelectionBox2;
- private pcgen.gui.tools.ComboSelectionBox comboSelectionBox3;
- private pcgen.gui.tools.ComboSelectionBox comboSelectionBox4;
- private pcgen.gui.tools.ComboSelectionBox comboSelectionBox5;
+ private pcgen.gui.util.ComboSelectionBox comboSelectionBox1;
+ private pcgen.gui.util.ComboSelectionBox comboSelectionBox2;
+ private pcgen.gui.util.ComboSelectionBox comboSelectionBox3;
+ private pcgen.gui.util.ComboSelectionBox comboSelectionBox4;
+ private pcgen.gui.util.ComboSelectionBox comboSelectionBox5;
private javax.swing.JButton jButton2;
private javax.swing.JButton jButton3;
- private javax.swing.JCheckBox jCheckBox1;
private javax.swing.JCheckBox jCheckBox2;
+ private javax.swing.JCheckBox jCheckBox3;
+ private javax.swing.JCheckBox jCheckBox4;
private javax.swing.JComboBox jComboBox1;
private javax.swing.JComboBox jComboBox2;
private javax.swing.JComboBox jComboBox3;
private javax.swing.JComboBox jComboBox4;
private javax.swing.JComboBox jComboBox6;
private javax.swing.JComboBox jComboBox7;
+ private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
Deleted: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java
===================================================================
--- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-08-10 03:55:37 UTC (rev 7464)
+++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-08-10 04:43:18 UTC (rev 7465)
@@ -1,154 +0,0 @@
-/*
- * ComboSelectionBox.java
- * Copyright 2008 Connor Petty <cpm...@us...>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- * Created on Jul 22, 2008, 4:58:45 PM
- */
-package pcgen.gui.tools;
-
-import java.awt.BorderLayout;
-import java.awt.ItemSelectable;
-import java.awt.event.ActionEvent;
-import java.awt.event.ItemListener;
-import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
-import javax.swing.ComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
-/**
- *
- * @author Connor Petty <cpm...@us...>
- */
-public class ComboSelectionBox extends JPanel implements ItemSelectable
-{
-
- private static final long serialVersionUID = 4240590146578106112L;
- private ComboSelectionDialog dialog;
- private ComboBoxModel model;
- private JComboBox comboBox;
- private JButton button;
-
- public...
[truncated message content] |