From: <cpm...@us...> - 2008-07-17 22:08:22
|
Revision: 7187 http://pcgen.svn.sourceforge.net/pcgen/?rev=7187&view=rev Author: cpmeister Date: 2008-07-17 22:08:22 +0000 (Thu, 17 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewUtil.java Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java 2008-07-17 20:18:09 UTC (rev 7186) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java 2008-07-17 22:08:22 UTC (rev 7187) @@ -47,7 +47,8 @@ { private final AbilityChooserTab abilityTab; - private Map<String, Hashtable<?, ?>> states = null; + private Map<String, Hashtable<Object, Object>> tabStates = null; + private String selectedTitle; public AbilitiesInfoTab() { @@ -63,10 +64,11 @@ public void stateChanged(ChangeEvent e) { + abilityTab.storeState(tabStates.get(selectedTitle)); if (getSelectedIndex() != -1) { - String title = getTitleAt(getSelectedIndex()); - abilityTab.restoreState(states.get(title)); + selectedTitle = getTitleAt(getSelectedIndex()); + abilityTab.restoreState(tabStates.get(selectedTitle)); } } @@ -75,7 +77,7 @@ public Hashtable<Object, Object> createState(final CharacterFacade character) { - HashMap<String, Hashtable<?, ?>> tabs = new HashMap<String, Hashtable<?, ?>>(); + HashMap<String, Hashtable<Object, Object>> tabs = new HashMap<String, Hashtable<Object, Object>>(); List<String> titles = new ArrayList<String>(); @SuppressWarnings("unchecked") final ListMap<String, AbilityCatagoryFacade, GenericListModel<AbilityCatagoryFacade>> catagoryListMap = @@ -147,13 +149,13 @@ Hashtable<Object, Object> state = new Hashtable<Object, Object>(); state.put("Titles", titles); state.put("Tabs", tabs); - state.put("SelectedIndex", Integer.valueOf(0)); + state.put("SelectedTitle", titles.get(0)); return state; } public void storeState(Hashtable<Object, Object> state) { - state.put("SelectedIndex", Integer.valueOf(0)); + state.put("SelectedTitle", selectedTitle); } @SuppressWarnings("unchecked") @@ -165,8 +167,9 @@ { addTab(title, abilityTab); } - states = (Map<String, Hashtable<?, ?>>) state.get("Tabs"); - setSelectedIndex((Integer) state.get("SelectedIndex")); + tabStates = (Map<String, Hashtable<Object, Object>>) state.get("Tabs"); + selectedTitle = (String) state.get("SelectedTitle"); + setSelectedIndex(indexOfTab(selectedTitle)); } } Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-17 20:18:09 UTC (rev 7186) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-17 22:08:22 UTC (rev 7187) @@ -21,23 +21,115 @@ package pcgen.gui.tabs; import java.awt.Component; +import java.util.Hashtable; +import java.util.List; import javax.swing.AbstractCellEditor; import javax.swing.JSpinner; import javax.swing.JTable; import javax.swing.SpinnerNumberModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; +import pcgen.gui.facade.CharacterFacade; +import pcgen.gui.facade.ClassFacade; +import pcgen.gui.facade.SkillFacade; +import pcgen.gui.tools.FilterableTreeViewModel; +import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.treeview.DataView; +import pcgen.gui.util.treeview.DataViewColumn; +import pcgen.gui.util.treeview.TreeView; /** * * @author Connor Petty <cpm...@us...> */ -public class SkillInfoTab +public class SkillInfoTab extends AbstractChooserTab implements CharacterInfoTab { - private static class TableCellSpinnerEditor extends AbstractCellEditor implements TableCellEditor + public SkillInfoTab() { + initComponents(); + } + private void initComponents() + { + + } + + public Hashtable<Object, Object> createState(CharacterFacade character) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void storeState(Hashtable<Object, Object> state) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void restoreState(Hashtable<?, ?> state) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + private static final class SkillTreeViewModel implements FilterableTreeViewModel<SkillFacade> + { + + private CharacterFacade character; + + public SkillTreeViewModel(CharacterFacade character) + { + this.character = character; + } + + public void setClass(ClassFacade c) + { + + } + + public Class<SkillFacade> getFilterClass() + { + return SkillFacade.class; + } + + public List<? extends TreeView<SkillFacade>> getTreeViews() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public int getDefaultTreeViewIndex() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public DataView<SkillFacade> getDataView() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public GenericListModel<SkillFacade> getDataModel() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + private class SkillDataView implements DataView<SkillFacade> + { + + public List<?> getData(SkillFacade obj) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public List<? extends DataViewColumn> getDataColumns() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + } + } + + private static class TableCellSpinnerEditor extends AbstractCellEditor + implements TableCellEditor + { + private JSpinner spinner; public TableCellSpinnerEditor() Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java 2008-07-17 20:18:09 UTC (rev 7186) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java 2008-07-17 22:08:22 UTC (rev 7187) @@ -141,51 +141,48 @@ DataView<?> dataView) { @SuppressWarnings("unchecked") - ListMap<Visibility, DataViewColumn, List<DataViewColumn>> listMap = + ListMap<Visibility, TableColumn, List<TableColumn>> listMap = CollectionMaps.createListMap(HashMap.class, ArrayList.class); + int index = 1; for ( DataViewColumn column : dataView.getDataColumns()) { - listMap.add(column.getVisibility(), column); + TableColumn tableColumn = new TableColumn(index++); + tableColumn.setHeaderValue(column.getName()); + listMap.add(column.getVisibility(), tableColumn); } - List<DataViewColumn> columns = listMap.get(Visibility.ALWAYS_VISIBLE); + List<TableColumn> columns = listMap.get(Visibility.ALWAYS_VISIBLE); if (columns == null) { columns = Collections.emptyList(); } DynamicTableColumnModel model = new DefaultDynamicTableColumnModel(columns.size() + 1); - TableColumn tableColumn = new TableColumn(); - tableColumn.setHeaderValue(startingView.getViewName()); - model.addColumn(tableColumn); + TableColumn viewColumn = new TableColumn(); + viewColumn.setHeaderValue(startingView.getViewName()); + model.addColumn(viewColumn); - int index = 1; - for ( DataViewColumn column : columns) + for ( TableColumn column : columns) { - tableColumn = new TableColumn(index++); - tableColumn.setHeaderValue(column.getName()); - model.addColumn(tableColumn); + model.addColumn(column); } columns = listMap.get(Visibility.INITIALLY_VISIBLE); if (columns != null) { - for ( DataViewColumn column : columns) + for ( TableColumn column : columns) { - tableColumn = new TableColumn(index++); - tableColumn.setHeaderValue(column.getName()); - model.addColumn(tableColumn); - model.setVisible(tableColumn, true); + model.addColumn(column); + model.setVisible(column, true); } } + columns = listMap.get(Visibility.INITIALLY_INVISIBLE); if (columns != null) { - for ( DataViewColumn column : columns) + for ( TableColumn column : columns) { - tableColumn = new TableColumn(index++); - tableColumn.setHeaderValue(column.getName()); - model.addColumn(tableColumn); + model.addColumn(column); } } return model; Deleted: branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewUtil.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewUtil.java 2008-07-17 20:18:09 UTC (rev 7186) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewUtil.java 2008-07-17 22:08:22 UTC (rev 7187) @@ -1,76 +0,0 @@ -/* - * TreeViewUtil.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 7, 2008, 6:17:31 PM - */ -package pcgen.gui.util.treeview; - -import java.util.AbstractList; -import java.util.List; -import pcgen.gui.util.treetable.DefaultSortableTreeTableNode; -import pcgen.gui.util.treetable.SortableTreeTableNode; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public final class TreeViewUtil -{ - - private TreeViewUtil() - { - } - - public static <T> SortableTreeTableNode createSortableTreeTableNode(T obj, - DataView<T> view) - { - return new DefaultSortableTreeTableNode(new DataList(obj, view)); - } - - private static class DataList extends AbstractList<Object> - { - - private Object obj; - private List<?> data; - - public <T> DataList(T obj, DataView<T> view) - { - this.obj = obj; - this.data = view.getData(obj); - } - - @Override - public Object get(int index) - { - switch (index) - { - case 0: - return obj; - default: - return data.get(index - 1); - } - } - - @Override - public int size() - { - return data.size() + 1; - } - - } -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-18 03:11:02
|
Revision: 7188 http://pcgen.svn.sourceforge.net/pcgen/?rev=7188&view=rev Author: cpmeister Date: 2008-07-18 03:11:08 +0000 (Fri, 18 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModel.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModelWrapper.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/util/DefaultGenericListModel.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/util/GenericListModel.java Modified: branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-07-17 22:08:22 UTC (rev 7187) +++ branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -24,7 +24,7 @@ import pcgen.gui.facade.AbilityFacade; import pcgen.gui.facade.CharacterFacade; import pcgen.gui.filter.NamedFilter; -import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.DefaultGenericListModel; /** * @@ -37,17 +37,17 @@ { } - public static <T> GenericListModel<NamedFilter<? super T>> getRegisteredFilters(Class<T> c) + public static <T> DefaultGenericListModel<NamedFilter<? super T>> getRegisteredFilters(Class<T> c) { return null; } - public static GenericListModel<AbilityCatagoryFacade> getRegisteredAbilityCatagories(CharacterFacade character) + public static DefaultGenericListModel<AbilityCatagoryFacade> getRegisteredAbilityCatagories(CharacterFacade character) { return null; } - public static GenericListModel<AbilityFacade> getRegisteredAbilities(CharacterFacade character, + public static DefaultGenericListModel<AbilityFacade> getRegisteredAbilities(CharacterFacade character, AbilityCatagoryFacade catagory) { return null; Modified: branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java 2008-07-17 22:08:22 UTC (rev 7187) +++ branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -20,7 +20,7 @@ */ package pcgen.gui.facade; -import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.DefaultGenericListModel; /** * @@ -41,12 +41,14 @@ /** * Note: This method should never return null. If the character does not possess * any abilities in the parameter catagory, this method should create a new - * GenericListModel for that catagory and keep a reference to it for future use. + * DefaultGenericListModel for that catagory and keep a reference to it for future use. * @param catagory * @return a List of Abilities the character posseses in the specified catagory */ - public GenericListModel<AbilityFacade> getAbilities(AbilityCatagoryFacade catagory); + public DefaultGenericListModel<AbilityFacade> getAbilities(AbilityCatagoryFacade catagory); + public DefaultGenericListModel<ClassFacade> getClasses(); + public ClassFacade getSelectedClass(int level); public void addCharacterLevels(ClassFacade[] classes); Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java 2008-07-17 22:08:22 UTC (rev 7187) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -42,7 +42,7 @@ import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import pcgen.gui.PCGenUIManager; -import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.DefaultGenericListModel; import pcgen.gui.util.SimpleTextIcon; import pcgen.util.PropertyFactory; @@ -153,7 +153,7 @@ PCGenUIManager.getRegisteredFilters(this.filterClass).removeListDataListener(listListener); } this.filterClass = filterClass; - final GenericListModel<NamedFilter<? super T>> filters = PCGenUIManager.getRegisteredFilters(filterClass); + final DefaultGenericListModel<NamedFilter<? super T>> filters = PCGenUIManager.getRegisteredFilters(filterClass); ListDataListener listener = new ListDataListener() { Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java 2008-07-17 22:08:22 UTC (rev 7187) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -33,7 +33,7 @@ import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.CharacterFacade; import pcgen.gui.tabs.ability.AbilityChooserTab; -import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.DefaultGenericListModel; import pcgen.gui.util.event.AbstractGenericListDataListener; import pcgen.gui.util.event.GenericListDataEvent; import pcgen.util.CollectionMaps; @@ -80,11 +80,11 @@ HashMap<String, Hashtable<Object, Object>> tabs = new HashMap<String, Hashtable<Object, Object>>(); List<String> titles = new ArrayList<String>(); @SuppressWarnings("unchecked") - final ListMap<String, AbilityCatagoryFacade, GenericListModel<AbilityCatagoryFacade>> catagoryListMap = + final ListMap<String, AbilityCatagoryFacade, DefaultGenericListModel<AbilityCatagoryFacade>> catagoryListMap = CollectionMaps.createListMap(HashMap.class, - GenericListModel.class); + DefaultGenericListModel.class); - final GenericListModel<AbilityCatagoryFacade> catagories = + final DefaultGenericListModel<AbilityCatagoryFacade> catagories = PCGenUIManager.getRegisteredAbilityCatagories(character); for (AbilityCatagoryFacade catagory : catagories) Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-17 22:08:22 UTC (rev 7187) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -27,13 +27,14 @@ import javax.swing.JSpinner; import javax.swing.JTable; import javax.swing.SpinnerNumberModel; +import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import pcgen.gui.facade.CharacterFacade; import pcgen.gui.facade.ClassFacade; import pcgen.gui.facade.SkillFacade; import pcgen.gui.tools.FilterableTreeViewModel; -import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.DefaultGenericListModel; import pcgen.gui.util.treeview.DataView; import pcgen.gui.util.treeview.DataViewColumn; import pcgen.gui.util.treeview.TreeView; @@ -105,7 +106,7 @@ throw new UnsupportedOperationException("Not supported yet."); } - public GenericListModel<SkillFacade> getDataModel() + public DefaultGenericListModel<SkillFacade> getDataModel() { throw new UnsupportedOperationException("Not supported yet."); } @@ -126,6 +127,28 @@ } } + private static class SkillPointTableModel extends DefaultTableModel + { + + private static final Object[] columns = {"Level", + "Class", + "Points" + }; + private CharacterFacade character; + + public SkillPointTableModel(CharacterFacade character) + { + super(columns, 0); + this.character = character; + int characterLevel = character.getCharacterLevel(); + for (int x = 0; x < characterLevel; x++) + { + + } + } + + } + private static class TableCellSpinnerEditor extends AbstractCellEditor implements TableCellEditor { Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-17 22:08:22 UTC (rev 7187) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -54,7 +54,7 @@ import pcgen.gui.tabs.AbstractChooserTab; import pcgen.gui.tools.FilterableTreeViewModel; import pcgen.gui.tools.FilteredTreeViewPanel; -import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.DefaultGenericListModel; import pcgen.gui.util.event.AbstractGenericListDataListener; import pcgen.gui.util.event.GenericListDataEvent; import pcgen.gui.util.event.GenericListDataListener; @@ -235,16 +235,16 @@ private final List<? extends TreeView<AbilityFacade>> treeViews = null; private final Map<AbilityFacade, AbilityCatagoryFacade> catagoryMap; - private final Map<GenericListModel<AbilityFacade>, GenericListDataListener> listenerMap; - private final GenericListModel<AbilityFacade> model; + private final Map<DefaultGenericListModel<AbilityFacade>, GenericListDataListener> listenerMap; + private final DefaultGenericListModel<AbilityFacade> model; private final CharacterFacade character; public SelectedAbilityTreeViewModel(CharacterFacade character, - GenericListModel<AbilityCatagoryFacade> catagories) + DefaultGenericListModel<AbilityCatagoryFacade> catagories) { this.catagoryMap = new HashMap<AbilityFacade, AbilityCatagoryFacade>(); - this.listenerMap = new HashMap<GenericListModel<AbilityFacade>, GenericListDataListener>(); - this.model = new GenericListModel<AbilityFacade>(); + this.listenerMap = new HashMap<DefaultGenericListModel<AbilityFacade>, GenericListDataListener>(); + this.model = new DefaultGenericListModel<AbilityFacade>(); this.character = character; addData(catagories); @@ -255,7 +255,7 @@ AbilityCatagoryFacade[] catagoryArray = catagories.toArray(new AbilityCatagoryFacade[0]); for (final AbilityCatagoryFacade catagory : catagoryArray) { - final GenericListModel<AbilityFacade> abilityList = character.getAbilities(catagory); + final DefaultGenericListModel<AbilityFacade> abilityList = character.getAbilities(catagory); AbilityFacade[] abilities = abilityList.toArray(new AbilityFacade[0]); for (AbilityFacade ability : abilities) { @@ -287,7 +287,7 @@ { for (AbilityCatagoryFacade catagory : catagories) { - GenericListModel<AbilityFacade> abilityList = character.getAbilities(catagory); + DefaultGenericListModel<AbilityFacade> abilityList = character.getAbilities(catagory); abilityList.removeGenericListDataListener(listenerMap.get(abilityList)); listenerMap.remove(abilityList); @@ -299,7 +299,7 @@ public void intervalAdded(GenericListDataEvent e) { @SuppressWarnings("unchecked") - GenericListModel<AbilityCatagoryFacade> catagories = (GenericListModel<AbilityCatagoryFacade>) e.getSource(); + DefaultGenericListModel<AbilityCatagoryFacade> catagories = (DefaultGenericListModel<AbilityCatagoryFacade>) e.getSource(); addData(catagories.subList(e.getIndex0(), e.getIndex1() + 1)); } @@ -330,7 +330,7 @@ return abilityDataView; } - public GenericListModel<AbilityFacade> getDataModel() + public DefaultGenericListModel<AbilityFacade> getDataModel() { return model; } @@ -357,13 +357,13 @@ implements FilterableTreeViewModel<AbilityFacade> { - private final GenericListModel<AbilityFacade> dataModel; + private final DefaultGenericListModel<AbilityFacade> dataModel; private final CharacterFacade character; private AbilityCatagoryFacade catagory; public AvailableAbilityTreeViewModel(CharacterFacade character) { - this.dataModel = new GenericListModel<AbilityFacade>(); + this.dataModel = new DefaultGenericListModel<AbilityFacade>(); this.character = character; } @@ -382,7 +382,7 @@ return abilityDataView; } - public GenericListModel<AbilityFacade> getDataModel() + public DefaultGenericListModel<AbilityFacade> getDataModel() { return dataModel; } @@ -396,7 +396,7 @@ } this.catagory = catagory; - GenericListModel<AbilityFacade> abilities = PCGenUIManager.getRegisteredAbilities(character, + DefaultGenericListModel<AbilityFacade> abilities = PCGenUIManager.getRegisteredAbilities(character, catagory); dataModel.clear(); addData(abilities); @@ -421,7 +421,7 @@ public void intervalAdded(GenericListDataEvent e) { @SuppressWarnings("unchecked") - GenericListModel<AbilityFacade> source = (GenericListModel<AbilityFacade>) e.getSource(); + DefaultGenericListModel<AbilityFacade> source = (DefaultGenericListModel<AbilityFacade>) e.getSource(); addData(source.subList(e.getIndex0(), e.getIndex1() + 1)); } @@ -442,10 +442,10 @@ { private CharacterFacade character; - private GenericListModel<AbilityCatagoryFacade> catagories; + private DefaultGenericListModel<AbilityCatagoryFacade> catagories; public CatagoryTableModel(CharacterFacade character, - GenericListModel<AbilityCatagoryFacade> catagories) + DefaultGenericListModel<AbilityCatagoryFacade> catagories) { this.character = character; this.catagories = catagories; @@ -648,7 +648,7 @@ } public Hashtable<Object, Object> createState(CharacterFacade character, - GenericListModel<AbilityCatagoryFacade> catagories) + DefaultGenericListModel<AbilityCatagoryFacade> catagories) { Hashtable<Object, Object> state = new Hashtable<Object, Object>(); state.put("CatagoryTableModel", @@ -684,9 +684,9 @@ private class PreReqTreeView implements TreeView<AbilityFacade> { - private GenericListModel<AbilityFacade> abilities; + private DefaultGenericListModel<AbilityFacade> abilities; - public PreReqTreeView(GenericListModel<AbilityFacade> abilities) + public PreReqTreeView(DefaultGenericListModel<AbilityFacade> abilities) { this.abilities = abilities; } Modified: branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java 2008-07-17 22:08:22 UTC (rev 7187) +++ branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -10,7 +10,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; -import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.DefaultGenericListModel; import pcgen.gui.util.JTreeViewSelectionPane.SelectionType; import pcgen.gui.util.table.DefaultSortableTableModel; import pcgen.gui.util.table.SortableTableModel; @@ -106,9 +106,9 @@ return new DateModel(); } - private static GenericListModel<Date> getData() + private static DefaultGenericListModel<Date> getData() { - GenericListModel<Date> list = new GenericListModel<Date>(); + DefaultGenericListModel<Date> list = new DefaultGenericListModel<Date>(); Calendar cal = Calendar.getInstance(); cal.set(1543, 12, 9); list.add(cal.getTime()); @@ -134,7 +134,7 @@ private static List<? extends TreeView<Date>> views = Arrays.asList(DateTree.values()); private static DataView<Date> data = new DateView(); - private static GenericListModel<Date> datamodel = getData(); + private static DefaultGenericListModel<Date> datamodel = getData(); public List<? extends TreeView<Date>> getTreeViews() { @@ -151,7 +151,7 @@ return data; } - public GenericListModel<Date> getDataModel() + public DefaultGenericListModel<Date> getDataModel() { return datamodel; } Copied: branches/cdomui/code/src/java/pcgen/gui/util/DefaultGenericListModel.java (from rev 7111, branches/cdomui/code/src/java/pcgen/gui/util/GenericListModel.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/DefaultGenericListModel.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/util/DefaultGenericListModel.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -0,0 +1,633 @@ +/* + * DefaultGenericListModel.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 Jun 30, 2008, 9:32:17 PM + */ +package pcgen.gui.util; + +import java.util.Collection; +import java.util.Collections; +import java.util.EventListener; +import java.util.Vector; +import javax.swing.ListModel; +import javax.swing.event.EventListenerList; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import pcgen.gui.util.event.GenericListDataEvent; +import pcgen.gui.util.event.GenericListDataListener; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class DefaultGenericListModel<E> extends Vector<E> implements ListModel +{ + + protected EventListenerList listenerList = new EventListenerList(); + protected volatile boolean isAdjusting = false; + + public int getSize() + { + return size(); + } + + public E getElementAt(int index) + { + return elementAt(index); + } + + /** + * Sets the size of this list. + * + * @param newSize the new size of this list + * @see Vector#setSize(int) + */ + @Override + public void setSize(int newSize) + { + int oldSize = size(); + if (newSize == oldSize) + { + return; + } + Vector<E> c; + if (oldSize > newSize) + { + c = new Vector<E>(subList(newSize, oldSize)); + } + else + { + c = new Vector<E>(newSize - oldSize); + c.setSize(newSize - oldSize); + } + super.setSize(newSize); + if (oldSize > newSize) + { + fireIntervalRemoved(this, c, isAdjusting, newSize, oldSize - 1); + } + else + { + fireIntervalAdded(this, c, isAdjusting, oldSize, newSize - 1); + } + } + + /** + * Sets the component at the specified <code>index</code> of this + * list to be the specified object. The previous component at that + * position is discarded. + * <p> + * Throws an <code>ArrayIndexOutOfBoundsException</code> if the index + * is invalid. + * <blockquote> + * <b>Note:</b> Although this method is not deprecated, the preferred + * method to use is <code>set(int,Object)</code>, which implements the + * <code>List</code> interface defined in the 1.2 Collections framework. + * </blockquote> + * + * @param obj what the component is to be set to + * @param index the specified index + * @see #set(int,Object) + * @see Vector#setElementAt(Object,int) + */ + @Override + public void setElementAt(E obj, int index) + { + E rv = elementAt(index); + super.setElementAt(obj, index); + fireContentsChanged(this, Collections.singleton(rv), isAdjusting, index, + index); + } + + /** + * Deletes the component at the specified index. + * <p> + * Throws an <code>ArrayIndexOutOfBoundsException</code> if the index + * is invalid. + * <blockquote> + * <b>Note:</b> Although this method is not deprecated, the preferred + * method to use is <code>remove(int)</code>, which implements the + * <code>List</code> interface defined in the 1.2 Collections framework. + * </blockquote> + * + * @param index the index of the object to remove + * @see #remove(int) + * @see Vector#removeElementAt(int) + */ + @Override + public void removeElementAt(int index) + { + E o = super.remove(index); + fireIntervalRemoved(this, Collections.singleton(o), isAdjusting, index, + index); + } + + /** + * Inserts the specified object as a component in this list at the + * specified <code>index</code>. + * <p> + * Throws an <code>ArrayIndexOutOfBoundsException</code> if the index + * is invalid. + * <blockquote> + * <b>Note:</b> Although this method is not deprecated, the preferred + * method to use is <code>add(int,Object)</code>, which implements the + * <code>List</code> interface defined in the 1.2 Collections framework. + * </blockquote> + * + * @param obj the component to insert + * @param index where to insert the new component + * @exception ArrayIndexOutOfBoundsException if the index was invalid + * @see #add(int,Object) + * @see Vector#insertElementAt(Object,int) + */ + @Override + public void insertElementAt(E obj, int index) + { + super.insertElementAt(obj, index); + fireIntervalAdded(this, Collections.singleton(obj), isAdjusting, index, + index); + } + + @Override + public boolean add(E o) + { + addElement(o); + return true; + } + + /** + * Adds the specified component to the end of this list. + * + * @param obj the component to be added + * @see Vector#addElement(Object) + */ + @Override + public void addElement(E obj) + { + int index = size(); + super.addElement(obj); + fireIntervalAdded(this, Collections.singleton(obj), isAdjusting, index, + index); + } + + /** + * Removes the first (lowest-indexed) occurrence of the argument + * from this list. + * + * @param obj the component to be removed + * @return <code>true</code> if the argument was a component of this + * list; <code>false</code> otherwise + * @see Vector#removeElement(Object) + */ + @Override + public boolean removeElement(Object obj) + { + int index = indexOf(obj); + boolean rv = super.removeElement(obj); + if (index >= 0) + { + fireIntervalRemoved(this, Collections.singleton(obj), isAdjusting, + index, index); + } + return rv; + } + + /** + * Removes all components from this list and sets its size to zero. + * <blockquote> + * <b>Note:</b> Although this method is not deprecated, the preferred + * method to use is <code>clear</code>, which implements the + * <code>List</code> interface defined in the 1.2 Collections framework. + * </blockquote> + * + * @see #clear() + * @see Vector#removeAllElements() + */ + @Override + public void removeAllElements() + { + int index1 = size() - 1; + Collection<E> c = new Vector<E>(this); + super.removeAllElements(); + if (index1 >= 0) + { + fireIntervalRemoved(this, c, isAdjusting, 0, index1); + } + } + + /* The remaining methods are included for compatibility with the + * Java 2 platform Vector class. + */ + /** + * Replaces the element at the specified position in this list with the + * specified element. + * <p> + * Throws an <code>ArrayIndexOutOfBoundsException</code> + * if the index is out of range + * (<code>index < 0 || index >= size()</code>). + * + * @param index index of element to replace + * @param element element to be stored at the specified position + * @return the element previously at the specified position + */ + @Override + public E set(int index, E element) + { + E rv = elementAt(index); + super.setElementAt(element, index); + fireContentsChanged(this, Collections.singleton(rv), isAdjusting, index, + index); + return rv; + } + + /** + * Inserts the specified element at the specified position in this list. + * <p> + * Throws an <code>ArrayIndexOutOfBoundsException</code> if the + * index is out of range + * (<code>index < 0 || index > size()</code>). + * + * @param index index at which the specified element is to be inserted + * @param element element to be inserted + */ + @Override + public void add(int index, E element) + { + super.insertElementAt(element, index); + fireIntervalAdded(this, Collections.singleton(element), isAdjusting, + index, index); + } + + /** + * Removes the element at the specified position in this list. + * Returns the element that was removed from the list. + * <p> + * Throws an <code>ArrayIndexOutOfBoundsException</code> + * if the index is out of range + * (<code>index < 0 || index >= size()</code>). + * + * @param index the index of the element to removed + */ + @Override + public E remove(int index) + { + E rv = elementAt(index); + super.removeElementAt(index); + fireIntervalRemoved(this, Collections.singleton(rv), isAdjusting, + index, index); + return rv; + } + + /** + * Removes all of the elements from this list. The list will + * be empty after this call returns (unless it throws an exception). + */ + @Override + public void clear() + { + int index1 = size() - 1; + Collection<E> c = new Vector<E>(this); + super.removeAllElements(); + if (index1 >= 0) + { + fireIntervalRemoved(this, c, isAdjusting, 0, index1); + } + } + + /** + * Deletes the components at the specified range of indexes. + * The removal is inclusive, so specifying a range of (1,5) + * removes the component at index 1 and the component at index 5, + * as well as all components in between. + * <p> + * Throws an <code>ArrayIndexOutOfBoundsException</code> + * if the index was invalid. + * Throws an <code>IllegalArgumentException</code> if + * <code>fromIndex > toIndex</code>. + * + * @param fromIndex the index of the lower end of the range + * @param toIndex the index of the upper end of the range + * @see #remove(int) + */ + @Override + public void removeRange(int fromIndex, int toIndex) + { + if (fromIndex > toIndex) + { + throw new IllegalArgumentException("fromIndex must be <= toIndex"); + } + Collection<E> c = new Vector<E>(subList(fromIndex, toIndex + 1)); + for (int i = toIndex; i >= fromIndex; i--) + { + super.removeElementAt(i); + } + fireIntervalRemoved(this, c, isAdjusting, fromIndex, toIndex); + } + + @Override + public boolean addAll(Collection<? extends E> c) + { + int index = size(); + boolean added = super.addAll(c); + if (added) + { + fireIntervalAdded(this, c, isAdjusting, index, index + c.size() - 1); + } + return added; + } + + @Override + public boolean addAll(int index, Collection<? extends E> c) + { + boolean added = super.addAll(index, c); + if (added) + { + fireIntervalAdded(this, c, isAdjusting, index, index + c.size() - 1); + } + return added; + } + + @Override + public boolean retainAll(Collection<?> c) + { + isAdjusting = true; + boolean ret = super.retainAll(c); + isAdjusting = false; + fireContentsChanged(this, null, isAdjusting, -1, -1); + return ret; + } + + @Override + public boolean removeAll(Collection<?> c) + { + isAdjusting = true; + boolean ret = super.removeAll(c); + isAdjusting = false; + fireContentsChanged(this, null, isAdjusting, -1, -1); + return ret; + } + + /** + * Adds a listener to the list that's notified each time a change + * to the data model occurs. + * + * @param l the <code>ListDataListener</code> to be added + */ + public void addListDataListener(ListDataListener l) + { + listenerList.add(ListDataListener.class, l); + } + + /** + * Adds a listener to the list that's notified each time a change + * to the data model occurs. + * + * @param l the <code>GenericListDataListener</code> to be added + */ + public void addGenericListDataListener(GenericListDataListener l) + { + listenerList.add(GenericListDataListener.class, l); + } + + /** + * Removes a listener from the list that's notified each time a + * change to the data model occurs. + * + * @param l the <code>ListDataListener</code> to be removed + */ + public void removeListDataListener(ListDataListener l) + { + listenerList.remove(ListDataListener.class, l); + } + + /** + * Removes a listener from the list that's notified each time a + * change to the data model occurs. + * + * @param l the <code>GenericListDataListener</code> to be removed + */ + public void removeGenericListDataListener(GenericListDataListener l) + { + listenerList.remove(GenericListDataListener.class, l); + } + + /** + * Returns an array of all the list data listeners + * registered on this <code>DefaultGenericListModel</code>. + * + * @return all of this model's <code>ListDataListener</code>s, + * or an empty array if no list data listeners + * are currently registered + * + * @see #addListDataListener + * @see #removeListDataListener + * + */ + public ListDataListener[] getListDataListeners() + { + return (ListDataListener[]) listenerList.getListeners( + ListDataListener.class); + } + + /** + * Returns an array of all the list data listeners + * registered on this <code>DefaultGenericListModel</code>. + * + * @return all of this model's <code>GenericListDataListener</code>s, + * or an empty array if no list data listeners + * are currently registered + * + * @see #addGenericListDataListener + * @see #removeGenericListDataListener + * + */ + public GenericListDataListener[] getGenericListDataListeners() + { + return (GenericListDataListener[]) listenerList.getListeners( + GenericListDataListener.class); + } + + /** + * <code>AbstractListModel</code> subclasses must call this method + * <b>after</b> + * one or more elements of the list change. The changed elements + * are specified by the closed interval index0, index1 -- the endpoints + * are included. Note that + * index0 need not be less than or equal to index1. + * + * @param source the <code>ListModel</code> that changed, typically "this" + * @param index0 one end of the new interval + * @param index1 the other end of the new interval + * @see EventListenerList + * @see DefaultListModel + */ + protected void fireContentsChanged(Object source, + Collection<? extends Object> data, + boolean adjusting, int index0, + int index1) + { + Object[] listeners = listenerList.getListenerList(); + GenericListDataEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) + { + Object listener = listeners[i]; + if (e == null && (listener == ListDataListener.class || + listener == GenericListDataListener.class)) + { + e = new GenericListDataEvent(source, data, adjusting, + ListDataEvent.INTERVAL_REMOVED, + index0, index1); + } + if (listener == ListDataListener.class) + { + ((ListDataListener) listeners[i + 1]).contentsChanged(e); + } + else if (listener == GenericListDataListener.class) + { + ((GenericListDataListener) listeners[i + 1]).contentsChanged(e); + } + } + } + + /** + * <code>AbstractListModel</code> subclasses must call this method + * <b>after</b> + * one or more elements are added to the model. The new elements + * are specified by a closed interval index0, index1 -- the enpoints + * are included. Note that + * index0 need not be less than or equal to index1. + * + * @param source the <code>ListModel</code> that changed, typically "this" + * @param index0 one end of the new interval + * @param index1 the other end of the new interval + * @see EventListenerList + * @see DefaultListModel + */ + protected void fireIntervalAdded(Object source, + Collection<? extends Object> data, + boolean adjusting, int index0, int index1) + { + Object[] listeners = listenerList.getListenerList(); + GenericListDataEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) + { + Object listener = listeners[i]; + if (e == null && (listener == ListDataListener.class || + listener == GenericListDataListener.class)) + { + e = new GenericListDataEvent(source, data, adjusting, + ListDataEvent.INTERVAL_ADDED, + index0, index1); + } + if (listener == ListDataListener.class) + { + ((ListDataListener) listeners[i + 1]).intervalAdded(e); + } + else if (listener == GenericListDataListener.class) + { + ((GenericListDataListener) listeners[i + 1]).intervalAdded(e); + } + } + } + + /** + * <code>AbstractListModel</code> subclasses must call this method + * <b>after</b> one or more elements are removed from the model. + * <code>index0</code> and <code>index1</code> are the end points + * of the interval that's been removed. Note that <code>index0</code> + * need not be less than or equal to <code>index1</code>. + * + * @param source the <code>ListModel</code> that changed, typically "this" + * @param index0 one end of the removed interval, + * including <code>index0</code> + * @param index1 the other end of the removed interval, + * including <code>index1</code> + * @see EventListenerList + * @see DefaultListModel + */ + protected void fireIntervalRemoved(Object source, + Collection<? extends Object> data, + boolean adjusting, int index0, + int index1) + { + Object[] listeners = listenerList.getListenerList(); + GenericListDataEvent e = null; + + for (int i = listeners.length - 2; i >= 0; i -= 2) + { + Object listener = listeners[i]; + if (e == null && (listener == ListDataListener.class || + listener == GenericListDataListener.class)) + { + e = new GenericListDataEvent(source, data, adjusting, + ListDataEvent.INTERVAL_REMOVED, + index0, index1); + } + if (listener == ListDataListener.class) + { + ((ListDataListener) listeners[i + 1]).intervalRemoved(e); + } + else if (listener == GenericListDataListener.class) + { + ((GenericListDataListener) listeners[i + 1]).intervalRemoved(e); + } + } + } + + /** + * Returns an array of all the objects currently registered as + * <code><em>Foo</em>Listener</code>s + * upon this model. + * <code><em>Foo</em>Listener</code>s + * are registered using the <code>add<em>Foo</em>Listener</code> method. + * <p> + * You can specify the <code>listenerType</code> argument + * with a class literal, such as <code><em>Foo</em>Listener.class</code>. + * For example, you can query a list model + * <code>m</code> + * for its list data listeners + * with the following code: + * + * <pre>ListDataListener[] ldls = (ListDataListener[])(m.getListeners(ListDataListener.class));</pre> + * + * If no such listeners exist, + * this method returns an empty array. + * + * @param listenerType the type of listeners requested; + * this parameter should specify an interface + * that descends from <code>java.util.EventListener</code> + * @return an array of all objects registered as + * <code><em>Foo</em>Listener</code>s + * on this model, + * or an empty array if no such + * listeners have been added + * @exception ClassCastException if <code>listenerType</code> doesn't + * specify a class or interface that implements + * <code>java.util.EventListener</code> + * + * @see #getListDataListeners + * + * @since 1.3 + */ + public <T extends EventListener> T[] getListeners(Class<T> listenerType) + { + return listenerList.getListeners(listenerType); + } + +} Deleted: branches/cdomui/code/src/java/pcgen/gui/util/GenericListModel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/GenericListModel.java 2008-07-17 22:08:22 UTC (rev 7187) +++ branches/cdomui/code/src/java/pcgen/gui/util/GenericListModel.java 2008-07-18 03:11:08 UTC (rev 7188) @@ -1,633 +0,0 @@ -/* - * GenericListModel.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 Jun 30, 2008, 9:32:17 PM - */ -package pcgen.gui.util; - -import java.util.Collection; -import java.util.Collections; -import java.util.EventListener; -import java.util.Vector; -import javax.swing.ListModel; -import javax.swing.event.EventListenerList; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; -import pcgen.gui.util.event.GenericListDataEvent; -import pcgen.gui.util.event.GenericListDataListener; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class GenericListModel<E> extends Vector<E> implements ListModel -{ - - protected EventListenerList listenerList = new EventListenerList(); - protected volatile boolean isAdjusting = false; - - public int getSize() - { - return size(); - } - - public E getElementAt(int index) - { - return elementAt(index); - } - - /** - * Sets the size of this list. - * - * @param newSize the new size of this list - * @see Vector#setSize(int) - */ - @Override - public void setSize(int newSize) - { - int oldSize = size(); - if (newSize == oldSize) - { - return; - } - Vector<E> c; - if (oldSize > newSize) - { - c = new Vector<E>(subList(newSize, oldSize)); - } - else - { - c = new Vector<E>(newSize - oldSize); - c.setSize(newSize - oldSize); - } - super.setSize(newSize); - if (oldSize > newSize) - { - fireIntervalRemoved(this, c, isAdjusting, newSize, oldSize - 1); - } - else - { - fireIntervalAdded(this, c, isAdjusting, oldSize, newSize - 1); - } - } - - /** - * Sets the component at the specified <code>index</code> of this - * list to be the specified object. The previous component at that - * position is discarded. - * <p> - * Throws an <code>ArrayIndexOutOfBoundsException</code> if the index - * is invalid. - * <blockquote> - * <b>Note:</b> Although this method is not deprecated, the preferred - * method to use is <code>set(int,Object)</code>, which implements the - * <code>List</code> interface defined in the 1.2 Collections framework. - * </blockquote> - * - * @param obj what the component is to be set to - * @param index the specified index - * @see #set(int,Object) - * @see Vector#setElementAt(Object,int) - */ - @Override - public void setElementAt(E obj, int index) - { - E rv = elementAt(index); - super.setElementAt(obj, index); - fireContentsChanged(this, Collections.singleton(rv), isAdjusting, index, - index); - } - - /** - * Deletes the component at the specified index. - * <p> - * Throws an <code>ArrayIndexOutOfBoundsException</code> if the index - * is invalid. - * <blockquote> - * <b>Note:</b> Although this method is not deprecated, the preferred - * method to use is <code>remove(int)</code>, which implements the - * <code>List</code> interface defined in the 1.2 Collections framework. - * </blockquote> - * - * @param index the index of the object to remove - * @see #remove(int) - * @see Vector#removeElementAt(int) - */ - @Override - public void removeElementAt(int index) - { - E o = super.remove(index); - fireIntervalRemoved(this, Collections.singleton(o), isAdjusting, index, - index); - } - - /** - * Inserts the specified object as a component in this list at the - * specified <code>index</code>. - * <p> - * Throws an <code>ArrayIndexOutOfBoundsException</code> if the index - * is invalid. - * <blockquote> - * <b>Note:</b> Although this method is not deprecated, the preferred - * method to use is <code>add(int,Object)</code>, which implements the - * <code>List</code> interface defined in the 1.2 Collections framework. - * </blockquote> - * - * @param obj the component to insert - * @param index where to insert the new component - * @exception ArrayIndexOutOfBoundsException if the index was invalid - * @see #add(int,Object) - * @see Vector#insertElementAt(Object,int) - */ - @Override - public void insertElementAt(E obj, int index) - { - super.insertElementAt(obj, index); - fireIntervalAdded(this, Collections.singleton(obj), isAdjusting, index, - index); - } - - @Override - public boolean add(E o) - { - addElement(o); - return true; - } - - /** - * Adds the specified component to the end of this list. - * - * @param obj the component to be added - * @see Vector#addElement(Object) - */ - @Override - public void addElement(E obj) - { - int index = size(); - super.addElement(obj); - fireIntervalAdded(this, Collections.singleton(obj), isAdjusting, index, - index); - } - - /** - * Removes the first (lowest-indexed) occurrence of the argument - * from this list. - * - * @param obj the component to be removed - * @return <code>true</code> if the argument was a component of this - * list; <code>false</code> otherwise - * @see Vector#removeElement(Object) - */ - @Override - public boolean removeElement(Object obj) - { - int index = indexOf(obj); - boolean rv = super.removeElement(obj); - if (index >= 0) - { - fireIntervalRemoved(this, Collections.singleton(obj), isAdjusting, - index, index); - } - return rv; - } - - /** - * Removes all components from this list and sets its size to zero. - * <blockquote> - * <b>Note:</b> Although this method is not deprecated, the preferred - * method to use is <code>clear</code>, which implements the - * <code>List</code> interface defined in the 1.2 Collections framework. - * </blockquote> - * - * @see #clear() - * @see Vector#removeAllElements() - */ - @Override - public void removeAllElements() - { - int index1 = size() - 1; - Collection<E> c = new Vector<E>(this); - super.removeAllElements(); - if (index1 >= 0) - { - fireIntervalRemoved(this, c, isAdjusting, 0, index1); - } - } - - /* The remaining methods are included for compatibility with the - * Java 2 platform Vector class. - */ - /** - * Replaces the element at the specified position in this list with the - * specified element. - * <p> - * Throws an <code>ArrayIndexOutOfBoundsException</code> - * if the index is out of range - * (<code>index < 0 || index >= size()</code>). - * - * @param index index of element to replace - * @param element element to be stored at the specified position - * @return the element previously at the specified position - */ - @Override - public E set(int index, E element) - { - E rv = elementAt(index); - super.setElementAt(element, index); - fireContentsChanged(this, Collections.singleton(rv), isAdjusting, index, - index); - return rv; - } - - /** - * Inserts the specified element at the specified position in this list. - * <p> - * Throws an <code>ArrayIndexOutOfBoundsException</code> if the - * index is out of range - * (<code>index < 0 || index > size()</code>). - * - * @param index index at which the specified element is to be inserted - * @param element element to be inserted - */ - @Override - public void add(int index, E element) - { - super.insertElementAt(element, index); - fireIntervalAdded(this, Collections.singleton(element), isAdjusting, - index, index); - } - - /** - * Removes the element at the specified position in this list. - * Returns the element that was removed from the list. - * <p> - * Throws an <code>ArrayIndexOutOfBoundsException</code> - * if the index is out of range - * (<code>index < 0 || index >= size()</code>). - * - * @param index the index of the element to removed - */ - @Override - public E remove(int index) - { - E rv = elementAt(index); - super.removeElementAt(index); - fireIntervalRemoved(this, Collections.singleton(rv), isAdjusting, - index, index); - return rv; - } - - /** - * Removes all of the elements from this list. The list will - * be empty after this call returns (unless it throws an exception). - */ - @Override - public void clear() - { - int index1 = size() - 1; - Collection<E> c = new Vector<E>(this); - super.removeAllElements(); - if (index1 >= 0) - { - fireIntervalRemoved(this, c, isAdjusting, 0, index1); - } - } - - /** - * Deletes the components at the specified range of indexes. - * The removal is inclusive, so specifying a range of (1,5) - * removes the component at index 1 and the component at index 5, - * as well as all components in between. - * <p> - * Throws an <code>ArrayIndexOutOfBoundsException</code> - * if the index was invalid. - * Throws an <code>IllegalArgumentException</code> if - * <code>fromIndex > toIndex</code>. - * - * @param fromIndex the index of the lower end of the range - * @param toIndex the index of the upper end of the range - * @see #remove(int) - */ - @Override - public void removeRange(int fromIndex, int toIndex) - { - if (fromIndex > toIndex) - { - throw new IllegalArgumentException("fromIndex must be <= toIndex"); - } - Collection<E> c = new Vector<E>(subList(fromIndex, toIndex + 1)); - for (int i = toIndex; i >= fromIndex; i--) - { - super.removeElementAt(i); - } - fireIntervalRemoved(this, c, isAdjusting, fromIndex, toIndex); - } - - @Override - public boolean addAll(Collection<? extends E> c) - { - int index = size(); - boolean added = super.addAll(c); - if (added) - { - fireIntervalAdded(this, c, isAdjusting, index, index + c.size() - 1); - } - return added; - } - - @Override - public boolean addAll(int index, Collection<? extends E> c) - { - boolean added = super.addAll(index, c); - if (added) - { - fireIntervalAdded(this, c, isAdjusting, index, index + c.size() - 1); - } - return added; - } - - @Override - public boolean retainAll(Collection<?> c) - { - isAdjusting = true; - boolean ret = super.retainAll(c); - isAdjusting = false; - fireContentsChanged(this, null, isAdjusting, -1, -1); - return ret; - } - - @Override - public boolean removeAll(Collection<?> c) - { - isAdjusting = true; - boolean ret = super.removeAll(c); - isAdjusting = false; - fireContentsChanged(this, null, isAdjusting, -1, -1); - return ret; - } - - /** - * Adds a listener to the list that's notified each time a change - * to the data model occurs. - * - * @param l the <code>ListDataListener</code> to be added - */ - public void addListDataListener(ListDataListener l) - { - listenerList.add(ListDataListener.class, l); - } - - /** - * Adds a listener to the list that's notified each time a change - * to the data model occurs. - * - * @param l the <code>GenericListDataListener</code> to be added - */ - public void addGenericListDataListener(GenericListDataListener l) - { - listenerList.add(GenericListDataListener.class, l); - } - - /** - * Removes a listener from the list that's notified each time a - * change to the data model occurs. - * - * @param l the <code>ListDataListener</code> to be removed - */ - public void removeListDataListener(ListDataListener l) - { - listenerList.remove(ListDataListener.class, l); - } - - /** - * Removes a listener from the list that's notified each time a - * change to the data model occurs. - * - * @param l the <code>GenericListDataListener</code> to be removed - */ - public void removeGenericListDataListener(GenericListDataListener l) - { - listenerList.remove(GenericListDataListener.class, l); - } - - /** - * Returns an array of all the list data listeners - * registered on this <code>GenericListModel</code>. - * - * @return all of this model's <code>ListDataListener</code>s, - * or an empty array if no list data listeners - * are currently registered - * - * @see #addListDataListener - * @see #removeListDataListener - * - */ - public ListDataListener[] getListDataListeners() - { - return (ListDataListener[]) listenerList.getListeners( - ListDataListener.class); - } - - /** - * Returns an array of all the list data listeners - * registered on this <code>GenericListModel</code>. - * - * @return all of this model's <code>GenericListDataListener</code>s, - * or an empty array if no list data listeners - * are currently registered - * - * @see #addGenericListDataListener - * @see #removeGenericListDataListener - * - */ - public GenericListDataListener[] getGenericListDataListeners() - { - return (GenericListDataListener[]) listenerList.getListeners( - GenericListDataListener.class); - } - - /** - * <code>AbstractListModel</code> subclasses must call this method - * <b>after</b> - * one or more elements of the list change. The changed elements - * are specified by the closed interval index0, index1 -- the endpoints - * are included. Note that - * index0 need not be less than or equal to index1. - * - * @param source the <code>ListModel</code> that changed, typically "this" - * @param index0 one end of the new interval - * @param index1 the other end of the new interval - * @see EventListenerList - * @see DefaultListModel - */ - protected void fireContentsChanged(Object source, - Collection<? extends Object> data, - boolean adjusting, int index0, - int index1) - { - Object[] listeners = listenerList.getListenerList(); - GenericListDataEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) - { - Object listener = listeners[i]; - if (e == null && (listener == ListDataListener.class || - listener == GenericListDataListener.class)) - { - e = new GenericListDataEvent(source, data, adjusting, - ListDataEvent.INTERVAL_REMOVED, - index0, index1); - } - if (listener == ListDataListener.class) - { - ((ListDataListener) listeners[i + 1]).contentsChanged(e); - } - else if (listener == GenericListDataListener.class) - { - ((GenericListDataListener) listeners[i + 1]).contentsChanged(e); - } - } - } - - /** - * <code>AbstractListModel</code> subclasses must call this method - * <b>after</b> - * one or more elements are added to the model. The new elements - * are specified by a closed interval index0, index1 -- the enpoints - * are included. Note that - * index0 need not be less than or equal to index1. - * - * @param source the <code>ListModel</code> that changed, typically "this" - * @param index0 one end of the new interval - * @param index1 the other end of the new interval - * @see EventListenerList - * @see DefaultListModel - */ - protected void fireIntervalAdded(Object source, - Collection<? extends Object> data, - boolean adjusting, int index0, int index1) - { - Object[] listeners = listenerList.getListenerList(); - GenericListDataEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) - { - Object listener = listeners[i]; - if (e == null && (listener == ListDataListener.class || - listener == GenericListDataListener.class)) - { - e = new GenericListDataEvent(source, data, adjusting, - ListDataEvent.INTERVAL_ADDED, - index0, index1); - } - if (listener == ListDataListener.class) - { - ((ListDataListener) listeners[i + 1]).intervalAdded(e); - } - else if (listener == GenericListDataListener.class) - { - ((GenericListDataListener) listeners[i + 1]).intervalAdded(e); - } - } - } - - /** - * <code>AbstractListModel</code> subclasses must call this method - * <b>after</b> one or more elements are removed from the model. - * <code>index0</code> and <code>index1</code> are the end points - * of the interval that's been removed. Note that <code>index0</code> - * need not be less than or equal to <code>index1</code>. - * - * @param source the <code>ListModel</code> that changed, typically "this" - * @param index0 one end of the removed interval, - * including <code>index0</code> - * @param index1 the other end of the removed interval, - * including <code>index1</code> - * @see EventListenerList - * @see DefaultListModel - */ - protected void fireIntervalRemoved(Object source, - Collection<? extends Object> data, - boolean adjusting, int index0, - int index1) - { - Object[] listeners = listenerList.getListenerList(); - GenericListDataEvent e = null; - - for (int i = listeners.length - 2; i >= 0; i -= 2) - { - Object listener = listeners[i]; - if (e == null && (listener == Lis... [truncated message content] |
From: <cpm...@us...> - 2008-07-18 04:21:15
|
Revision: 7190 http://pcgen.svn.sourceforge.net/pcgen/?rev=7190&view=rev Author: cpmeister Date: 2008-07-18 04:21:22 +0000 (Fri, 18 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java branches/cdomui/code/src/java/pcgen/gui/util/event/AbstractGenericListDataListener.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/util/GenericListModelWrapper.java Modified: branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java 2008-07-18 03:26:48 UTC (rev 7189) +++ branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java 2008-07-18 04:21:22 UTC (rev 7190) @@ -20,7 +20,7 @@ */ package pcgen.gui.facade; -import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.util.GenericListModel; /** * @@ -45,12 +45,10 @@ * @param catagory * @return a List of Abilities the character posseses in the specified catagory */ - public DefaultGenericListModel<AbilityFacade> getAbilities(AbilityCatagoryFacade catagory); + public GenericListModel<AbilityFacade> getAbilities(AbilityCatagoryFacade catagory); - public DefaultGenericListModel<ClassFacade> getClasses(); + public GenericListModel<ClassFacade> getClasses(); - public ClassFacade getSelectedClass(int level); - public void addCharacterLevels(ClassFacade[] classes); public void removeCharacterLevels(int levels); Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java 2008-07-18 03:26:48 UTC (rev 7189) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java 2008-07-18 04:21:22 UTC (rev 7190) @@ -99,10 +99,10 @@ catagoryListMap.get(type))); } catagories.addGenericListDataListener( - new AbstractGenericListDataListener() + new AbstractGenericListDataListener<AbilityCatagoryFacade>() { - public void intervalAdded(GenericListDataEvent e) + public void intervalAdded(GenericListDataEvent<AbilityCatagoryFacade> e) { List<AbilityCatagoryFacade> subList = catagories.subList(e.getIndex0(), e.getIndex1() + @@ -124,11 +124,10 @@ } } - public void intervalRemoved(GenericListDataEvent e) + public void intervalRemoved(GenericListDataEvent<AbilityCatagoryFacade> e) { + Collection<? extends AbilityCatagoryFacade> data = e.getData(); @SuppressWarnings("unchecked") - Collection<AbilityCatagoryFacade> data = (Collection<AbilityCatagoryFacade>) e.getData(); - @SuppressWarnings("unchecked") ListMap<String, AbilityCatagoryFacade, ArrayList<AbilityCatagoryFacade>> catagorySubListMap = CollectionMaps.createListMap(HashMap.class, ArrayList.class); Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-18 03:26:48 UTC (rev 7189) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-18 04:21:22 UTC (rev 7190) @@ -45,12 +45,15 @@ import javax.swing.TransferHandler; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; -import javax.swing.table.DefaultTableModel; +import javax.swing.table.AbstractTableModel; import pcgen.gui.facade.CharacterFacade; import pcgen.gui.facade.ClassFacade; import pcgen.gui.tools.FilteredTreeViewPanel; +import pcgen.gui.util.GenericListModel; import pcgen.util.PropertyFactory; /** @@ -268,20 +271,20 @@ classes[x] = c; } - model.addRows(classes); + //model.addRows(classes); return true; } - catch (UnsupportedFlavorException ex) { Logger.getLogger(ClassInfoTab.class.getName()).log(Level.SEVERE, - null, - ex); - } catch (IOException ex) + null, + ex); + } + catch (IOException ex) { Logger.getLogger(ClassInfoTab.class.getName()).log(Level.SEVERE, - null, - ex); + null, + ex); } return false; } @@ -290,51 +293,37 @@ } - private static final class ClassTableModel extends DefaultTableModel + private static final class ClassTableModel extends AbstractTableModel + implements ListDataListener { - private static final Object[] columns = {"Level", + private static final String[] columns = {"Level", "Class", "Source" }; private CharacterFacade character; + private GenericListModel<ClassFacade> model; public ClassTableModel(CharacterFacade character) { - super(columns, 0); this.character = character; - int characterLevel = character.getCharacterLevel(); - for (int x = 0; x < characterLevel; x++) - { - addRow(character.getSelectedClass(x + 1)); - } + this.model = character.getClasses(); } - public void addRows(ClassFacade[] classes) + public int getRowCount() { - character.addCharacterLevels(classes); - for (ClassFacade c : classes) - { - addRow(c); - } + return model.getSize(); } - public void addRow(ClassFacade c) + public int getColumnCount() { - Vector<Object> row = new Vector<Object>(); - row.add(getRowCount() + 1); - row.add(c); - row.add(c.getSource()); - addRow(row); + return 3; } - public void removeRows(int[] rows) + @Override + public String getColumnName(int column) { - for (int i = rows.length - 1; i >= 0; i--) - { - dataVector.remove(rows[i]); - } - fireTableRowsDeleted(rows[0], rows[rows.length - 1]); + return columns[column]; } @Override @@ -352,6 +341,39 @@ return null; } + public Object getValueAt(int rowIndex, int columnIndex) + { + if (columnIndex == 0) + { + return rowIndex + 1; + } + ClassFacade c = model.getElementAt(rowIndex); + switch (columnIndex) + { + case 1: + return c; + case 2: + return c.getSource(); + default: + return null; + } + } + + public void intervalAdded(ListDataEvent e) + { + fireTableRowsInserted(e.getIndex0(), e.getIndex1()); + } + + public void intervalRemoved(ListDataEvent e) + { + fireTableRowsDeleted(e.getIndex0(), e.getIndex1()); + } + + public void contentsChanged(ListDataEvent e) + { + fireTableRowsUpdated(e.getIndex0(), e.getIndex1()); + } + } public Hashtable<Object, Object> createState(CharacterFacade character) Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-18 03:26:48 UTC (rev 7189) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-18 04:21:22 UTC (rev 7190) @@ -55,6 +55,8 @@ import pcgen.gui.tools.FilterableTreeViewModel; import pcgen.gui.tools.FilteredTreeViewPanel; import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.GenericListModelWrapper; import pcgen.gui.util.event.AbstractGenericListDataListener; import pcgen.gui.util.event.GenericListDataEvent; import pcgen.gui.util.event.GenericListDataListener; @@ -229,13 +231,13 @@ setInfoPaneTitle(catagory.getName() + " Info"); } - private static final class SelectedAbilityTreeViewModel extends AbstractGenericListDataListener + private static final class SelectedAbilityTreeViewModel extends AbstractGenericListDataListener<AbilityCatagoryFacade> implements FilterableTreeViewModel<AbilityFacade> { private final List<? extends TreeView<AbilityFacade>> treeViews = null; private final Map<AbilityFacade, AbilityCatagoryFacade> catagoryMap; - private final Map<DefaultGenericListModel<AbilityFacade>, GenericListDataListener> listenerMap; + private final Map<GenericListModel<AbilityFacade>, GenericListDataListener> listenerMap; private final DefaultGenericListModel<AbilityFacade> model; private final CharacterFacade character; @@ -243,7 +245,7 @@ DefaultGenericListModel<AbilityCatagoryFacade> catagories) { this.catagoryMap = new HashMap<AbilityFacade, AbilityCatagoryFacade>(); - this.listenerMap = new HashMap<DefaultGenericListModel<AbilityFacade>, GenericListDataListener>(); + this.listenerMap = new HashMap<GenericListModel<AbilityFacade>, GenericListDataListener>(); this.model = new DefaultGenericListModel<AbilityFacade>(); this.character = character; @@ -255,19 +257,19 @@ AbilityCatagoryFacade[] catagoryArray = catagories.toArray(new AbilityCatagoryFacade[0]); for (final AbilityCatagoryFacade catagory : catagoryArray) { - final DefaultGenericListModel<AbilityFacade> abilityList = character.getAbilities(catagory); - AbilityFacade[] abilities = abilityList.toArray(new AbilityFacade[0]); - for (AbilityFacade ability : abilities) + GenericListModel<AbilityFacade> abilityList = character.getAbilities(catagory); + final List<AbilityFacade> listWrapper = new GenericListModelWrapper<AbilityFacade>(abilityList); + for (AbilityFacade ability : listWrapper) { catagoryMap.put(ability, catagory); } - GenericListDataListener listener = new AbilityModelListener() + GenericListDataListener<AbilityFacade> listener = new AbilityModelListener() { public void intervalAdded(GenericListDataEvent e) { List<AbilityFacade> sublist = - abilityList.subList(e.getIndex0(), + listWrapper.subList(e.getIndex0(), e.getIndex1() + 1); for (AbilityFacade ability : sublist) { @@ -279,34 +281,34 @@ }; listenerMap.put(abilityList, listener); abilityList.addGenericListDataListener(listener); - model.addAll(abilityList); + model.addAll(listWrapper); } } - private void removeData(Collection<AbilityCatagoryFacade> catagories) + private void removeData(Collection<? extends AbilityCatagoryFacade> catagories) { for (AbilityCatagoryFacade catagory : catagories) { - DefaultGenericListModel<AbilityFacade> abilityList = character.getAbilities(catagory); - + GenericListModel<AbilityFacade> abilityList = character.getAbilities(catagory); abilityList.removeGenericListDataListener(listenerMap.get(abilityList)); listenerMap.remove(abilityList); - model.removeAll(abilityList); - catagoryMap.keySet().removeAll(abilityList); + + final List<AbilityFacade> listWrapper = new GenericListModelWrapper<AbilityFacade>(abilityList); + model.removeAll(listWrapper); + catagoryMap.keySet().removeAll(listWrapper); } } - public void intervalAdded(GenericListDataEvent e) + public void intervalAdded(GenericListDataEvent<AbilityCatagoryFacade> e) { @SuppressWarnings("unchecked") DefaultGenericListModel<AbilityCatagoryFacade> catagories = (DefaultGenericListModel<AbilityCatagoryFacade>) e.getSource(); addData(catagories.subList(e.getIndex0(), e.getIndex1() + 1)); } - public void intervalRemoved(GenericListDataEvent e) + public void intervalRemoved(GenericListDataEvent<AbilityCatagoryFacade> e) { - @SuppressWarnings("unchecked") - Collection<AbilityCatagoryFacade> catagories = (Collection<AbilityCatagoryFacade>) e.getData(); + Collection<? extends AbilityCatagoryFacade> catagories = e.getData(); removeData(catagories); } @@ -335,10 +337,10 @@ return model; } - private abstract class AbilityModelListener extends AbstractGenericListDataListener + private abstract class AbilityModelListener extends AbstractGenericListDataListener<AbilityFacade> { - public void intervalRemoved(GenericListDataEvent e) + public void intervalRemoved(GenericListDataEvent<AbilityFacade> e) { model.removeAll(e.getData()); catagoryMap.keySet().removeAll(e.getData()); @@ -353,7 +355,7 @@ } - private static final class AvailableAbilityTreeViewModel extends AbstractGenericListDataListener + private static final class AvailableAbilityTreeViewModel extends AbstractGenericListDataListener<AbilityFacade> implements FilterableTreeViewModel<AbilityFacade> { @@ -397,7 +399,7 @@ this.catagory = catagory; DefaultGenericListModel<AbilityFacade> abilities = PCGenUIManager.getRegisteredAbilities(character, - catagory); + catagory); dataModel.clear(); addData(abilities); abilities.addGenericListDataListener(this); @@ -418,14 +420,14 @@ dataModel.addAll(abilitySet); } - public void intervalAdded(GenericListDataEvent e) + public void intervalAdded(GenericListDataEvent<AbilityFacade> e) { @SuppressWarnings("unchecked") DefaultGenericListModel<AbilityFacade> source = (DefaultGenericListModel<AbilityFacade>) e.getSource(); addData(source.subList(e.getIndex0(), e.getIndex1() + 1)); } - public void intervalRemoved(GenericListDataEvent e) + public void intervalRemoved(GenericListDataEvent<AbilityFacade> e) { dataModel.removeAll(e.getData()); } Added: branches/cdomui/code/src/java/pcgen/gui/util/GenericListModelWrapper.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/GenericListModelWrapper.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/util/GenericListModelWrapper.java 2008-07-18 04:21:22 UTC (rev 7190) @@ -0,0 +1,51 @@ +/* + * GenericListModelWrapper.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 17, 2008, 9:18:26 PM + */ +package pcgen.gui.util; + +import java.util.AbstractList; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class GenericListModelWrapper<E> extends AbstractList<E> +{ + + private GenericListModel<E> model; + + public GenericListModelWrapper(GenericListModel<E> model) + { + this.model = model; + } + + @Override + public E get(int index) + { + return model.getElementAt(index); + } + + @Override + public int size() + { + return model.getSize(); + } + +} Modified: branches/cdomui/code/src/java/pcgen/gui/util/event/AbstractGenericListDataListener.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/event/AbstractGenericListDataListener.java 2008-07-18 03:26:48 UTC (rev 7189) +++ branches/cdomui/code/src/java/pcgen/gui/util/event/AbstractGenericListDataListener.java 2008-07-18 04:21:22 UTC (rev 7190) @@ -25,10 +25,10 @@ * in its implementation of the <code>intervalAdded()</code> method. * @author Connor Petty <cpm...@us...> */ -public abstract class AbstractGenericListDataListener implements GenericListDataListener +public abstract class AbstractGenericListDataListener<E> implements GenericListDataListener<E> { - public void contentsChanged(GenericListDataEvent e) + public void contentsChanged(GenericListDataEvent<E> e) { intervalRemoved(e); intervalAdded(e); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-19 07:59:53
|
Revision: 7194 http://pcgen.svn.sourceforge.net/pcgen/?rev=7194&view=rev Author: cpmeister Date: 2008-07-19 08:00:00 +0000 (Sat, 19 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java Modified: branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java 2008-07-19 05:33:15 UTC (rev 7193) +++ branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java 2008-07-19 08:00:00 UTC (rev 7194) @@ -47,14 +47,12 @@ */ public GenericListModel<AbilityFacade> getAbilities(AbilityCatagoryFacade catagory); - public GenericListModel<ClassFacade> getClasses(); + public GenericListModel<CharacterLevelFacade> getLevels(); public void addCharacterLevels(ClassFacade[] classes); public void removeCharacterLevels(int levels); - public int getCharacterLevel(); - public int getClassLevel(ClassFacade c); public int getRemainingSelections(AbilityCatagoryFacade catagory); Added: branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java 2008-07-19 08:00:00 UTC (rev 7194) @@ -0,0 +1,40 @@ +/* + * CharacterLevelFacade.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 18, 2008, 3:17:57 PM + */ +package pcgen.gui.facade; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface CharacterLevelFacade +{ + + public void investSkillPoints(SkillFacade skill, int points); + + public ClassFacade getSelectedClass(); + + public int getGainedSkillPoints(); + + public void setGainedSkillPoints(int points); + + public int getSpentSkillPoints(); + +} Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-19 05:33:15 UTC (rev 7193) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-19 08:00:00 UTC (rev 7194) @@ -30,7 +30,6 @@ import java.io.IOException; import java.util.Hashtable; import java.util.List; -import java.util.Vector; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.AbstractAction; @@ -51,6 +50,7 @@ import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel; import pcgen.gui.facade.CharacterFacade; +import pcgen.gui.facade.CharacterLevelFacade; import pcgen.gui.facade.ClassFacade; import pcgen.gui.tools.FilteredTreeViewPanel; import pcgen.gui.util.GenericListModel; @@ -302,12 +302,13 @@ "Source" }; private CharacterFacade character; - private GenericListModel<ClassFacade> model; + private GenericListModel<CharacterLevelFacade> model; public ClassTableModel(CharacterFacade character) { this.character = character; - this.model = character.getClasses(); + this.model = character.getLevels(); + model.addListDataListener(this); } public int getRowCount() @@ -347,7 +348,7 @@ { return rowIndex + 1; } - ClassFacade c = model.getElementAt(rowIndex); + ClassFacade c = model.getElementAt(rowIndex).getSelectedClass(); switch (columnIndex) { case 1: Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-19 05:33:15 UTC (rev 7193) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-19 08:00:00 UTC (rev 7194) @@ -27,14 +27,18 @@ import javax.swing.JSpinner; import javax.swing.JTable; import javax.swing.SpinnerNumberModel; -import javax.swing.table.DefaultTableModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import javax.swing.table.AbstractTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import pcgen.gui.facade.CharacterFacade; +import pcgen.gui.facade.CharacterLevelFacade; import pcgen.gui.facade.ClassFacade; import pcgen.gui.facade.SkillFacade; import pcgen.gui.tools.FilterableTreeViewModel; import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.util.GenericListModel; import pcgen.gui.util.treeview.DataView; import pcgen.gui.util.treeview.DataViewColumn; import pcgen.gui.util.treeview.TreeView; @@ -46,8 +50,11 @@ public class SkillInfoTab extends AbstractChooserTab implements CharacterInfoTab { + private final JTable skillpointsTable; + public SkillInfoTab() { + this.skillpointsTable = new JTable(); initComponents(); } @@ -127,26 +134,107 @@ } } - private static class SkillPointTableModel extends DefaultTableModel + private static class SkillPointTableModel extends AbstractTableModel + implements ListDataListener { - private static final Object[] columns = {"Level", + private static final String[] columns = {"Level", "Class", - "Points" + "Spent", + "Gained" }; - private CharacterFacade character; + private final GenericListModel<CharacterLevelFacade> model; public SkillPointTableModel(CharacterFacade character) { - super(columns, 0); - this.character = character; - int characterLevel = character.getCharacterLevel(); - for (int x = 0; x < characterLevel; x++) + this.model = character.getLevels(); + model.addListDataListener(this); + } + + public int getRowCount() + { + return model.getSize(); + } + + public int getColumnCount() + { + return columns.length; + } + + @Override + public String getColumnName(int column) + { + return columns[column]; + } + + public Object getValueAt(int rowIndex, int columnIndex) + { + if (columnIndex == 0) { - + return rowIndex + 1; } + CharacterLevelFacade level = model.getElementAt(rowIndex); + switch (rowIndex) + { + case 1: + return level.getSelectedClass(); + case 2: + return level.getSpentSkillPoints(); + case 3: + return level.getGainedSkillPoints(); + default: + throw new IndexOutOfBoundsException(); + } } + @Override + public Class<?> getColumnClass(int columnIndex) + { + switch (columnIndex) + { + case 1: + return ClassFacade.class; + case 0: + case 2: + case 3: + return Integer.class; + default: + return Object.class; + } + } + + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) + { + if (columnIndex == 3) + { + return true; + } + return false; + } + + @Override + public void setValueAt(Object aValue, int rowIndex, int columnIndex) + { + CharacterLevelFacade level = model.getElementAt(rowIndex); + level.setGainedSkillPoints((Integer) aValue); + } + + public void intervalAdded(ListDataEvent e) + { + fireTableRowsInserted(e.getIndex0(), e.getIndex1()); + } + + public void intervalRemoved(ListDataEvent e) + { + fireTableRowsDeleted(e.getIndex0(), e.getIndex1()); + } + + public void contentsChanged(ListDataEvent e) + { + fireTableRowsUpdated(e.getIndex0(), e.getIndex1()); + } + } private static class TableCellSpinnerEditor extends AbstractCellEditor Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form 2008-07-19 05:33:15 UTC (rev 7193) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form 2008-07-19 08:00:00 UTC (rev 7194) @@ -63,35 +63,41 @@ </Constraint> </Constraints> </Component> - <Container class="javax.swing.JScrollPane" name="jScrollPane1"> - <AuxValues> - <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> - </AuxValues> + <Container class="javax.swing.JPanel" name="jPanel2"> <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.JScrollPaneSupportLayout"/> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/> <SubComponents> - <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="4"> - <Column editable="false" title="Level" type="java.lang.Integer"> - <Data value="1"/> - <Data value="2"/> - <Data value="3"/> - <Data value="4"/> - </Column> - <Column editable="false" title="Class" type="java.lang.Object"/> - <Column editable="false" title="Skill Points" type="java.lang.Integer"/> - <Column editable="false" title="Points Left" type="java.lang.Integer"/> - </Table> - </Property> - </Properties> - </Component> + <Container class="javax.swing.JScrollPane" name="jScrollPane1"> + <AuxValues> + <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> + <SubComponents> + <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="4"> + <Column editable="false" title="Level" type="java.lang.Integer"> + <Data value="1"/> + <Data value="2"/> + <Data value="3"/> + <Data value="4"/> + </Column> + <Column editable="false" title="Class" type="java.lang.Object"/> + <Column editable="false" title="Skill Points" type="java.lang.Integer"/> + <Column editable="false" title="Points Left" type="java.lang.Integer"/> + </Table> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> </SubComponents> </Container> </SubComponents> Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java 2008-07-19 05:33:15 UTC (rev 7193) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java 2008-07-19 08:00:00 UTC (rev 7194) @@ -29,6 +29,7 @@ jPanel1 = new javax.swing.JPanel(); flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); infoPane1 = new pcgen.gui.tools.InfoPane(); + jPanel2 = new javax.swing.JPanel(); jScrollPane1 = new javax.swing.JScrollPane(); jTable1 = new javax.swing.JTable(); @@ -75,8 +76,10 @@ }); jScrollPane1.setViewportView(jTable1); - flippingSplitPane2.setRightComponent(jScrollPane1); + jPanel2.add(jScrollPane1); + flippingSplitPane2.setRightComponent(jPanel2); + flippingSplitPane1.setRightComponent(flippingSplitPane2); add(flippingSplitPane1, java.awt.BorderLayout.CENTER); @@ -88,6 +91,7 @@ private pcgen.gui.util.panes.FlippingSplitPane flippingSplitPane2; private pcgen.gui.tools.InfoPane infoPane1; private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel2; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTable jTable1; // End of variables declaration//GEN-END:variables This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-20 23:18:03
|
Revision: 7211 http://pcgen.svn.sourceforge.net/pcgen/?rev=7211&view=rev Author: cpmeister Date: 2008-07-20 23:16:22 +0000 (Sun, 20 Jul 2008) Log Message: ----------- Added editing support to the TreeView API Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeTable.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataView.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataViewColumn.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/DefaultDataViewColumn.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/tabs/AbstractChooserTab.java Deleted: branches/cdomui/code/src/java/pcgen/gui/tabs/AbstractChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/AbstractChooserTab.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/AbstractChooserTab.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -1,70 +0,0 @@ -/* - * AbstractChooserTab.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 Jun 27, 2008, 12:53:57 PM - */ -package pcgen.gui.tabs; - -import java.awt.Component; -import pcgen.gui.tools.InfoPane; -import pcgen.gui.util.panes.FlippingSplitPane; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public abstract class AbstractChooserTab extends FlippingSplitPane -{ - - private FlippingSplitPane subSplitPane; - private InfoPane infoPane; - - protected AbstractChooserTab() - { - this.subSplitPane = new FlippingSplitPane(VERTICAL_SPLIT); - this.infoPane = new InfoPane(); - - subSplitPane.setTopComponent(infoPane); - setRightComponent(subSplitPane); - - setDividerSize(7); - setContinuousLayout(true); - setOneTouchExpandable(true); - } - - public void setPrimaryChooserComponent(Component c) - { - setLeftComponent(c); - } - - public void setSecondaryChooserComponent(Component c) - { - subSplitPane.setBottomComponent(c); - } - - public void setInfoPaneText(String text) - { - infoPane.setText(text); - } - - public void setInfoPaneTitle(String title) - { - infoPane.setTitle(title); - } - -} Copied: branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java (from rev 7177, branches/cdomui/code/src/java/pcgen/gui/tabs/AbstractChooserTab.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -0,0 +1,70 @@ +/* + * ChooserPane.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 Jun 27, 2008, 12:53:57 PM + */ +package pcgen.gui.tabs; + +import java.awt.Component; +import pcgen.gui.tools.InfoPane; +import pcgen.gui.util.panes.FlippingSplitPane; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class ChooserPane extends FlippingSplitPane +{ + + private FlippingSplitPane subSplitPane; + private InfoPane infoPane; + + protected ChooserPane() + { + this.subSplitPane = new FlippingSplitPane(VERTICAL_SPLIT); + this.infoPane = new InfoPane(); + + subSplitPane.setTopComponent(infoPane); + setRightComponent(subSplitPane); + + setDividerSize(7); + setContinuousLayout(true); + setOneTouchExpandable(true); + } + + public void setPrimaryChooserComponent(Component c) + { + setLeftComponent(c); + } + + public void setSecondaryChooserComponent(Component c) + { + subSplitPane.setBottomComponent(c); + } + + public void setInfoPaneText(String text) + { + infoPane.setText(text); + } + + public void setInfoPaneTitle(String title) + { + infoPane.setTitle(title); + } + +} Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -60,7 +60,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class ClassInfoTab extends AbstractChooserTab implements CharacterInfoTab +public class ClassInfoTab extends ChooserPane implements CharacterInfoTab { private final FilteredTreeViewPanel treeviewDisplay; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -26,6 +26,7 @@ import java.util.Hashtable; import java.util.List; import javax.swing.AbstractCellEditor; +import javax.swing.AbstractSpinnerModel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSpinner; @@ -51,7 +52,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class SkillInfoTab extends AbstractChooserTab implements CharacterInfoTab +public class SkillInfoTab extends ChooserPane implements CharacterInfoTab { private final JTable skillcostTable; @@ -146,7 +147,7 @@ private class SkillDataView implements DataView<SkillFacade> { - public List<?> getData(SkillFacade obj) + public List<?> getDataList(SkillFacade obj) { throw new UnsupportedOperationException("Not supported yet."); } @@ -156,6 +157,11 @@ throw new UnsupportedOperationException("Not supported yet."); } + public void setData(SkillFacade obj, int column, Object data) + { + throw new UnsupportedOperationException("Not supported yet."); + } + } } @@ -321,6 +327,31 @@ } + private static class SkillRankSpinnerModel extends AbstractSpinnerModel + { + + public Object getValue() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void setValue(Object value) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Object getNextValue() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Object getPreviousValue() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + } + private static class TableCellSpinnerEditor extends AbstractCellEditor implements TableCellEditor { Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -51,7 +51,7 @@ import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.AbilityFacade; import pcgen.gui.facade.CharacterFacade; -import pcgen.gui.tabs.AbstractChooserTab; +import pcgen.gui.tabs.ChooserPane; import pcgen.gui.tools.FilterableTreeViewModel; import pcgen.gui.tools.FilteredTreeViewPanel; import pcgen.gui.util.DefaultGenericListModel; @@ -67,7 +67,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class AbilityChooserTab extends AbstractChooserTab +public class AbilityChooserTab extends ChooserPane { private static final DataView<AbilityFacade> abilityDataView = new DataView<AbilityFacade>() @@ -90,7 +90,7 @@ return dataColumns; } - public List<?> getData(AbilityFacade obj) + public List<?> getDataList(AbilityFacade obj) { return Arrays.asList(getTypes(obj.getTypes()), obj.isMult(), @@ -109,6 +109,11 @@ return ret; } + public void setData(AbilityFacade obj, int column, Object data) + { + throw new UnsupportedOperationException("Not supported yet."); + } + }; private final FilteredTreeViewPanel availableTreeViewPanel; private final FilteredTreeViewPanel selectedTreeViewPanel; Modified: branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -161,7 +161,7 @@ private static class DateView implements DataView<Date> { - public List<?> getData(Date obj) + public List<?> getDataList(Date obj) { Calendar cal = Calendar.getInstance(); cal.setTime(obj); @@ -179,6 +179,11 @@ Integer.class)); } + public void setData(Date obj, int column, Object data) + { + throw new UnsupportedOperationException("Not supported yet."); + } + } private static enum DateTree implements TreeView<Date> Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeTable.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeTable.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeTable.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -294,7 +294,8 @@ * @author Scott Violet */ private static class TreeTableModelAdapter extends AbstractTableModel - implements SortableTableModel, TreeModelListener, TreeExpansionListener + implements SortableTableModel, TreeModelListener, + TreeExpansionListener { private JTree tree; @@ -542,14 +543,11 @@ * @return Component **/ public Component getTableCellRendererComponent(JTable table, - - @SuppressWarnings("unused") Object value, - boolean isSelected, - - @SuppressWarnings("unused") boolean hasFocus, - int row, - - @SuppressWarnings("unused") int column) + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) { if (isSelected) { Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataView.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataView.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataView.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -29,8 +29,10 @@ public interface DataView<E> { - List<?> getData(E obj); + List<?> getDataList(E obj); List<? extends DataViewColumn> getDataColumns(); + void setData(E obj, int column, Object data); + } Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataViewColumn.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataViewColumn.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataViewColumn.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -39,6 +39,12 @@ public Class<?> getDataClass(); + /** + * + * @return the column's visibility in the JTreePan + */ public Visibility getVisibility(); + public boolean isEditable(); + } Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/DefaultDataViewColumn.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/DefaultDataViewColumn.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/DefaultDataViewColumn.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -30,6 +30,7 @@ private String name; private Class<?> dataclass; private Visibility visibility; + private boolean editable; public DefaultDataViewColumn(String name, Class<?> dataclass) { @@ -39,8 +40,15 @@ public DefaultDataViewColumn(String name, Class<?> dataclass, boolean visible) { + + } + + public DefaultDataViewColumn(String name, Class<?> dataclass, + boolean visible, boolean editable) + { this.name = name; this.dataclass = dataclass; + this.editable = editable; if (visible) { this.visibility = Visibility.INITIALLY_VISIBLE; @@ -66,4 +74,9 @@ return visibility; } + public boolean isEditable() + { + return editable; + } + } Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java 2008-07-20 22:51:39 UTC (rev 7210) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java 2008-07-20 23:16:22 UTC (rev 7211) @@ -76,6 +76,11 @@ return Visibility.ALWAYS_VISIBLE; } + public boolean isEditable() + { + return true; + } + }; protected final Map<E, List<?>> dataMap = new HashMap<E, List<?>>(); protected final List<? extends DataViewColumn> datacolumns; @@ -114,7 +119,7 @@ { if (!dataMap.containsKey(obj)) { - dataMap.put(obj, dataview.getData(obj)); + dataMap.put(obj, dataview.getDataList(obj)); } } } @@ -164,6 +169,17 @@ return getDataColumn(column).getName(); } + @Override + public boolean isCellEditable(Object node, int column) + { + if (getDataColumn(column).isEditable()) + { + return column == 0 || + dataMap.containsKey(((TreeViewNode) node).getUserObject()); + } + return false; + } + private DataViewColumn getDataColumn(int column) { switch (column) @@ -213,7 +229,7 @@ if (childValue != null) { ListMap<Object, TreeViewPath<? super E>, Vector<TreeViewPath<? super E>>> vectorMap = CollectionMaps.createListMap(HashMap.class, - Vector.class); + Vector.class); Vector<TreeViewPath<? super E>> vector = (Vector<TreeViewPath<? super E>>) childValue; for (TreeViewPath<? super E> path : vector) { @@ -290,9 +306,10 @@ return null; } + @SuppressWarnings("unchecked") public void setValueAt(Object value, int column) { - throw new UnsupportedOperationException("Not supported yet."); + dataview.setData((E) userObject, column, value); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-21 07:30:17
|
Revision: 7213 http://pcgen.svn.sourceforge.net/pcgen/?rev=7213&view=rev Author: cpmeister Date: 2008-07-21 07:27:56 +0000 (Mon, 21 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java branches/cdomui/code/src/java/pcgen/gui/facade/SkillFacade.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataView.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/DefaultDataViewColumn.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModel.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModelWrapper.java branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java Modified: branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -23,8 +23,10 @@ import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.AbilityFacade; import pcgen.gui.facade.CharacterFacade; +import pcgen.gui.facade.SkillFacade; import pcgen.gui.filter.NamedFilter; import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.util.GenericListModel; /** * @@ -48,9 +50,14 @@ } public static DefaultGenericListModel<AbilityFacade> getRegisteredAbilities(CharacterFacade character, - AbilityCatagoryFacade catagory) + AbilityCatagoryFacade catagory) { return null; } + public static GenericListModel<SkillFacade> getRegisteredSkills(CharacterFacade character) + { + return null; + } + } Modified: branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/facade/CharacterFacade.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -60,6 +60,10 @@ public void setRemainingSelection(AbilityCatagoryFacade catagory, int remaining); - public int getSkillCost(ClassFacade c, SkillFacade skill); + public int getSkillTotal(SkillFacade skill); + public int getSkillModifier(SkillFacade skill); + + public float getSkillRanks(SkillFacade skill); + } Modified: branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -20,6 +20,8 @@ */ package pcgen.gui.facade; +import pcgen.cdom.enumeration.SkillCost; + /** * * @author Connor Petty <cpm...@us...> @@ -31,6 +33,8 @@ public ClassFacade getSelectedClass(); + public SkillCost getSkillCost(SkillFacade skill); + public int getGainedSkillPoints(); public void setGainedSkillPoints(int points); Modified: branches/cdomui/code/src/java/pcgen/gui/facade/SkillFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/SkillFacade.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/facade/SkillFacade.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -18,13 +18,23 @@ * * Created on Jul 10, 2008, 8:42:54 PM */ - package pcgen.gui.facade; /** * * @author Connor Petty <cpm...@us...> */ -public interface SkillFacade { +public interface SkillFacade +{ + public boolean isUntrained(); + + public String getType(); + + public String getKeyStat(); + + public String getInfo(); + + public String getSource(); + } Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -23,6 +23,7 @@ import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; +import java.util.Arrays; import java.util.Hashtable; import java.util.List; import javax.swing.AbstractCellEditor; @@ -37,6 +38,8 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; +import pcgen.cdom.enumeration.SkillCost; +import pcgen.gui.PCGenUIManager; import pcgen.gui.facade.CharacterFacade; import pcgen.gui.facade.CharacterLevelFacade; import pcgen.gui.facade.ClassFacade; @@ -46,7 +49,9 @@ import pcgen.gui.util.GenericListModel; import pcgen.gui.util.treeview.DataView; import pcgen.gui.util.treeview.DataViewColumn; +import pcgen.gui.util.treeview.DefaultDataViewColumn; import pcgen.gui.util.treeview.TreeView; +import pcgen.gui.util.treeview.TreeViewPath; /** * @@ -104,19 +109,111 @@ throw new UnsupportedOperationException("Not supported yet."); } - private static final class SkillTreeViewModel implements FilterableTreeViewModel<SkillFacade> + private static final class SkillTreeViewModel implements FilterableTreeViewModel<SkillFacade>, + DataView<SkillFacade> { + private GenericListModel<SkillFacade> model; + private enum SkillTreeView implements TreeView<SkillFacade> + { + + NAME("Name"), + TYPE_NAME("Type/Name"), + KEYSTAT_NAME("Key Stat/Name"), + KEYSTAT_TYPE_NAME("Key Stat/Type/Name"); + private String name; + + private SkillTreeView(String name) + { + this.name = name; + } + + public String getViewName() + { + return name; + } + + @SuppressWarnings("unchecked") + public List<TreeViewPath<SkillFacade>> getPaths(SkillFacade pobj) + { + TreeViewPath<SkillFacade> path; + switch (this) + { + case NAME: + path = new TreeViewPath<SkillFacade>(pobj); + break; + case TYPE_NAME: + path = new TreeViewPath<SkillFacade>(pobj, + pobj.getType()); + break; + case KEYSTAT_NAME: + path = new TreeViewPath<SkillFacade>(pobj, + pobj.getKeyStat()); + break; + case KEYSTAT_TYPE_NAME: + path = new TreeViewPath<SkillFacade>(pobj, + pobj.getKeyStat(), + pobj.getType()); + break; + default: + throw new InternalError(); + } + return Arrays.asList(path); + } + + } + private final TreeView<SkillFacade> COST_NAME = new TreeView<SkillFacade>() + { + + public String getViewName() + { + return "Cost/Name"; + } + + @SuppressWarnings("unchecked") + public List<TreeViewPath<SkillFacade>> getPaths(SkillFacade pobj) + { + return Arrays.asList(new TreeViewPath<SkillFacade>(pobj, + level.getSkillCost(pobj))); + } + + }; + private final TreeView<SkillFacade> COST_TYPE_NAME = new TreeView<SkillFacade>() + { + + public String getViewName() + { + return "Cost/Type/Name"; + } + + @SuppressWarnings("unchecked") + public List<TreeViewPath<SkillFacade>> getPaths(SkillFacade pobj) + { + return Arrays.asList(new TreeViewPath<SkillFacade>(pobj, + level.getSkillCost(pobj), + pobj.getType())); + } + + }; + private static final List<? extends DataViewColumn> columns = Arrays.asList( + new DefaultDataViewColumn("Total", Integer.class, true), + new DefaultDataViewColumn("Modifier", Integer.class, true), + new DefaultDataViewColumn("Ranks", Float.class, true, true), + new DefaultDataViewColumn("Skill Cost", SkillCost.class, + true), + new DefaultDataViewColumn("Source", String.class)); private CharacterFacade character; + private CharacterLevelFacade level; public SkillTreeViewModel(CharacterFacade character) { this.character = character; + this.model = PCGenUIManager.getRegisteredSkills(character); } - public void setClass(ClassFacade c) + public void setCharacterLevel(CharacterLevelFacade level) { - + this.level = level; } public Class<SkillFacade> getFilterClass() @@ -124,45 +221,45 @@ return SkillFacade.class; } - public List<? extends TreeView<SkillFacade>> getTreeViews() + public List<?> getData(SkillFacade obj) { - throw new UnsupportedOperationException("Not supported yet."); + return Arrays.asList( + character.getSkillTotal(obj), + character.getSkillModifier(obj), + Float.valueOf(character.getSkillRanks(obj)), + level.getSkillCost(obj), + obj.getSource()); } - public int getDefaultTreeViewIndex() + public List<? extends DataViewColumn> getDataColumns() { - throw new UnsupportedOperationException("Not supported yet."); + return columns; } public DataView<SkillFacade> getDataView() { - throw new UnsupportedOperationException("Not supported yet."); + return this; } - public DefaultGenericListModel<SkillFacade> getDataModel() + @SuppressWarnings("unchecked") + public List<? extends TreeView<SkillFacade>> getTreeViews() { - throw new UnsupportedOperationException("Not supported yet."); + return Arrays.asList(SkillTreeView.NAME, SkillTreeView.TYPE_NAME, + SkillTreeView.KEYSTAT_NAME, + SkillTreeView.KEYSTAT_TYPE_NAME, COST_NAME, + COST_TYPE_NAME); } - private class SkillDataView implements DataView<SkillFacade> + public int getDefaultTreeViewIndex() { + return 0; + } - public List<?> getDataList(SkillFacade obj) - { - throw new UnsupportedOperationException("Not supported yet."); - } + public DefaultGenericListModel<SkillFacade> getDataModel() + { + throw new UnsupportedOperationException("Not supported yet."); + } - public List<? extends DataViewColumn> getDataColumns() - { - throw new UnsupportedOperationException("Not supported yet."); - } - - public void setData(SkillFacade obj, int column, Object data) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - } } private static class SkillCostTableModel extends AbstractTableModel Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -90,7 +90,7 @@ return dataColumns; } - public List<?> getDataList(AbilityFacade obj) + public List<?> getData(AbilityFacade obj) { return Arrays.asList(getTypes(obj.getTypes()), obj.isMult(), @@ -109,11 +109,6 @@ return ret; } - public void setData(AbilityFacade obj, int column, Object data) - { - throw new UnsupportedOperationException("Not supported yet."); - } - }; private final FilteredTreeViewPanel availableTreeViewPanel; private final FilteredTreeViewPanel selectedTreeViewPanel; Modified: branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/test/UtilitiesTester.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -161,7 +161,7 @@ private static class DateView implements DataView<Date> { - public List<?> getDataList(Date obj) + public List<?> getData(Date obj) { Calendar cal = Calendar.getInstance(); cal.setTime(obj); Modified: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -30,6 +30,7 @@ import pcgen.gui.filter.Filter; import pcgen.gui.filter.FilterPanel; import pcgen.gui.filter.FilterPanelListener; +import pcgen.gui.util.GenericListModelWrapper; import pcgen.gui.util.JTreeViewPane; import pcgen.gui.util.SwingWorker; import pcgen.gui.util.event.GenericListDataEvent; @@ -124,7 +125,7 @@ } private class TreeViewDisplay<E> extends TreeViewModelWrapper<E> - implements FilterPanelListener, GenericListDataListener + implements FilterPanelListener, GenericListDataListener<E> { public TreeViewDisplay(TreeViewModel<E> model) @@ -156,7 +157,9 @@ public void applyFilter(Filter filter, boolean quicksearch) { - new FilterUpdater(dataModel, treeviewModel.getDataModel(), filter, + new FilterUpdater(dataModel, + new GenericListModelWrapper<E>(treeviewModel.getDataModel()), + filter, quicksearch).start(); } Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataView.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataView.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/DataView.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -29,10 +29,14 @@ public interface DataView<E> { - List<?> getDataList(E obj); + /** + * Note: If any of the returned data is editable, make sure that the returned + * list is editable as well. + * @param obj + * @return + */ + List<?> getData(E obj); List<? extends DataViewColumn> getDataColumns(); - void setData(E obj, int column, Object data); - } Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/DefaultDataViewColumn.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/DefaultDataViewColumn.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/DefaultDataViewColumn.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -34,13 +34,13 @@ public DefaultDataViewColumn(String name, Class<?> dataclass) { - this(name, dataclass, false); + this(name, dataclass, false, false); } public DefaultDataViewColumn(String name, Class<?> dataclass, boolean visible) { - + this(name, dataclass, visible, false); } public DefaultDataViewColumn(String name, Class<?> dataclass, Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModel.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModel.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -21,7 +21,7 @@ package pcgen.gui.util.treeview; import java.util.List; -import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.util.GenericListModel; /** * @@ -36,6 +36,6 @@ DataView<E> getDataView(); - DefaultGenericListModel<E> getDataModel(); + GenericListModel<E> getDataModel(); } Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModelWrapper.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModelWrapper.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewModelWrapper.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -22,6 +22,7 @@ import java.util.List; import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.util.GenericListModelWrapper; /** * @@ -36,7 +37,7 @@ public TreeViewModelWrapper(TreeViewModel<E> treeviewModel) { this(treeviewModel, new DefaultGenericListModel<E>()); - dataModel.addAll(treeviewModel.getDataModel()); + dataModel.addAll(new GenericListModelWrapper<E>(treeviewModel.getDataModel())); } public TreeViewModelWrapper(TreeViewModel<E> treeviewModel, Modified: branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java 2008-07-21 01:54:02 UTC (rev 7212) +++ branches/cdomui/code/src/java/pcgen/gui/util/treeview/TreeViewTableModel.java 2008-07-21 07:27:56 UTC (rev 7213) @@ -30,7 +30,8 @@ import javax.swing.JTree; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.GenericListModelWrapper; import pcgen.gui.util.event.ListDataAdapter; import pcgen.gui.util.treetable.AbstractTreeTableModel; import pcgen.gui.util.treetable.SortableTreeTableModel; @@ -54,7 +55,7 @@ @Override public void listDataChanged(ListDataEvent e) { - setData(model); + setData(new GenericListModelWrapper<E>(model)); } }; @@ -85,7 +86,7 @@ protected final Map<E, List<?>> dataMap = new HashMap<E, List<?>>(); protected final List<? extends DataViewColumn> datacolumns; protected final DataView<E> dataview; - private DefaultGenericListModel<E> model = null; + private GenericListModel<E> model = null; private TreeView<? super E> selectedView = null; public TreeViewTableModel(DataView<E> dataView) @@ -94,7 +95,7 @@ this.datacolumns = dataview.getDataColumns(); } - public final void setDataModel(DefaultGenericListModel<E> model) + public final void setDataModel(GenericListModel<E> model) { if (this.model != null) { @@ -102,26 +103,21 @@ } this.model = model; model.addListDataListener(listener); - setData(model); + setData(new GenericListModelWrapper<E>(model)); } private void setData(Collection<E> data) { - populateDataMap(data); - viewMap.clear(); - setSelectedTreeView(selectedView); - } - - private void populateDataMap(Collection<E> data) - { dataMap.keySet().retainAll(data); for (E obj : data) { if (!dataMap.containsKey(obj)) { - dataMap.put(obj, dataview.getDataList(obj)); + dataMap.put(obj, dataview.getData(obj)); } } + viewMap.clear(); + setSelectedTreeView(selectedView); } public final TreeView<? super E> getSelectedTreeView() @@ -299,7 +295,7 @@ return userObject; } List<?> data = dataMap.get(userObject); - if (data != null && data.size() >= column) + if (data != null && column <= data.size()) { return data.get(column - 1); } @@ -309,7 +305,8 @@ @SuppressWarnings("unchecked") public void setValueAt(Object value, int column) { - dataview.setData((E) userObject, column, value); + List data = dataMap.get(value); + data.set(column - 1, value); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-21 21:17:20
|
Revision: 7217 http://pcgen.svn.sourceforge.net/pcgen/?rev=7217&view=rev Author: cpmeister Date: 2008-07-21 21:17:26 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Refactoring Modified 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/tabs/ClassInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/filter/FilterableTreeViewModel.java branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java branches/cdomui/code/src/java/pcgen/gui/tools/FilterableTreeViewModel.java branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java Modified: branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.form 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.form 2008-07-21 21:17:26 UTC (rev 7217) @@ -42,7 +42,7 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> <SubComponents> - <Component class="pcgen.gui.tools.InfoPane" name="infoPane1"> + <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"/> @@ -142,4 +142,4 @@ </Constraints> </Component> </SubComponents> -</Form> +</Form> \ No newline at end of file Modified: branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -28,7 +28,7 @@ flippingSplitPane1 = new pcgen.gui.util.panes.FlippingSplitPane(); flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); - infoPane1 = new pcgen.gui.tools.InfoPane(); + infoPane1 = new pcgen.gui.util.panes.InfoPane(); jPanel1 = new javax.swing.JPanel(); jSeparator1 = new javax.swing.JSeparator(); jLabel1 = new javax.swing.JLabel(); @@ -98,7 +98,7 @@ // 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 pcgen.gui.util.panes.InfoPane infoPane1; private javax.swing.JButton jButton1; private javax.swing.JButton jButton2; private javax.swing.JButton jButton3; Copied: branches/cdomui/code/src/java/pcgen/gui/filter/FilterableTreeViewModel.java (from rev 7162, branches/cdomui/code/src/java/pcgen/gui/tools/FilterableTreeViewModel.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilterableTreeViewModel.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilterableTreeViewModel.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -0,0 +1,34 @@ +/* + * FilterableTreeViewModel.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 14, 2008, 9:15:34 PM + */ +package pcgen.gui.filter; + +import pcgen.gui.util.treeview.TreeViewModel; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface FilterableTreeViewModel<E> extends TreeViewModel<E> +{ + + public Class<E> getFilterClass(); + +} Copied: branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java (from rev 7213, branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -0,0 +1,214 @@ +/* + * FilteredTreeViewPanel.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 Jun 22, 2008, 3:55:32 PM + */ +package pcgen.gui.filter; + +import java.awt.BorderLayout; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import javax.swing.JPanel; +import javax.swing.ListSelectionModel; +import javax.swing.TransferHandler; +import pcgen.gui.util.GenericListModelWrapper; +import pcgen.gui.util.JTreeViewPane; +import pcgen.gui.util.SwingWorker; +import pcgen.gui.util.event.GenericListDataEvent; +import pcgen.gui.util.event.GenericListDataListener; +import pcgen.gui.util.treeview.TreeViewModel; +import pcgen.gui.util.treeview.TreeViewModelWrapper; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class FilteredTreeViewPanel extends JPanel +{ + + private FilterPanel filterPanel; + private JTreeViewPane treeViewPane; + + public FilteredTreeViewPanel() + { + setLayout(new BorderLayout()); + + filterPanel = new FilterPanel(); + add(filterPanel, BorderLayout.PAGE_START); + + treeViewPane = new JTreeViewPane(); + add(treeViewPane, BorderLayout.CENTER); + } + + /** + * delegates to JTable.getSelectionModel() + * @return the row selection model + */ + public ListSelectionModel getSelectionModel() + { + return treeViewPane.getSelectionModel(); + } + + /** + * delegates to JTreeViewPane.getSelectedData() + * @param b + */ + public List<Object> getSelectedData() + { + return treeViewPane.getSelectedData(); + } + + /** + * delegates to JTablePane.getTransferHandler() + * @param b + */ + @Override + public TransferHandler getTransferHandler() + { + return treeViewPane.getTransferHandler(); + } + + /** + * delegates to JTablePane.setTransferHandler() + * @param b + */ + @Override + public void setTransferHandler(TransferHandler newHandler) + { + treeViewPane.setTransferHandler(newHandler); + } + + /** + * delegates to JTablePane.getDragEnabled() + * @param b + */ + public boolean getDragEnabled() + { + return treeViewPane.getDragEnabled(); + } + + /** + * delegates to JTablePane.setDragEnabled() + * @param b + */ + public void setDragEnabled(boolean b) + { + treeViewPane.setDragEnabled(b); + } + + public <T> void setTreeViewModel(FilterableTreeViewModel<T> model) + { + filterPanel.setFilterClass(model.getFilterClass()); + + TreeViewDisplay<T> displayModel = new TreeViewDisplay<T>(model); + treeViewPane.setTreeViewModel(displayModel); + filterPanel.setFilterPanelListener(displayModel); + } + + private class TreeViewDisplay<E> extends TreeViewModelWrapper<E> + implements FilterPanelListener, GenericListDataListener<E> + { + + public TreeViewDisplay(TreeViewModel<E> model) + { + super(model); + model.getDataModel().addGenericListDataListener(this); + } + + public void intervalRemoved(GenericListDataEvent e) + { + dataModel.removeAll(e.getData()); + } + + @SuppressWarnings("unchecked") + public void intervalAdded(GenericListDataEvent e) + { + List<E> sublist = dataModel.subList(dataModel.getSize(), + dataModel.getSize()); + new FilterUpdater(sublist, (List<E>) e.getData(), + filterPanel.getFilter(), + treeViewPane.getQuickSearchMode()).start(); + } + + public void contentsChanged(GenericListDataEvent e) + { + applyFilter(filterPanel.getFilter(), + treeViewPane.getQuickSearchMode()); + } + + public void applyFilter(Filter filter, boolean quicksearch) + { + new FilterUpdater(dataModel, + new GenericListModelWrapper<E>(treeviewModel.getDataModel()), + filter, + quicksearch).start(); + } + + private class FilterUpdater extends SwingWorker<List<E>> + { + + private Collection<E> baseData; + private Collection<E> modelData; + private boolean quicksearch; + private Filter filter; + + public FilterUpdater(Collection<E> modelData, + Collection<E> baseData, Filter filter, + boolean quicksearch) + { + this.baseData = baseData; + this.modelData = modelData; + this.filter = filter; + this.quicksearch = quicksearch; + } + + @Override + @SuppressWarnings("unchecked") + public List<E> construct() + { + List<E> data = new ArrayList<E>(); + for (E element : baseData) + { + if (filter.accept(element)) + { + data.add(element); + } + } + return data; + } + + @Override + public void finished() + { + List<E> value = getValue(); + if (value.size() != baseData.size()) + { + modelData.clear(); + treeViewPane.setQuickSearchMode(quicksearch); + modelData.addAll(value); + } + else + { + treeViewPane.setQuickSearchMode(quicksearch); + } + } + + } + } +} Deleted: branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -1,70 +0,0 @@ -/* - * ChooserPane.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 Jun 27, 2008, 12:53:57 PM - */ -package pcgen.gui.tabs; - -import java.awt.Component; -import pcgen.gui.tools.InfoPane; -import pcgen.gui.util.panes.FlippingSplitPane; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class ChooserPane extends FlippingSplitPane -{ - - private FlippingSplitPane subSplitPane; - private InfoPane infoPane; - - protected ChooserPane() - { - this.subSplitPane = new FlippingSplitPane(VERTICAL_SPLIT); - this.infoPane = new InfoPane(); - - subSplitPane.setTopComponent(infoPane); - setRightComponent(subSplitPane); - - setDividerSize(7); - setContinuousLayout(true); - setOneTouchExpandable(true); - } - - public void setPrimaryChooserComponent(Component c) - { - setLeftComponent(c); - } - - public void setSecondaryChooserComponent(Component c) - { - subSplitPane.setBottomComponent(c); - } - - public void setInfoPaneText(String text) - { - infoPane.setText(text); - } - - public void setInfoPaneTitle(String title) - { - infoPane.setTitle(title); - } - -} Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -20,6 +20,7 @@ */ package pcgen.gui.tabs; +import pcgen.gui.util.panes.ChooserPane; import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -52,7 +53,7 @@ import pcgen.gui.facade.CharacterFacade; import pcgen.gui.facade.CharacterLevelFacade; import pcgen.gui.facade.ClassFacade; -import pcgen.gui.tools.FilteredTreeViewPanel; +import pcgen.gui.filter.FilteredTreeViewPanel; import pcgen.gui.util.GenericListModel; import pcgen.util.PropertyFactory; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -20,6 +20,7 @@ */ package pcgen.gui.tabs; +import pcgen.gui.util.panes.ChooserPane; import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -44,8 +45,7 @@ import pcgen.gui.facade.CharacterLevelFacade; import pcgen.gui.facade.ClassFacade; import pcgen.gui.facade.SkillFacade; -import pcgen.gui.tools.FilterableTreeViewModel; -import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.filter.FilterableTreeViewModel; import pcgen.gui.util.GenericListModel; import pcgen.gui.util.treeview.DataView; import pcgen.gui.util.treeview.DataViewColumn; @@ -59,7 +59,7 @@ */ public class SkillInfoTab extends ChooserPane implements CharacterInfoTab { - +//private final FilterableTreeViewPane private final JTable skillcostTable; private final JTable skillpointTable; @@ -112,7 +112,6 @@ private static final class SkillTreeViewModel implements FilterableTreeViewModel<SkillFacade>, DataView<SkillFacade> { - private GenericListModel<SkillFacade> model; private enum SkillTreeView implements TreeView<SkillFacade> { @@ -208,7 +207,6 @@ public SkillTreeViewModel(CharacterFacade character) { this.character = character; - this.model = PCGenUIManager.getRegisteredSkills(character); } public void setCharacterLevel(CharacterLevelFacade level) @@ -255,9 +253,9 @@ return 0; } - public DefaultGenericListModel<SkillFacade> getDataModel() + public GenericListModel<SkillFacade> getDataModel() { - throw new UnsupportedOperationException("Not supported yet."); + return PCGenUIManager.getRegisteredSkills(character); } } Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form 2008-07-21 21:17:26 UTC (rev 7217) @@ -53,7 +53,7 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> <SubComponents> - <Component class="pcgen.gui.tools.InfoPane" name="infoPane1"> + <Component class="pcgen.gui.util.panes.InfoPane" name="infoPane1"> <Properties> <Property name="title" type="java.lang.String" value="Skill Info"/> </Properties> @@ -151,4 +151,4 @@ </SubComponents> </Container> </SubComponents> -</Form> +</Form> \ No newline at end of file Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -29,7 +29,7 @@ flippingSplitPane1 = new pcgen.gui.util.panes.FlippingSplitPane(); jPanel1 = new javax.swing.JPanel(); flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); - infoPane1 = new pcgen.gui.tools.InfoPane(); + infoPane1 = new pcgen.gui.util.panes.InfoPane(); jPanel2 = new javax.swing.JPanel(); jScrollPane2 = new javax.swing.JScrollPane(); jTable2 = new javax.swing.JTable(); @@ -129,7 +129,7 @@ // 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 pcgen.gui.util.panes.InfoPane infoPane1; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JScrollPane jScrollPane1; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -51,9 +51,9 @@ import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.AbilityFacade; import pcgen.gui.facade.CharacterFacade; -import pcgen.gui.tabs.ChooserPane; -import pcgen.gui.tools.FilterableTreeViewModel; -import pcgen.gui.tools.FilteredTreeViewPanel; +import pcgen.gui.util.panes.ChooserPane; +import pcgen.gui.filter.FilterableTreeViewModel; +import pcgen.gui.filter.FilteredTreeViewPanel; import pcgen.gui.util.DefaultGenericListModel; import pcgen.gui.util.GenericListModel; import pcgen.gui.util.GenericListModelWrapper; Deleted: branches/cdomui/code/src/java/pcgen/gui/tools/FilterableTreeViewModel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilterableTreeViewModel.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilterableTreeViewModel.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -1,34 +0,0 @@ -/* - * FilterableTreeViewModel.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 14, 2008, 9:15:34 PM - */ -package pcgen.gui.tools; - -import pcgen.gui.util.treeview.TreeViewModel; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public interface FilterableTreeViewModel<E> extends TreeViewModel<E> -{ - - public Class<E> getFilterClass(); - -} Deleted: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewPanel.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -1,217 +0,0 @@ -/* - * FilteredTreeViewPanel.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 Jun 22, 2008, 3:55:32 PM - */ -package pcgen.gui.tools; - -import java.awt.BorderLayout; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import javax.swing.JPanel; -import javax.swing.ListSelectionModel; -import javax.swing.TransferHandler; -import pcgen.gui.filter.Filter; -import pcgen.gui.filter.FilterPanel; -import pcgen.gui.filter.FilterPanelListener; -import pcgen.gui.util.GenericListModelWrapper; -import pcgen.gui.util.JTreeViewPane; -import pcgen.gui.util.SwingWorker; -import pcgen.gui.util.event.GenericListDataEvent; -import pcgen.gui.util.event.GenericListDataListener; -import pcgen.gui.util.treeview.TreeViewModel; -import pcgen.gui.util.treeview.TreeViewModelWrapper; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class FilteredTreeViewPanel extends JPanel -{ - - private FilterPanel filterPanel; - private JTreeViewPane treeViewPane; - - public FilteredTreeViewPanel() - { - setLayout(new BorderLayout()); - - filterPanel = new FilterPanel(); - add(filterPanel, BorderLayout.PAGE_START); - - treeViewPane = new JTreeViewPane(); - add(treeViewPane, BorderLayout.CENTER); - } - - /** - * delegates to JTable.getSelectionModel() - * @return the row selection model - */ - public ListSelectionModel getSelectionModel() - { - return treeViewPane.getSelectionModel(); - } - - /** - * delegates to JTreeViewPane.getSelectedData() - * @param b - */ - public List<Object> getSelectedData() - { - return treeViewPane.getSelectedData(); - } - - /** - * delegates to JTablePane.getTransferHandler() - * @param b - */ - @Override - public TransferHandler getTransferHandler() - { - return treeViewPane.getTransferHandler(); - } - - /** - * delegates to JTablePane.setTransferHandler() - * @param b - */ - @Override - public void setTransferHandler(TransferHandler newHandler) - { - treeViewPane.setTransferHandler(newHandler); - } - - /** - * delegates to JTablePane.getDragEnabled() - * @param b - */ - public boolean getDragEnabled() - { - return treeViewPane.getDragEnabled(); - } - - /** - * delegates to JTablePane.setDragEnabled() - * @param b - */ - public void setDragEnabled(boolean b) - { - treeViewPane.setDragEnabled(b); - } - - public <T> void setTreeViewModel(FilterableTreeViewModel<T> model) - { - filterPanel.setFilterClass(model.getFilterClass()); - - TreeViewDisplay<T> displayModel = new TreeViewDisplay<T>(model); - treeViewPane.setTreeViewModel(displayModel); - filterPanel.setFilterPanelListener(displayModel); - } - - private class TreeViewDisplay<E> extends TreeViewModelWrapper<E> - implements FilterPanelListener, GenericListDataListener<E> - { - - public TreeViewDisplay(TreeViewModel<E> model) - { - super(model); - model.getDataModel().addGenericListDataListener(this); - } - - public void intervalRemoved(GenericListDataEvent e) - { - dataModel.removeAll(e.getData()); - } - - @SuppressWarnings("unchecked") - public void intervalAdded(GenericListDataEvent e) - { - List<E> sublist = dataModel.subList(dataModel.getSize(), - dataModel.getSize()); - new FilterUpdater(sublist, (List<E>) e.getData(), - filterPanel.getFilter(), - treeViewPane.getQuickSearchMode()).start(); - } - - public void contentsChanged(GenericListDataEvent e) - { - applyFilter(filterPanel.getFilter(), - treeViewPane.getQuickSearchMode()); - } - - public void applyFilter(Filter filter, boolean quicksearch) - { - new FilterUpdater(dataModel, - new GenericListModelWrapper<E>(treeviewModel.getDataModel()), - filter, - quicksearch).start(); - } - - private class FilterUpdater extends SwingWorker<List<E>> - { - - private Collection<E> baseData; - private Collection<E> modelData; - private boolean quicksearch; - private Filter filter; - - public FilterUpdater(Collection<E> modelData, - Collection<E> baseData, Filter filter, - boolean quicksearch) - { - this.baseData = baseData; - this.modelData = modelData; - this.filter = filter; - this.quicksearch = quicksearch; - } - - @Override - @SuppressWarnings("unchecked") - public List<E> construct() - { - List<E> data = new ArrayList<E>(); - for (E element : baseData) - { - if (filter.accept(element)) - { - data.add(element); - } - } - return data; - } - - @Override - public void finished() - { - List<E> value = getValue(); - if (value.size() != baseData.size()) - { - modelData.clear(); - treeViewPane.setQuickSearchMode(quicksearch); - modelData.addAll(value); - } - else - { - treeViewPane.setQuickSearchMode(quicksearch); - } - } - - } - } -} Deleted: branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java 2008-07-21 18:31:51 UTC (rev 7216) +++ branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -1,79 +0,0 @@ -/* - * InfoPane.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 Jun 26, 2008, 9:32:04 PM - */ -package pcgen.gui.tools; - -import javax.swing.BorderFactory; -import javax.swing.JScrollPane; -import javax.swing.JTextPane; -import javax.swing.border.Border; -import javax.swing.border.TitledBorder; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class InfoPane extends JScrollPane -{ - - private JTextPane textPane; - private TitledBorder titledBorder; - - public InfoPane() - { - this("Info"); - } - - public InfoPane(String title) - { - super(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - this.titledBorder = BorderFactory.createTitledBorder(null, title, - TitledBorder.CENTER, - TitledBorder.DEFAULT_POSITION); - this.textPane = new JTextPane(); - initComponents(); - } - - private void initComponents() - { - setBorder(BorderFactory.createCompoundBorder(titledBorder, getBorder())); - - textPane.setEditable(false); - setViewportView(textPane); - } - - public String getTitle() - { - return titledBorder.getTitle(); - } - - public void setTitle(String title) - { - titledBorder.setTitle(title); - validate(); - } - - public void setText(String text) - { - textPane.setText(text); - } - -} Copied: branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java (from rev 7211, branches/cdomui/code/src/java/pcgen/gui/tabs/ChooserPane.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -0,0 +1,68 @@ +/* + * ChooserPane.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 Jun 27, 2008, 12:53:57 PM + */ +package pcgen.gui.util.panes; + +import java.awt.Component; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class ChooserPane extends FlippingSplitPane +{ + + private FlippingSplitPane subSplitPane; + private InfoPane infoPane; + + protected ChooserPane() + { + this.subSplitPane = new FlippingSplitPane(VERTICAL_SPLIT); + this.infoPane = new InfoPane(); + + subSplitPane.setTopComponent(infoPane); + setRightComponent(subSplitPane); + + setDividerSize(7); + setContinuousLayout(true); + setOneTouchExpandable(true); + } + + public void setPrimaryChooserComponent(Component c) + { + setLeftComponent(c); + } + + public void setSecondaryChooserComponent(Component c) + { + subSplitPane.setBottomComponent(c); + } + + public void setInfoPaneText(String text) + { + infoPane.setText(text); + } + + public void setInfoPaneTitle(String title) + { + infoPane.setTitle(title); + } + +} Copied: branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java (from rev 7177, branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java 2008-07-21 21:17:26 UTC (rev 7217) @@ -0,0 +1,78 @@ +/* + * InfoPane.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 Jun 26, 2008, 9:32:04 PM + */ +package pcgen.gui.util.panes; + +import javax.swing.BorderFactory; +import javax.swing.JScrollPane; +import javax.swing.JTextPane; +import javax.swing.border.TitledBorder; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class InfoPane extends JScrollPane +{ + + private JTextPane textPane; + private TitledBorder titledBorder; + + public InfoPane() + { + this("Info"); + } + + public InfoPane(String title) + { + super(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + this.titledBorder = BorderFactory.createTitledBorder(null, title, + TitledBorder.CENTER, + TitledBorder.DEFAULT_POSITION); + this.textPane = new JTextPane(); + initComponents(); + } + + private void initComponents() + { + setBorder(BorderFactory.createCompoundBorder(titledBorder, getBorder())); + + textPane.setEditable(false); + setViewportView(textPane); + } + + public String getTitle() + { + return titledBorder.getTitle(); + } + + public void setTitle(String title) + { + titledBorder.setTitle(title); + validate(); + } + + public void setText(String text) + { + textPane.setText(text); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-21 21:19:59
|
Revision: 7218 http://pcgen.svn.sourceforge.net/pcgen/?rev=7218&view=rev Author: cpmeister Date: 2008-07-21 21:20:07 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Refactoring Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/core/ branches/cdomui/code/src/java/pcgen/gui/editor/ branches/cdomui/code/src/java/pcgen/gui/tools/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-21 21:22:18
|
Revision: 7219 http://pcgen.svn.sourceforge.net/pcgen/?rev=7219&view=rev Author: cpmeister Date: 2008-07-21 21:22:25 +0000 (Mon, 21 Jul 2008) Log Message: ----------- Refactoring Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java Copied: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form (from rev 7217, branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form 2008-07-21 21:22:25 UTC (rev 7219) @@ -0,0 +1,154 @@ +<?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,-60,0,0,2,31"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <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.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> + <SubComponents> + <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> + <Container class="pcgen.gui.util.panes.FlippingSplitPane" name="flippingSplitPane2"> + <Properties> + <Property name="dividerSize" type="int" value="7"/> + <Property name="orientation" type="int" value="0"/> + <Property name="continuousLayout" type="boolean" value="true"/> + <Property name="oneTouchExpandable" type="boolean" value="true"/> + </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"> + <Properties> + <Property name="title" type="java.lang.String" value="Skill Info"/> + </Properties> + <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> + <Container class="javax.swing.JPanel" name="jPanel2"> + <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.DesignGridBagLayout"/> + <SubComponents> + <Container class="javax.swing.JScrollPane" name="jScrollPane2"> + <Properties> + <Property name="horizontalScrollBarPolicy" type="int" value="31"/> + <Property name="verticalScrollBarPolicy" type="int" value="21"/> + </Properties> + <AuxValues> + <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + </AuxValues> + <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="60" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> + <SubComponents> + <Component class="javax.swing.JTable" name="jTable2"> + <Properties> + <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor"> + <Table columnCount="3" rowCount="3"> + <Column editable="true" title="Skill Cost" type="java.lang.String"> + <Data value="Class"/> + <Data value="Cross-Class"/> + <Data value="Exclusive"/> + </Column> + <Column editable="true" title="Rank Cost" type="java.lang.Integer"> + <Data value="1"/> + <Data value="2"/> + <Data value="0"/> + </Column> + <Column editable="true" title="Max Ranks" type="java.lang.Double"> + <Data value="7.0"/> + <Data value="3.5"/> + <Data value="0.0"/> + </Column> + </Table> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JScrollPane" name="jScrollPane1"> + <AuxValues> + <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + </AuxValues> + <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="1.0" weightY="1.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> + <SubComponents> + <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="4"> + <Column editable="false" title="Level" type="java.lang.Integer"> + <Data value="1"/> + <Data value="2"/> + <Data value="3"/> + <Data value="4"/> + </Column> + <Column editable="false" title="Class" type="java.lang.Object"/> + <Column editable="false" title="Skill Points" type="java.lang.Integer"/> + <Column editable="false" title="Points Left" type="java.lang.Integer"/> + </Table> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> + </SubComponents> + </Container> + </SubComponents> + </Container> + </SubComponents> + </Container> + </SubComponents> +</Form> Copied: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java (from rev 7217, branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java 2008-07-21 21:22:25 UTC (rev 7219) @@ -0,0 +1,141 @@ +/* + * SkillsTab.java + * + * Created on June 26, 2008, 8:49 PM + */ + +package pcgen.gui.proto.tabs; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class SkillsTab extends javax.swing.JPanel { + + /** Creates new form SkillsTab */ + public SkillsTab() { + 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(); + jPanel1 = new javax.swing.JPanel(); + flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); + infoPane1 = new pcgen.gui.util.panes.InfoPane(); + jPanel2 = new javax.swing.JPanel(); + jScrollPane2 = new javax.swing.JScrollPane(); + jTable2 = new javax.swing.JTable(); + jScrollPane1 = new javax.swing.JScrollPane(); + jTable1 = new javax.swing.JTable(); + + setLayout(new java.awt.BorderLayout()); + + flippingSplitPane1.setDividerSize(7); + flippingSplitPane1.setContinuousLayout(true); + flippingSplitPane1.setOneTouchExpandable(true); + flippingSplitPane1.setLeftComponent(jPanel1); + + flippingSplitPane2.setDividerSize(7); + flippingSplitPane2.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); + flippingSplitPane2.setContinuousLayout(true); + flippingSplitPane2.setOneTouchExpandable(true); + + infoPane1.setTitle("Skill Info"); + flippingSplitPane2.setTopComponent(infoPane1); + + jPanel2.setLayout(new java.awt.GridBagLayout()); + + jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + jScrollPane2.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + + jTable2.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {"Class", new Integer(1), new Double(7.0)}, + {"Cross-Class", new Integer(2), new Double(3.5)}, + {"Exclusive", new Integer(0), new Double(0.0)} + }, + new String [] { + "Skill Cost", "Rank Cost", "Max Ranks" + } + ) { + Class[] types = new Class [] { + java.lang.String.class, java.lang.Integer.class, java.lang.Double.class + }; + + public Class getColumnClass(int columnIndex) { + return types [columnIndex]; + } + }); + jScrollPane2.setViewportView(jTable2); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.ipady = 60; + gridBagConstraints.weightx = 1.0; + jPanel2.add(jScrollPane2, gridBagConstraints); + + jTable1.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {new Integer(1), null, null, null}, + {new Integer(2), null, null, null}, + {new Integer(3), null, null, null}, + {new Integer(4), null, null, null} + }, + new String [] { + "Level", "Class", "Skill Points", "Points Left" + } + ) { + Class[] types = new Class [] { + java.lang.Integer.class, java.lang.Object.class, java.lang.Integer.class, java.lang.Integer.class + }; + boolean[] canEdit = new boolean [] { + false, false, false, false + }; + + public Class getColumnClass(int columnIndex) { + return types [columnIndex]; + } + + public boolean isCellEditable(int rowIndex, int columnIndex) { + return canEdit [columnIndex]; + } + }); + jScrollPane1.setViewportView(jTable1); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.weighty = 1.0; + jPanel2.add(jScrollPane1, gridBagConstraints); + + flippingSplitPane2.setRightComponent(jPanel2); + + flippingSplitPane1.setRightComponent(flippingSplitPane2); + + add(flippingSplitPane1, java.awt.BorderLayout.CENTER); + }// </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.util.panes.InfoPane infoPane1; + private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel2; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JScrollPane jScrollPane2; + private javax.swing.JTable jTable1; + private javax.swing.JTable jTable2; + // End of variables declaration//GEN-END:variables + +} Deleted: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form 2008-07-21 21:20:07 UTC (rev 7218) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.form 2008-07-21 21:22:25 UTC (rev 7219) @@ -1,154 +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,-60,0,0,2,31"/> - </AuxValues> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <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.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="Center"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> - <SubComponents> - <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> - <Container class="pcgen.gui.util.panes.FlippingSplitPane" name="flippingSplitPane2"> - <Properties> - <Property name="dividerSize" type="int" value="7"/> - <Property name="orientation" type="int" value="0"/> - <Property name="continuousLayout" type="boolean" value="true"/> - <Property name="oneTouchExpandable" type="boolean" value="true"/> - </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"> - <Properties> - <Property name="title" type="java.lang.String" value="Skill Info"/> - </Properties> - <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> - <Container class="javax.swing.JPanel" name="jPanel2"> - <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.DesignGridBagLayout"/> - <SubComponents> - <Container class="javax.swing.JScrollPane" name="jScrollPane2"> - <Properties> - <Property name="horizontalScrollBarPolicy" type="int" value="31"/> - <Property name="verticalScrollBarPolicy" type="int" value="21"/> - </Properties> - <AuxValues> - <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> - </AuxValues> - <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="60" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> - <SubComponents> - <Component class="javax.swing.JTable" name="jTable2"> - <Properties> - <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor"> - <Table columnCount="3" rowCount="3"> - <Column editable="true" title="Skill Cost" type="java.lang.String"> - <Data value="Class"/> - <Data value="Cross-Class"/> - <Data value="Exclusive"/> - </Column> - <Column editable="true" title="Rank Cost" type="java.lang.Integer"> - <Data value="1"/> - <Data value="2"/> - <Data value="0"/> - </Column> - <Column editable="true" title="Max Ranks" type="java.lang.Double"> - <Data value="7.0"/> - <Data value="3.5"/> - <Data value="0.0"/> - </Column> - </Table> - </Property> - </Properties> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JScrollPane" name="jScrollPane1"> - <AuxValues> - <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> - </AuxValues> - <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="1.0" weightY="1.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> - <SubComponents> - <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="4"> - <Column editable="false" title="Level" type="java.lang.Integer"> - <Data value="1"/> - <Data value="2"/> - <Data value="3"/> - <Data value="4"/> - </Column> - <Column editable="false" title="Class" type="java.lang.Object"/> - <Column editable="false" title="Skill Points" type="java.lang.Integer"/> - <Column editable="false" title="Points Left" type="java.lang.Integer"/> - </Table> - </Property> - </Properties> - </Component> - </SubComponents> - </Container> - </SubComponents> - </Container> - </SubComponents> - </Container> - </SubComponents> - </Container> - </SubComponents> -</Form> \ No newline at end of file Deleted: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java 2008-07-21 21:20:07 UTC (rev 7218) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillsTab.java 2008-07-21 21:22:25 UTC (rev 7219) @@ -1,141 +0,0 @@ -/* - * SkillsTab.java - * - * Created on June 26, 2008, 8:49 PM - */ - -package pcgen.gui.tabs; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class SkillsTab extends javax.swing.JPanel { - - /** Creates new form SkillsTab */ - public SkillsTab() { - 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(); - jPanel1 = new javax.swing.JPanel(); - flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); - infoPane1 = new pcgen.gui.util.panes.InfoPane(); - jPanel2 = new javax.swing.JPanel(); - jScrollPane2 = new javax.swing.JScrollPane(); - jTable2 = new javax.swing.JTable(); - jScrollPane1 = new javax.swing.JScrollPane(); - jTable1 = new javax.swing.JTable(); - - setLayout(new java.awt.BorderLayout()); - - flippingSplitPane1.setDividerSize(7); - flippingSplitPane1.setContinuousLayout(true); - flippingSplitPane1.setOneTouchExpandable(true); - flippingSplitPane1.setLeftComponent(jPanel1); - - flippingSplitPane2.setDividerSize(7); - flippingSplitPane2.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); - flippingSplitPane2.setContinuousLayout(true); - flippingSplitPane2.setOneTouchExpandable(true); - - infoPane1.setTitle("Skill Info"); - flippingSplitPane2.setTopComponent(infoPane1); - - jPanel2.setLayout(new java.awt.GridBagLayout()); - - jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - jScrollPane2.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); - - jTable2.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - {"Class", new Integer(1), new Double(7.0)}, - {"Cross-Class", new Integer(2), new Double(3.5)}, - {"Exclusive", new Integer(0), new Double(0.0)} - }, - new String [] { - "Skill Cost", "Rank Cost", "Max Ranks" - } - ) { - Class[] types = new Class [] { - java.lang.String.class, java.lang.Integer.class, java.lang.Double.class - }; - - public Class getColumnClass(int columnIndex) { - return types [columnIndex]; - } - }); - jScrollPane2.setViewportView(jTable2); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.ipady = 60; - gridBagConstraints.weightx = 1.0; - jPanel2.add(jScrollPane2, gridBagConstraints); - - jTable1.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - {new Integer(1), null, null, null}, - {new Integer(2), null, null, null}, - {new Integer(3), null, null, null}, - {new Integer(4), null, null, null} - }, - new String [] { - "Level", "Class", "Skill Points", "Points Left" - } - ) { - Class[] types = new Class [] { - java.lang.Integer.class, java.lang.Object.class, java.lang.Integer.class, java.lang.Integer.class - }; - boolean[] canEdit = new boolean [] { - false, false, false, false - }; - - public Class getColumnClass(int columnIndex) { - return types [columnIndex]; - } - - public boolean isCellEditable(int rowIndex, int columnIndex) { - return canEdit [columnIndex]; - } - }); - jScrollPane1.setViewportView(jTable1); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - jPanel2.add(jScrollPane1, gridBagConstraints); - - flippingSplitPane2.setRightComponent(jPanel2); - - flippingSplitPane1.setRightComponent(flippingSplitPane2); - - add(flippingSplitPane1, java.awt.BorderLayout.CENTER); - }// </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.util.panes.InfoPane infoPane1; - private javax.swing.JPanel jPanel1; - private javax.swing.JPanel jPanel2; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JScrollPane jScrollPane2; - private javax.swing.JTable jTable1; - private javax.swing.JTable jTable2; - // End of variables declaration//GEN-END:variables - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-22 00:53:44
|
Revision: 7222 http://pcgen.svn.sourceforge.net/pcgen/?rev=7222&view=rev Author: cpmeister Date: 2008-07-22 00:53:51 +0000 (Tue, 22 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java branches/cdomui/code/src/java/pcgen/gui/filter/Filter.java branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterStateEditable.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterInfoTab.java Modified: branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -39,7 +39,7 @@ { } - public static <T> DefaultGenericListModel<NamedFilter<? super T>> getRegisteredFilters(Class<T> c) + public static <T> GenericListModel<NamedFilter<? super T>> getDisplayedFilters(Class<T> c) { return null; } Modified: branches/cdomui/code/src/java/pcgen/gui/filter/Filter.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/Filter.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/filter/Filter.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -18,13 +18,17 @@ * * Created on Jun 21, 2008, 7:44:50 PM */ - package pcgen.gui.filter; +import pcgen.gui.facade.CharacterFacade; + /** * * @author Connor Petty <cpm...@us...> */ -public interface Filter<E> { - public boolean accept(E object); +public interface Filter<E> +{ + + public boolean accept(CharacterFacade character, E object); + } Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -28,6 +28,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; +import java.util.Hashtable; import java.util.LinkedList; import java.util.List; import javax.swing.AbstractAction; @@ -41,46 +42,38 @@ import javax.swing.event.DocumentListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; +import javax.swing.undo.StateEditable; import pcgen.gui.PCGenUIManager; -import pcgen.gui.util.DefaultGenericListModel; +import pcgen.gui.facade.CharacterFacade; +import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.GenericListModelWrapper; import pcgen.gui.util.SimpleTextIcon; +import pcgen.gui.util.event.ListDataAdapter; import pcgen.util.PropertyFactory; /** * * @author Connor Petty <cpm...@us...> */ -public class FilterPanel extends JPanel +public class FilterPanel extends JPanel implements StateEditable { private static final String filterString = PropertyFactory.getString("in_filter") + ":"; private static final String clearString = PropertyFactory.getString("in_clear"); private static final String advancedString = PropertyFactory.getString("in_demAdv"); + private final List<JToggleButton> filterbuttons; private final JTextField textfield; - private List<JToggleButton> filterbuttons; + private FilterPanelListener panelListener = null; + private ListDataListener listListener; private List<Filter> selectedFilters; - private FilterPanelListener panelListener; - private ListDataListener listListener; private Class<?> filterClass; public FilterPanel() { - this(null, null); - } - - public FilterPanel(Class<?> filterclass) - { - this(filterclass, null); - } - - public FilterPanel(Class<?> filterClass, - FilterPanelListener listener) - { + this.filterbuttons = new LinkedList<JToggleButton>(); this.textfield = new JTextField(); - this.panelListener = listener; initComponents(); - setFilterClass(filterClass); } private void initComponents() @@ -144,41 +137,28 @@ add(toolbar); } - public <T> void setFilterClass(Class<T> filterClass) + private <T> void setFilterClass(Class<T> filterClass) { - if (filterClass != null && !filterClass.equals(this.filterClass)) + if (this.filterClass != null) { - if (this.filterClass != null) + PCGenUIManager.getDisplayedFilters(this.filterClass).removeListDataListener(listListener); + } + this.filterClass = filterClass; + GenericListModel<NamedFilter<? super T>> filterModel = PCGenUIManager.getDisplayedFilters(filterClass); + final List<NamedFilter<? super T>> filterList = new GenericListModelWrapper<NamedFilter<? super T>>(filterModel); + ListDataListener listener = new ListDataAdapter() + { + + @Override + public void listDataChanged(ListDataEvent e) { - PCGenUIManager.getRegisteredFilters(this.filterClass).removeListDataListener(listListener); + setFilterButtons(filterList); } - this.filterClass = filterClass; - final DefaultGenericListModel<NamedFilter<? super T>> filters = PCGenUIManager.getRegisteredFilters(filterClass); - ListDataListener listener = new ListDataListener() - { - public void intervalAdded(ListDataEvent e) - { - setFilterButtons(filters); - } - - public void intervalRemoved(ListDataEvent e) - { - setFilterButtons(filters); - } - - public void contentsChanged(ListDataEvent e) - { - setFilterButtons(filters); - } - - }; - filters.addListDataListener(listener); - listListener = listener; - this.selectedFilters = new ArrayList<Filter>(); - this.filterbuttons = new LinkedList<JToggleButton>(); - setFilterButtons(filters); - } + }; + filterModel.addListDataListener(listener); + listListener = listener; + setFilterButtons(filterList); } public void setFilterPanelListener(FilterPanelListener listener) @@ -210,6 +190,27 @@ } } + public Hashtable<Object, Object> createState(Class<?> filterClass) + { + Hashtable<Object, Object> state = new Hashtable<Object, Object>(); + state.put("FilterClass", filterClass); + state.put("SelectedFilters", new ArrayList<Filter>()); + return state; + } + + public void storeState(Hashtable<Object, Object> state) + { + + } + + @SuppressWarnings("unchecked") + public void restoreState(Hashtable<?, ?> state) + { + Class<?> c = (Class<?>) state.get("FilterClass"); + selectedFilters = (List<Filter>) state.get("SelectedFilters"); + setFilterClass(c); + } + public Filter getFilter() { String text = textfield.getText(); @@ -244,14 +245,14 @@ } @SuppressWarnings("unchecked") - public boolean accept(Object object) + public boolean accept(CharacterFacade character, Object object) { boolean accept = !qFilter || text.equals(object.toString()); if (accept) { for (Filter filter : selectedFilters) { - if (!filter.accept(object)) + if (!filter.accept(character, object)) { accept = false; break; Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -23,10 +23,13 @@ import java.awt.BorderLayout; import java.util.ArrayList; import java.util.Collection; +import java.util.Hashtable; import java.util.List; import javax.swing.JPanel; import javax.swing.ListSelectionModel; import javax.swing.TransferHandler; +import javax.swing.undo.StateEditable; +import pcgen.gui.facade.CharacterFacade; import pcgen.gui.util.GenericListModelWrapper; import pcgen.gui.util.JTreeViewPane; import pcgen.gui.util.SwingWorker; @@ -39,7 +42,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class FilteredTreeViewPanel extends JPanel +public class FilteredTreeViewPanel extends JPanel implements StateEditable { private FilterPanel filterPanel; @@ -112,22 +115,39 @@ treeViewPane.setDragEnabled(b); } - public <T> void setTreeViewModel(FilterableTreeViewModel<T> model) + public <T> Hashtable<Object, Object> createState(CharacterFacade character, + FilterableTreeViewModel<T> model) { - filterPanel.setFilterClass(model.getFilterClass()); + Hashtable<Object, Object> state = filterPanel.createState(model.getFilterClass()); + state.put("FilteredTreeViewModel", + new FilteredTreeViewModel<T>(character, model)); + return state; + } - TreeViewDisplay<T> displayModel = new TreeViewDisplay<T>(model); - treeViewPane.setTreeViewModel(displayModel); - filterPanel.setFilterPanelListener(displayModel); + public void storeState(Hashtable<Object, Object> state) + { + } - private class TreeViewDisplay<E> extends TreeViewModelWrapper<E> + public void restoreState(Hashtable<?, ?> state) + { + FilteredTreeViewModel<?> model = (FilteredTreeViewModel<?>) state.get("FilteredTreeViewModel"); + treeViewPane.setTreeViewModel(model); + filterPanel.setFilterPanelListener(model); + filterPanel.restoreState(state); + } + + private class FilteredTreeViewModel<E> extends TreeViewModelWrapper<E> implements FilterPanelListener, GenericListDataListener<E> { - public TreeViewDisplay(TreeViewModel<E> model) + private CharacterFacade character; + + public FilteredTreeViewModel(CharacterFacade character, + TreeViewModel<E> model) { super(model); + this.character = character; model.getDataModel().addGenericListDataListener(this); } @@ -185,7 +205,7 @@ List<E> data = new ArrayList<E>(); for (E element : baseData) { - if (filter.accept(element)) + if (filter.accept(character, element)) { data.add(element); } Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/AbilitiesInfoTab.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -43,7 +43,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class AbilitiesInfoTab extends JTabbedPane implements CharacterInfoTab +public class AbilitiesInfoTab extends JTabbedPane implements CharacterStateEditable { private final AbilityChooserTab abilityTab; Deleted: branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterInfoTab.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterInfoTab.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -1,36 +0,0 @@ -/* - * CharacterInfoTab.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 Jun 27, 2008, 5:59:32 PM - */ -package pcgen.gui.tabs; - -import java.util.Hashtable; -import javax.swing.undo.StateEditable; -import pcgen.gui.facade.CharacterFacade; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public interface CharacterInfoTab extends StateEditable -{ - - public Hashtable<Object, Object> createState(CharacterFacade character); - -} Copied: branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterStateEditable.java (from rev 7111, branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterInfoTab.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterStateEditable.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/CharacterStateEditable.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -0,0 +1,36 @@ +/* + * CharacterStateEditable.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 Jun 27, 2008, 5:59:32 PM + */ +package pcgen.gui.tabs; + +import java.util.Hashtable; +import javax.swing.undo.StateEditable; +import pcgen.gui.facade.CharacterFacade; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface CharacterStateEditable extends StateEditable +{ + + public Hashtable<Object, Object> createState(CharacterFacade character); + +} Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -61,7 +61,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class ClassInfoTab extends ChooserPane implements CharacterInfoTab +public class ClassInfoTab extends ChooserPane implements CharacterStateEditable { private final FilteredTreeViewPanel treeviewDisplay; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -57,7 +57,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class SkillInfoTab extends ChooserPane implements CharacterInfoTab +public class SkillInfoTab extends ChooserPane implements CharacterStateEditable { //private final FilterableTreeViewPane private final JTable skillcostTable; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-22 00:20:48 UTC (rev 7221) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-22 00:53:51 UTC (rev 7222) @@ -648,18 +648,32 @@ } } + private static final String CATAGORY_TABLE_MODEL = "CatagoryTableModel"; + private static final String SELECTED_TREEVIEW_PANEL_STATE = "SelectedTreeViewPanelState"; + private static final String SELECTED_ABILITY_TREEVIEW_MODEL = "SelectedAbilityTreeViewModel"; + private static final String AVAILABLE_TREEVIEW_PANEL_STATE = "AvailableTreeViewPanelState"; + private static final String AVAILABLE_ABILITY_TREEVIEW_MODEL = "AvailableAbilityTreeViewModel"; + private static final String ABILITY_TRANSFER_HANDLER = "AbilityTransferHandler"; public Hashtable<Object, Object> createState(CharacterFacade character, DefaultGenericListModel<AbilityCatagoryFacade> catagories) { Hashtable<Object, Object> state = new Hashtable<Object, Object>(); - state.put("CatagoryTableModel", + state.put(CATAGORY_TABLE_MODEL, new CatagoryTableModel(character, catagories)); - state.put("SelectedAbilityTreeViewModel", - new SelectedAbilityTreeViewModel(character, catagories)); - state.put("AvailableAbilityTreeViewModel", - new AvailableAbilityTreeViewModel(character)); - state.put("AbilityTransferHandler", + SelectedAbilityTreeViewModel selectedAbilityModel = new SelectedAbilityTreeViewModel(character, + catagories); + AvailableAbilityTreeViewModel availableAbilityModel = new AvailableAbilityTreeViewModel(character); + + state.put(SELECTED_ABILITY_TREEVIEW_MODEL, selectedAbilityModel); + state.put(AVAILABLE_ABILITY_TREEVIEW_MODEL, availableAbilityModel); + state.put(SELECTED_TREEVIEW_PANEL_STATE, + selectedTreeViewPanel.createState(character, + selectedAbilityModel)); + state.put(AVAILABLE_TREEVIEW_PANEL_STATE, + availableTreeViewPanel.createState(character, + availableAbilityModel)); + state.put(ABILITY_TRANSFER_HANDLER, new AbilityTransferHandler(character)); return state; } @@ -671,16 +685,17 @@ public void restoreState(Hashtable<?, ?> state) { - catagoryModel = (CatagoryTableModel) state.get("CatagoryTableModel"); - selectedModel = (SelectedAbilityTreeViewModel) state.get("SelectedAbilityTreeViewModel"); - availableModel = (AvailableAbilityTreeViewModel) state.get("AvailableAbilityTreeViewModel"); - AbilityTransferHandler handler = (AbilityTransferHandler) state.get("AbilityTransferHandler"); + catagoryModel = (CatagoryTableModel) state.get(CATAGORY_TABLE_MODEL); + selectedModel = (SelectedAbilityTreeViewModel) state.get(SELECTED_ABILITY_TREEVIEW_MODEL); + availableModel = (AvailableAbilityTreeViewModel) state.get(AVAILABLE_ABILITY_TREEVIEW_MODEL); + AbilityTransferHandler handler = (AbilityTransferHandler) state.get(ABILITY_TRANSFER_HANDLER); catagoryTable.setModel(catagoryModel); - selectedTreeViewPanel.setTreeViewModel(selectedModel); - availableTreeViewPanel.setTreeViewModel(availableModel); selectedTreeViewPanel.setTransferHandler(handler); availableTreeViewPanel.setTransferHandler(handler); + + selectedTreeViewPanel.restoreState((Hashtable<?, ?>) state.get(SELECTED_TREEVIEW_PANEL_STATE)); + availableTreeViewPanel.restoreState((Hashtable<?, ?>) state.get(AVAILABLE_TREEVIEW_PANEL_STATE)); } private class PreReqTreeView implements TreeView<AbilityFacade> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-23 00:21:41
|
Revision: 7224 http://pcgen.svn.sourceforge.net/pcgen/?rev=7224&view=rev Author: cpmeister Date: 2008-07-23 00:21:49 +0000 (Wed, 23 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SummaryTab.form branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SummaryTab.java branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java Added: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-07-23 00:21:49 UTC (rev 7224) @@ -0,0 +1,482 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> + <Properties> + <Property name="defaultCloseOperation" type="int" value="2"/> + </Properties> + <SyntheticProperties> + <SyntheticProperty name="formSizePolicy" type="int" value="1"/> + </SyntheticProperties> + <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,-12,0,0,1,-34"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Container class="javax.swing.JPanel" name="jPanel3"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Name"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="2" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JTextField" name="jTextField1"> + <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="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="jButton2"> + <Properties> + <Property name="text" type="java.lang.String" value="Generate Name"/> + </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="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel4"> + <Properties> + <Property name="text" type="java.lang.String" value="Name Set:"/> + </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"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox3"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="1"> + <StringItem index="0" value="1990uscensus"/> + </StringArray> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel1"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Alignment"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Component class="javax.swing.JComboBox" name="jComboBox1"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="3"> + <StringItem index="0" value="True Neutral"/> + <StringItem index="1" value="Lawful Good"/> + <StringItem index="2" value="Chaotic Neutral"/> + </StringArray> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel4"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Gender"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Component class="javax.swing.JComboBox" name="jComboBox4"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="1"> + <StringItem index="0" value="Male"/> + </StringArray> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel2"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Race"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Component class="javax.swing.JComboBox" name="jComboBox2"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="1"> + <StringItem index="0" value="Human"/> + </StringArray> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="jButton1"> + <Properties> + <Property name="text" type="java.lang.String" value="Browse"/> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="After"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel5"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Stats"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JButton" name="jButton3"> + <Properties> + <Property name="text" type="java.lang.String" value="Roll"/> + </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="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox5"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="6"> + <StringItem index="0" value="3d6"/> + <StringItem index="1" value="4d4"/> + <StringItem index="2" value="4d6 drop lowest"/> + <StringItem index="3" value="4d6, reroll 1's"/> + <StringItem index="4" value="4d6, reroll 1's, drop lowest"/> + <StringItem index="5" value="5d6, drop 2 lowest"/> + </StringArray> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Container class="javax.swing.JScrollPane" name="jScrollPane1"> + <Properties> + <Property name="verticalScrollBarPolicy" type="int" value="21"/> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[8, 120]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[375, 120]"/> + </Property> + </Properties> + <AuxValues> + <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + </AuxValues> + <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="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> + <SubComponents> + <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="5" rowCount="6"> + <Column editable="false" title="Stat" type="java.lang.String"> + <Data value="Strength"/> + <Data value="Dexterity"/> + <Data value="Constitution"/> + <Data value="Intelligence"/> + <Data value="Wisdom"/> + <Data value="Charisma"/> + </Column> + <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"/> + </Table> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel6"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Classes"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JCheckBox" name="jCheckBox1"> + <Properties> + <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="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"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox6"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" 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="Browse"/> + </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="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel2"> + <Properties> + <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="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox7"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="jButton5"> + <Properties> + <Property name="text" type="java.lang.String" value="Browse"/> + </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="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel3"> + <Properties> + <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="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox8"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="jButton6"> + <Properties> + <Property name="text" type="java.lang.String" value="Browse"/> + </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"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel7"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> + <Connection component="jComboBox1" name="border" type="property"/> + </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Component class="javax.swing.JComboBox" name="jComboBox9"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </Property> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="null"/> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="jButton7"> + <Properties> + <Property name="text" type="java.lang.String" value="..."/> + <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> + <Insets value="[0, 0, 0, 0]"/> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="After"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + </SubComponents> +</Form> Added: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-07-23 00:21:49 UTC (rev 7224) @@ -0,0 +1,308 @@ +/* + * CharacterGenerationDialog.java + * + * Created on July 22, 2008, 1:14 PM + */ + +package pcgen.gui.proto; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class CharacterGenerationDialog extends javax.swing.JDialog { + + /** Creates new form CharacterGenerationDialog */ + public CharacterGenerationDialog(java.awt.Frame parent, boolean modal) { + super(parent, modal); + 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; + + jPanel3 = new javax.swing.JPanel(); + jTextField1 = new javax.swing.JTextField(); + jButton2 = new javax.swing.JButton(); + jLabel4 = new javax.swing.JLabel(); + jComboBox3 = new javax.swing.JComboBox(); + jPanel1 = new javax.swing.JPanel(); + jComboBox1 = new javax.swing.JComboBox(); + jPanel4 = new javax.swing.JPanel(); + jComboBox4 = new javax.swing.JComboBox(); + jPanel2 = new javax.swing.JPanel(); + jComboBox2 = new javax.swing.JComboBox(); + jButton1 = new javax.swing.JButton(); + jPanel5 = new javax.swing.JPanel(); + jButton3 = new javax.swing.JButton(); + jComboBox5 = new javax.swing.JComboBox(); + jScrollPane1 = new javax.swing.JScrollPane(); + jTable1 = new javax.swing.JTable(); + jPanel6 = new javax.swing.JPanel(); + jCheckBox1 = new javax.swing.JCheckBox(); + jLabel1 = new javax.swing.JLabel(); + jComboBox6 = new javax.swing.JComboBox(); + jButton4 = new javax.swing.JButton(); + jLabel2 = new javax.swing.JLabel(); + jComboBox7 = new javax.swing.JComboBox(); + jButton5 = new javax.swing.JButton(); + jLabel3 = new javax.swing.JLabel(); + jComboBox8 = new javax.swing.JComboBox(); + jButton6 = new javax.swing.JButton(); + jPanel7 = new javax.swing.JPanel(); + jComboBox9 = new javax.swing.JComboBox(); + jButton7 = new javax.swing.JButton(); + + setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); + getContentPane().setLayout(new java.awt.GridBagLayout()); + + jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Name", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); + jPanel3.setLayout(new java.awt.GridBagLayout()); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); + jPanel3.add(jTextField1, gridBagConstraints); + + jButton2.setText("Generate Name"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); + jPanel3.add(jButton2, gridBagConstraints); + + jLabel4.setText("Name Set:"); + jPanel3.add(jLabel4, new java.awt.GridBagConstraints()); + + jComboBox3.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1990uscensus" })); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); + jPanel3.add(jComboBox3, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + getContentPane().add(jPanel3, gridBagConstraints); + + jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Alignment", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); + jPanel1.setLayout(new java.awt.BorderLayout()); + + jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "True Neutral", "Lawful Good", "Chaotic Neutral" })); + jPanel1.add(jComboBox1, java.awt.BorderLayout.CENTER); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + getContentPane().add(jPanel1, gridBagConstraints); + + jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Gender", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); + jPanel4.setLayout(new java.awt.BorderLayout()); + + jComboBox4.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Male" })); + jPanel4.add(jComboBox4, java.awt.BorderLayout.CENTER); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + getContentPane().add(jPanel4, gridBagConstraints); + + 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()); + + jComboBox2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Human" })); + jPanel2.add(jComboBox2, java.awt.BorderLayout.CENTER); + + jButton1.setText("Browse"); + jPanel2.add(jButton1, java.awt.BorderLayout.LINE_END); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 0); + getContentPane().add(jPanel2, gridBagConstraints); + + jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Stats", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); + jPanel5.setLayout(new java.awt.GridBagLayout()); + + jButton3.setText("Roll"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); + jPanel5.add(jButton3, gridBagConstraints); + + jComboBox5.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "3d6", "4d4", "4d6 drop lowest", "4d6, reroll 1's", "4d6, reroll 1's, drop lowest", "5d6, drop 2 lowest" })); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); + jPanel5.add(jComboBox5, gridBagConstraints); + + jScrollPane1.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + jScrollPane1.setMinimumSize(new java.awt.Dimension(8, 120)); + jScrollPane1.setPreferredSize(new java.awt.Dimension(375, 120)); + + jTable1.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {"Strength", null, null, null, null}, + {"Dexterity", null, null, null, null}, + {"Constitution", null, null, null, null}, + {"Intelligence", null, null, null, null}, + {"Wisdom", null, null, null, null}, + {"Charisma", null, null, null, null} + }, + new String [] { + "Stat", "Base Score", "Racial Adj", "Total", "Mod" + } + ) { + Class[] types = new Class [] { + java.lang.String.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class + }; + boolean[] canEdit = new boolean [] { + false, true, false, false, false + }; + + public Class getColumnClass(int columnIndex) { + return types [columnIndex]; + } + + public boolean isCellEditable(int rowIndex, int columnIndex) { + return canEdit [columnIndex]; + } + }); + jScrollPane1.setViewportView(jTable1); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0); + jPanel5.add(jScrollPane1, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + getContentPane().add(jPanel5, gridBagConstraints); + + 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.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); + + jLabel1.setText("1st Class:"); + jPanel6.add(jLabel1, new java.awt.GridBagConstraints()); + + jComboBox6.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + jPanel6.add(jComboBox6, new java.awt.GridBagConstraints()); + + jButton4.setText("Browse"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + jPanel6.add(jButton4, gridBagConstraints); + + jLabel2.setText("2nd Class:"); + jPanel6.add(jLabel2, new java.awt.GridBagConstraints()); + + jComboBox7.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + jPanel6.add(jComboBox7, new java.awt.GridBagConstraints()); + + jButton5.setText("Browse"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + jPanel6.add(jButton5, gridBagConstraints); + + jLabel3.setText("3rd Class:"); + jPanel6.add(jLabel3, new java.awt.GridBagConstraints()); + + jComboBox8.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + jPanel6.add(jComboBox8, new java.awt.GridBagConstraints()); + + jButton6.setText("Browse"); + jPanel6.add(jButton6, new java.awt.GridBagConstraints()); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + getContentPane().add(jPanel6, gridBagConstraints); + + jPanel7.setBorder(jComboBox1.getBorder()); + jPanel7.setLayout(new java.awt.BorderLayout()); + + jComboBox9.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + jComboBox9.setBorder(null); + jPanel7.add(jComboBox9, java.awt.BorderLayout.CENTER); + + jButton7.setText("..."); + jButton7.setMargin(new java.awt.Insets(0, 0, 0, 0)); + jPanel7.add(jButton7, java.awt.BorderLayout.LINE_END); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + getContentPane().add(jPanel7, gridBagConstraints); + + pack(); + }// </editor-fold>//GEN-END:initComponents + + /** + * @param args the command line arguments + */ + public static void main(String args[]) { + java.awt.EventQueue.invokeLater(new Runnable() { + public void run() { + CharacterGenerationDialog dialog = new CharacterGenerationDialog(new javax.swing.JFrame(), true); + dialog.addWindowListener(new java.awt.event.WindowAdapter() { + public void windowClosing(java.awt.event.WindowEvent e) { + System.exit(0); + } + }); + dialog.setVisible(true); + } + }); + } + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton jButton1; + private javax.swing.JButton jButton2; + private javax.swing.JButton jButton3; + private javax.swing.JButton jButton4; + private javax.swing.JButton jButton5; + private javax.swing.JButton jButton6; + private javax.swing.JButton jButton7; + private javax.swing.JCheckBox jCheckBox1; + private javax.swing.JComboBox jComboBox1; + private javax.swing.JComboBox jComboBox2; + private javax.swing.JComboBox jComboBox3; + private javax.swing.JComboBox jComboBox4; + private javax.swing.JComboBox jComboBox5; + private javax.swing.JComboBox jComboBox6; + private javax.swing.JComboBox jComboBox7; + private javax.swing.JComboBox jComboBox8; + private javax.swing.JComboBox jComboBox9; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; + private javax.swing.JLabel jLabel4; + private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel2; + private javax.swing.JPanel jPanel3; + private javax.swing.JPanel jPanel4; + private javax.swing.JPanel jPanel5; + private javax.swing.JPanel jPanel6; + private javax.swing.JPanel jPanel7; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JTable jTable1; + private javax.swing.JTextField jTextField1; + // End of variables declaration//GEN-END:variables + +} Added: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SummaryTab.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SummaryTab.form (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SummaryTab.form 2008-07-23 00:21:49 UTC (rev 7224) @@ -0,0 +1,131 @@ +<?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"/> + </AuxValues> + + <Layout> + <DimensionLayout dim="0"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" alignment="0" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Group type="103" groupAlignment="1" attributes="0"> + <Component id="jLabel3" alignment="1" min="-2" max="-2" attributes="0"/> + <Component id="jLabel1" alignment="1" min="-2" max="-2" attributes="0"/> + <Component id="jLabel2" alignment="1" min="-2" max="-2" attributes="0"/> + </Group> + <EmptySpace max="-2" attributes="0"/> + <Group type="103" groupAlignment="0" attributes="0"> + <Component id="jComboBox1" min="-2" max="-2" attributes="0"/> + <Group type="102" attributes="0"> + <Component id="jComboBox2" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="jButton2" min="-2" max="-2" attributes="0"/> + </Group> + <Group type="102" attributes="0"> + <Component id="jComboBox3" min="-2" max="-2" attributes="0"/> + <EmptySpace max="-2" attributes="0"/> + <Component id="jButton1" min="-2" max="-2" attributes="0"/> + </Group> + </Group> + <EmptySpace pref="244" max="32767" attributes="0"/> + </Group> + </Group> + </DimensionLayout> + <DimensionLayout dim="1"> + <Group type="103" groupAlignment="0" attributes="0"> + <Group type="102" attributes="0"> + <EmptySpace max="-2" attributes="0"/> + <Group type="103" groupAlignment="3" attributes="0"> + <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="jComboBox1" alignment="3" max="32767" attributes="1"/> + </Group> + <EmptySpace max="-2" attributes="0"/> + <Group type="103" groupAlignment="3" attributes="0"> + <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="jComboBox2" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="jButton2" alignment="3" min="-2" max="-2" attributes="0"/> + </Group> + <EmptySpace max="-2" attributes="0"/> + <Group type="103" groupAlignment="3" attributes="0"> + <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="jComboBox3" alignment="3" min="-2" max="-2" attributes="0"/> + <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/> + </Group> + <EmptySpace pref="201" max="32767" attributes="0"/> + </Group> + </Group> + </DimensionLayout> + </Layout> + <SubComponents> + <Component class="javax.swing.JLabel" name="jLabel1"> + <Properties> + <Property name="text" type="java.lang.String" value="Race:"/> + </Properties> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox1"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </Property> + </Properties> + </Component> + <Component class="javax.swing.JLabel" name="jLabel2"> + <Properties> + <Property name="text" type="java.lang.String" value="Alignment:"/> + </Properties> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox2"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </Property> + </Properties> + </Component> + <Component class="javax.swing.JButton" name="jButton2"> + <Properties> + <Property name="text" type="java.lang.String" value="Browse"/> + </Properties> + </Component> + <Component class="javax.swing.JLabel" name="jLabel3"> + <Properties> + <Property name="text" type="java.lang.String" value="Class:"/> + </Properties> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox3"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </Property> + </Properties> + </Component> + <Component class="javax.swing.JButton" name="jButton1"> + <Properties> + <Property name="text" type="java.lang.String" value="Browse"/> + </Properties> + </Component> + </SubComponents> +</Form> Added: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SummaryTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SummaryTab.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SummaryTab.java 2008-07-23 00:21:49 UTC (rev 7224) @@ -0,0 +1,109 @@ +/* + * SummaryTab.java + * + * Created on July 22, 2008, 1:02 PM + */ + +package pcgen.gui.proto.tabs; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class SummaryTab extends javax.swing.JPanel { + + /** Creates new form SummaryTab */ + public SummaryTab() { + 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() { + + jLabel1 = new javax.swing.JLabel(); + jComboBox1 = new javax.swing.JComboBox(); + jLabel2 = new javax.swing.JLabel(); + jComboBox2 = new javax.swing.JComboBox(); + jButton2 = new javax.swing.JButton(); + jLabel3 = new javax.swing.JLabel(); + jComboBox3 = new javax.swing.JComboBox(); + jButton1 = new javax.swing.JButton(); + + jLabel1.setText("Race:"); + + jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + + jLabel2.setText("Alignment:"); + + jComboBox2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + + jButton2.setText("Browse"); + + jLabel3.setText("Class:"); + + jComboBox3.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + + jButton1.setText("Browse"); + + org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(layout.createSequentialGroup() + .addContainerGap() + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING) + .add(jLabel3) + .add(jLabel1) + .add(jLabel2)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(jComboBox1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(layout.createSequentialGroup() + .add(jComboBox2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jButton2)) + .add(layout.createSequentialGroup() + .add(jComboBox3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(jButton1))) + .addContainerGap(244, Short.MAX_VALUE)) + ); + layout.setVerticalGroup( + layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING) + .add(layout.createSequentialGroup() + .addContainerGap() + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(jLabel2) + .add(jComboBox1)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(jLabel1) + .add(jComboBox2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(jButton2)) + .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED) + .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE) + .add(jLabel3) + .add(jComboBox3, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE) + .add(jButton1)) + .addContainerGap(201, Short.MAX_VALUE)) + ); + }// </editor-fold>//GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton jButton1; + private javax.swing.JButton jButton2; + private javax.swing.JComboBox jComboBox1; + private javax.swing.JComboBox jComboBox2; + private javax.swing.JComboBox jComboBox3; + private javax.swing.JLabel jLabel1; + private javax.swing.JLabel jLabel2; + private javax.swing.JLabel jLabel3; + // End of variables declaration//GEN-END:variables + +} Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-22 09:01:36 UTC (rev 7223) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-23 00:21:49 UTC (rev 7224) @@ -47,6 +47,7 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel; +import javax.swing.undo.StateEditable; import pcgen.gui.PCGenUIManager; import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.AbilityFacade; @@ -67,7 +68,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class AbilityChooserTab extends ChooserPane +public class AbilityChooserTab extends ChooserPane implements StateEditable { private static final DataView<AbilityFacade> abilityDataView = new DataView<AbilityFacade>() @@ -223,7 +224,7 @@ setInfoPaneText(ability.getInfo()); } - public void setSelectedCatagory(AbilityCatagoryFacade catagory) + private void setSelectedCatagory(AbilityCatagoryFacade catagory) { this.selectedCatagory = catagory; Added: branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java 2008-07-23 00:21:49 UTC (rev 7224) @@ -0,0 +1,76 @@ +/* + * ComboSelectionPanel.java + * Copyright 20... [truncated message content] |
From: <cpm...@us...> - 2008-07-23 19:38:52
|
Revision: 7226 http://pcgen.svn.sourceforge.net/pcgen/?rev=7226&view=rev Author: cpmeister Date: 2008-07-23 19:38:59 +0000 (Wed, 23 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/tools/ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-07-23 15:51:11 UTC (rev 7225) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-07-23 19:38:59 UTC (rev 7226) @@ -55,10 +55,15 @@ filterPanel = new FilterPanel(); add(filterPanel, BorderLayout.PAGE_START); - treeViewPane = new JTreeViewPane(); + treeViewPane = createDefaultTreeViewPane(); add(treeViewPane, BorderLayout.CENTER); } + public JTreeViewPane createDefaultTreeViewPane() + { + return new JTreeViewPane(); + } + /** * delegates to JTable.getSelectionModel() * @return the row selection model Copied: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java (from rev 7224, branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java 2008-07-23 19:38:59 UTC (rev 7226) @@ -0,0 +1,89 @@ +/* + * ComboSelectionPanel.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.event.ActionEvent; +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JPanel; +import pcgen.gui.filter.FilteredTreeViewPanel; +import pcgen.gui.util.JTreeViewPane; +import pcgen.gui.util.JTreeViewSelectionPane; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class ComboSelectionPanel extends JPanel +{ + + private JComboBox comboBox; + private JButton button; + + public ComboSelectionPanel() + { + super(new BorderLayout()); + initComponents(); + } + + private void initComponents() + { + comboBox = new JComboBox(); + + setBorder(comboBox.getBorder()); + comboBox.setBorder(BorderFactory.createEmptyBorder()); + + button = new JButton(new ButtonAction()); + button.setMargin(new java.awt.Insets(0, 0, 0, 0)); + + add(comboBox, BorderLayout.CENTER); + add(button, BorderLayout.LINE_END); + } + + private class ButtonAction extends AbstractAction + { + + public ButtonAction() + { + super("..."); + } + + public void actionPerformed(ActionEvent e) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + } + + private class FilteredSelectionPanel extends FilteredTreeViewPanel + { + + @Override + public JTreeViewPane createDefaultTreeViewPane() + { + return new JTreeViewSelectionPane(); + } + + } +} Deleted: branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java 2008-07-23 15:51:11 UTC (rev 7225) +++ branches/cdomui/code/src/java/pcgen/gui/util/ComboSelectionPanel.java 2008-07-23 19:38:59 UTC (rev 7226) @@ -1,76 +0,0 @@ -/* - * ComboSelectionPanel.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.util; - -import java.awt.BorderLayout; -import java.awt.event.ActionEvent; -import javax.swing.AbstractAction; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JPanel; -import javax.swing.border.Border; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class ComboSelectionPanel extends JPanel -{ - - private JComboBox comboBox; - private JButton button; - - public ComboSelectionPanel() - { - super(new BorderLayout()); - initComponents(); - } - - private void initComponents() - { - comboBox = new JComboBox(); - - setBorder(comboBox.getBorder()); - comboBox.setBorder(BorderFactory.createEmptyBorder()); - - button = new JButton(new ButtonAction()); - button.setMargin(new java.awt.Insets(0, 0, 0, 0)); - - add(comboBox, BorderLayout.CENTER); - add(button, BorderLayout.LINE_END); - } - - private class ButtonAction extends AbstractAction - { - - public ButtonAction() - { - super("..."); - } - - public void actionPerformed(ActionEvent e) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - } -} Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-23 15:51:11 UTC (rev 7225) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-23 19:38:59 UTC (rev 7226) @@ -22,8 +22,10 @@ import java.awt.Component; import java.awt.Dimension; +import java.awt.ItemSelectable; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ItemListener; import java.util.HashSet; import java.util.Set; import javax.swing.AbstractCellEditor; @@ -43,7 +45,7 @@ * * @author Connor Petty <cpm...@us...> */ -public class JTreeViewSelectionPane extends JTreeViewPane +public class JTreeViewSelectionPane extends JTreeViewPane implements ItemSelectable { private static final Object COLUMN_ID = new Object(); @@ -74,7 +76,8 @@ this(viewModel, SelectionType.RADIO); } - public JTreeViewSelectionPane(TreeViewModel<?> viewModel, SelectionType selectionType) + public JTreeViewSelectionPane(TreeViewModel<?> viewModel, + SelectionType selectionType) { this(selectionType); setTreeViewModel(viewModel); @@ -130,12 +133,6 @@ } } - public Set<Object> getToggledData() - { - TreeViewSelectionTableModel<?> model = (TreeViewSelectionTableModel<?>) getTable().getTreeTableModel(); - return new HashSet<Object>(model.selectedSet); - } - private class TreeViewSelectionTableModel<E> extends TreeViewTableModel<E> { @@ -204,8 +201,9 @@ } - private static class RadioButtonEditor extends AbstractCellEditor implements ActionListener, - TableCellEditor + private static class RadioButtonEditor extends AbstractCellEditor + implements ActionListener, + TableCellEditor { private JRadioButton button; @@ -222,7 +220,8 @@ return Boolean.valueOf(button.isSelected()); } - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, int row, int column) { boolean selected = false; @@ -258,12 +257,15 @@ } @Override - public Component getTableCellRendererComponent(JTable table, Object value, - boolean isSelected, boolean hasFocus, + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, int row, int column) { - super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, + super.getTableCellRendererComponent(table, value, isSelected, + hasFocus, row, column); if (value == null) { @@ -278,4 +280,21 @@ } } + + public Object[] getSelectedObjects() + { + TreeViewSelectionTableModel<?> model = (TreeViewSelectionTableModel<?>) getTable().getTreeTableModel(); + return model.selectedSet.toArray(); + } + + public void addItemListener(ItemListener l) + { + listenerList.remove(ItemListener.class, l); + } + + public void removeItemListener(ItemListener l) + { + listenerList.add(ItemListener.class, l); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-23 19:49:36
|
Revision: 7227 http://pcgen.svn.sourceforge.net/pcgen/?rev=7227&view=rev Author: cpmeister Date: 2008-07-23 19:49:40 +0000 (Wed, 23 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java Modified: branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java 2008-07-23 19:38:59 UTC (rev 7226) +++ branches/cdomui/code/src/java/pcgen/gui/dialog/DeityPanel.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -28,7 +28,7 @@ flippingSplitPane1 = new pcgen.gui.util.panes.FlippingSplitPane(); flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); - infoPane1 = new pcgen.gui.util.panes.InfoPane(); + infoPane1 = new pcgen.gui.tools.InfoPane(); jPanel1 = new javax.swing.JPanel(); jSeparator1 = new javax.swing.JSeparator(); jLabel1 = new javax.swing.JLabel(); @@ -98,7 +98,7 @@ // 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.util.panes.InfoPane infoPane1; + private pcgen.gui.tools.InfoPane infoPane1; private javax.swing.JButton jButton1; private javax.swing.JButton jButton2; private javax.swing.JButton jButton3; Modified: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java 2008-07-23 19:38:59 UTC (rev 7226) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -29,7 +29,7 @@ flippingSplitPane1 = new pcgen.gui.util.panes.FlippingSplitPane(); jPanel1 = new javax.swing.JPanel(); flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); - infoPane1 = new pcgen.gui.util.panes.InfoPane(); + infoPane1 = new pcgen.gui.tools.InfoPane(); jPanel2 = new javax.swing.JPanel(); jScrollPane2 = new javax.swing.JScrollPane(); jTable2 = new javax.swing.JTable(); @@ -129,7 +129,7 @@ // 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.util.panes.InfoPane infoPane1; + private pcgen.gui.tools.InfoPane infoPane1; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JScrollPane jScrollPane1; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-23 19:38:59 UTC (rev 7226) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -20,7 +20,7 @@ */ package pcgen.gui.tabs; -import pcgen.gui.util.panes.ChooserPane; +import pcgen.gui.tools.ChooserPane; import java.awt.Dimension; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-23 19:38:59 UTC (rev 7226) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -20,7 +20,7 @@ */ package pcgen.gui.tabs; -import pcgen.gui.util.panes.ChooserPane; +import pcgen.gui.tools.ChooserPane; import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-23 19:38:59 UTC (rev 7226) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -52,7 +52,7 @@ import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.AbilityFacade; import pcgen.gui.facade.CharacterFacade; -import pcgen.gui.util.panes.ChooserPane; +import pcgen.gui.tools.ChooserPane; import pcgen.gui.filter.FilterableTreeViewModel; import pcgen.gui.filter.FilteredTreeViewPanel; import pcgen.gui.util.DefaultGenericListModel; Copied: branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java (from rev 7224, branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -0,0 +1,69 @@ +/* + * ChooserPane.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 Jun 27, 2008, 12:53:57 PM + */ +package pcgen.gui.tools; + +import pcgen.gui.util.panes.*; +import java.awt.Component; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class ChooserPane extends FlippingSplitPane +{ + + private FlippingSplitPane subSplitPane; + private InfoPane infoPane; + + public ChooserPane() + { + this.subSplitPane = new FlippingSplitPane(VERTICAL_SPLIT); + this.infoPane = new InfoPane(); + + subSplitPane.setTopComponent(infoPane); + setRightComponent(subSplitPane); + + setDividerSize(7); + setContinuousLayout(true); + setOneTouchExpandable(true); + } + + public void setPrimaryChooserComponent(Component c) + { + setLeftComponent(c); + } + + public void setSecondaryChooserComponent(Component c) + { + subSplitPane.setBottomComponent(c); + } + + public void setInfoPaneText(String text) + { + infoPane.setText(text); + } + + public void setInfoPaneTitle(String title) + { + infoPane.setTitle(title); + } + +} Copied: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java (from rev 7226, branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -0,0 +1,89 @@ +/* + * 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.event.ActionEvent; +import javax.swing.AbstractAction; +import javax.swing.BorderFactory; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JPanel; +import pcgen.gui.filter.FilteredTreeViewPanel; +import pcgen.gui.util.JTreeViewPane; +import pcgen.gui.util.JTreeViewSelectionPane; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class ComboSelectionBox extends JPanel +{ + + private JComboBox comboBox; + private JButton button; + + public ComboSelectionBox() + { + super(new BorderLayout()); + initComponents(); + } + + private void initComponents() + { + comboBox = new JComboBox(); + + setBorder(comboBox.getBorder()); + comboBox.setBorder(BorderFactory.createEmptyBorder()); + + button = new JButton(new ButtonAction()); + button.setMargin(new java.awt.Insets(0, 0, 0, 0)); + + add(comboBox, BorderLayout.CENTER); + add(button, BorderLayout.LINE_END); + } + + private class ButtonAction extends AbstractAction + { + + public ButtonAction() + { + super("..."); + } + + public void actionPerformed(ActionEvent e) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + } + + private class FilteredSelectionPanel extends FilteredTreeViewPanel + { + + @Override + public JTreeViewPane createDefaultTreeViewPane() + { + return new JTreeViewSelectionPane(); + } + + } +} Deleted: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java 2008-07-23 19:38:59 UTC (rev 7226) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionPanel.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -1,89 +0,0 @@ -/* - * ComboSelectionPanel.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.event.ActionEvent; -import javax.swing.AbstractAction; -import javax.swing.BorderFactory; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JPanel; -import pcgen.gui.filter.FilteredTreeViewPanel; -import pcgen.gui.util.JTreeViewPane; -import pcgen.gui.util.JTreeViewSelectionPane; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class ComboSelectionPanel extends JPanel -{ - - private JComboBox comboBox; - private JButton button; - - public ComboSelectionPanel() - { - super(new BorderLayout()); - initComponents(); - } - - private void initComponents() - { - comboBox = new JComboBox(); - - setBorder(comboBox.getBorder()); - comboBox.setBorder(BorderFactory.createEmptyBorder()); - - button = new JButton(new ButtonAction()); - button.setMargin(new java.awt.Insets(0, 0, 0, 0)); - - add(comboBox, BorderLayout.CENTER); - add(button, BorderLayout.LINE_END); - } - - private class ButtonAction extends AbstractAction - { - - public ButtonAction() - { - super("..."); - } - - public void actionPerformed(ActionEvent e) - { - throw new UnsupportedOperationException("Not supported yet."); - } - - } - - private class FilteredSelectionPanel extends FilteredTreeViewPanel - { - - @Override - public JTreeViewPane createDefaultTreeViewPane() - { - return new JTreeViewSelectionPane(); - } - - } -} Copied: branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java (from rev 7217, branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/InfoPane.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -0,0 +1,78 @@ +/* + * InfoPane.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 Jun 26, 2008, 9:32:04 PM + */ +package pcgen.gui.tools; + +import javax.swing.BorderFactory; +import javax.swing.JScrollPane; +import javax.swing.JTextPane; +import javax.swing.border.TitledBorder; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class InfoPane extends JScrollPane +{ + + private JTextPane textPane; + private TitledBorder titledBorder; + + public InfoPane() + { + this("Info"); + } + + public InfoPane(String title) + { + super(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + this.titledBorder = BorderFactory.createTitledBorder(null, title, + TitledBorder.CENTER, + TitledBorder.DEFAULT_POSITION); + this.textPane = new JTextPane(); + initComponents(); + } + + private void initComponents() + { + setBorder(BorderFactory.createCompoundBorder(titledBorder, getBorder())); + + textPane.setEditable(false); + setViewportView(textPane); + } + + public String getTitle() + { + return titledBorder.getTitle(); + } + + public void setTitle(String title) + { + titledBorder.setTitle(title); + validate(); + } + + public void setText(String text) + { + textPane.setText(text); + } + +} Deleted: branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java 2008-07-23 19:38:59 UTC (rev 7226) +++ branches/cdomui/code/src/java/pcgen/gui/util/panes/ChooserPane.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -1,68 +0,0 @@ -/* - * ChooserPane.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 Jun 27, 2008, 12:53:57 PM - */ -package pcgen.gui.util.panes; - -import java.awt.Component; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class ChooserPane extends FlippingSplitPane -{ - - private FlippingSplitPane subSplitPane; - private InfoPane infoPane; - - public ChooserPane() - { - this.subSplitPane = new FlippingSplitPane(VERTICAL_SPLIT); - this.infoPane = new InfoPane(); - - subSplitPane.setTopComponent(infoPane); - setRightComponent(subSplitPane); - - setDividerSize(7); - setContinuousLayout(true); - setOneTouchExpandable(true); - } - - public void setPrimaryChooserComponent(Component c) - { - setLeftComponent(c); - } - - public void setSecondaryChooserComponent(Component c) - { - subSplitPane.setBottomComponent(c); - } - - public void setInfoPaneText(String text) - { - infoPane.setText(text); - } - - public void setInfoPaneTitle(String title) - { - infoPane.setTitle(title); - } - -} Deleted: branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java 2008-07-23 19:38:59 UTC (rev 7226) +++ branches/cdomui/code/src/java/pcgen/gui/util/panes/InfoPane.java 2008-07-23 19:49:40 UTC (rev 7227) @@ -1,78 +0,0 @@ -/* - * InfoPane.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 Jun 26, 2008, 9:32:04 PM - */ -package pcgen.gui.util.panes; - -import javax.swing.BorderFactory; -import javax.swing.JScrollPane; -import javax.swing.JTextPane; -import javax.swing.border.TitledBorder; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class InfoPane extends JScrollPane -{ - - private JTextPane textPane; - private TitledBorder titledBorder; - - public InfoPane() - { - this("Info"); - } - - public InfoPane(String title) - { - super(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - this.titledBorder = BorderFactory.createTitledBorder(null, title, - TitledBorder.CENTER, - TitledBorder.DEFAULT_POSITION); - this.textPane = new JTextPane(); - initComponents(); - } - - private void initComponents() - { - setBorder(BorderFactory.createCompoundBorder(titledBorder, getBorder())); - - textPane.setEditable(false); - setViewportView(textPane); - } - - public String getTitle() - { - return titledBorder.getTitle(); - } - - public void setTitle(String title) - { - titledBorder.setTitle(title); - validate(); - } - - public void setText(String text) - { - textPane.setText(text); - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-24 00:23:48
|
Revision: 7228 http://pcgen.svn.sourceforge.net/pcgen/?rev=7228&view=rev Author: cpmeister Date: 2008-07-24 00:23:55 +0000 (Thu, 24 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewSelectionPanel.java Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java 2008-07-23 19:49:40 UTC (rev 7227) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java 2008-07-24 00:23:55 UTC (rev 7228) @@ -29,9 +29,9 @@ import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.Hashtable; -import java.util.LinkedList; import java.util.List; import javax.swing.AbstractAction; +import javax.swing.BoxLayout; import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JPanel; @@ -62,8 +62,8 @@ ":"; private static final String clearString = PropertyFactory.getString("in_clear"); private static final String advancedString = PropertyFactory.getString("in_demAdv"); - private final List<JToggleButton> filterbuttons; private final JTextField textfield; + private final JPanel buttonPanel; private FilterPanelListener panelListener = null; private ListDataListener listListener; private List<Filter> selectedFilters; @@ -71,14 +71,14 @@ public FilterPanel() { - this.filterbuttons = new LinkedList<JToggleButton>(); + this.buttonPanel = new JPanel(new FilterLayout()); this.textfield = new JTextField(); initComponents(); } private void initComponents() { - setLayout(new FilterLayout()); + setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS)); JToolBar toolbar = new JToolBar(); toolbar.setRollover(true); @@ -135,6 +135,7 @@ toolbar.addSeparator(); add(toolbar); + add(buttonPanel); } private <T> void setFilterClass(Class<T> filterClass) @@ -168,11 +169,7 @@ private <T> void setFilterButtons(List<NamedFilter<? super T>> filters) { - for (JToggleButton button : filterbuttons) - { - remove(button); - } - filterbuttons.clear(); + buttonPanel.removeAll(); boolean updateFilters = selectedFilters.retainAll(filters); @@ -180,8 +177,7 @@ { JToggleButton button = new JToggleButton(new FilterAction(filter)); button.setSelected(selectedFilters.contains(filter)); - filterbuttons.add(button); - add(button); + buttonPanel.add(button); } if (updateFilters) Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-07-23 19:49:40 UTC (rev 7227) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-07-24 00:23:55 UTC (rev 7228) @@ -45,8 +45,8 @@ public class FilteredTreeViewPanel extends JPanel implements StateEditable { - private FilterPanel filterPanel; - private JTreeViewPane treeViewPane; + protected final FilterPanel filterPanel; + protected final JTreeViewPane treeViewPane; public FilteredTreeViewPanel() { @@ -59,18 +59,23 @@ add(treeViewPane, BorderLayout.CENTER); } - public JTreeViewPane createDefaultTreeViewPane() + protected JTreeViewPane createDefaultTreeViewPane() { return new JTreeViewPane(); } + protected JTreeViewPane getTreeViewPane() + { + return treeViewPane; + } + /** * delegates to JTable.getSelectionModel() * @return the row selection model */ public ListSelectionModel getSelectionModel() { - return treeViewPane.getSelectionModel(); + return getTreeViewPane().getSelectionModel(); } /** @@ -79,7 +84,7 @@ */ public List<Object> getSelectedData() { - return treeViewPane.getSelectedData(); + return getTreeViewPane().getSelectedData(); } /** @@ -89,7 +94,7 @@ @Override public TransferHandler getTransferHandler() { - return treeViewPane.getTransferHandler(); + return getTreeViewPane().getTransferHandler(); } /** @@ -99,7 +104,7 @@ @Override public void setTransferHandler(TransferHandler newHandler) { - treeViewPane.setTransferHandler(newHandler); + getTreeViewPane().setTransferHandler(newHandler); } /** @@ -108,7 +113,7 @@ */ public boolean getDragEnabled() { - return treeViewPane.getDragEnabled(); + return getTreeViewPane().getDragEnabled(); } /** @@ -117,7 +122,7 @@ */ public void setDragEnabled(boolean b) { - treeViewPane.setDragEnabled(b); + getTreeViewPane().setDragEnabled(b); } public <T> Hashtable<Object, Object> createState(CharacterFacade character, @@ -137,7 +142,7 @@ public void restoreState(Hashtable<?, ?> state) { FilteredTreeViewModel<?> model = (FilteredTreeViewModel<?>) state.get("FilteredTreeViewModel"); - treeViewPane.setTreeViewModel(model); + getTreeViewPane().setTreeViewModel(model); filterPanel.setFilterPanelListener(model); filterPanel.restoreState(state); } @@ -168,13 +173,13 @@ dataModel.getSize()); new FilterUpdater(sublist, (List<E>) e.getData(), filterPanel.getFilter(), - treeViewPane.getQuickSearchMode()).start(); + getTreeViewPane().getQuickSearchMode()).start(); } public void contentsChanged(GenericListDataEvent e) { applyFilter(filterPanel.getFilter(), - treeViewPane.getQuickSearchMode()); + getTreeViewPane().getQuickSearchMode()); } public void applyFilter(Filter filter, boolean quicksearch) @@ -225,12 +230,12 @@ if (value.size() != baseData.size()) { modelData.clear(); - treeViewPane.setQuickSearchMode(quicksearch); + getTreeViewPane().setQuickSearchMode(quicksearch); modelData.addAll(value); } else { - treeViewPane.setQuickSearchMode(quicksearch); + getTreeViewPane().setQuickSearchMode(quicksearch); } } Modified: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-23 19:49:40 UTC (rev 7227) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-24 00:23:55 UTC (rev 7228) @@ -21,23 +21,29 @@ 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.DefaultComboBoxModel; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JPanel; -import pcgen.gui.filter.FilteredTreeViewPanel; -import pcgen.gui.util.JTreeViewPane; -import pcgen.gui.util.JTreeViewSelectionPane; +import javax.swing.ListModel; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import pcgen.gui.filter.FilterableTreeViewModel; +import pcgen.gui.util.treeview.TreeViewModel; /** * * @author Connor Petty <cpm...@us...> */ -public class ComboSelectionBox extends JPanel +public class ComboSelectionBox extends JPanel implements ItemSelectable { + private ComboSelectionBoxModel model; private JComboBox comboBox; private JButton button; @@ -49,7 +55,8 @@ private void initComponents() { - comboBox = new JComboBox(); + model = new ComboSelectionBoxModel(); + comboBox = new JComboBox(model); setBorder(comboBox.getBorder()); comboBox.setBorder(BorderFactory.createEmptyBorder()); @@ -61,29 +68,105 @@ add(button, BorderLayout.LINE_END); } - private class ButtonAction extends AbstractAction + public void setTreeViewModel(FilterableTreeViewModel<?> viewmodel) { + model.setTreeViewModel(viewmodel); + } - public ButtonAction() + public Object[] getSelectedObjects() + { + return comboBox.getSelectedObjects(); + } + + public void addItemListener(ItemListener l) + { + comboBox.addItemListener(l); + } + + public void removeItemListener(ItemListener l) + { + comboBox.removeItemListener(l); + } + + private static class ComboSelectionBoxModel extends DefaultComboBoxModel + implements ListDataListener + { + + private ListModel model; + + public void setTreeViewModel(TreeViewModel<?> viewmodel) { - super("..."); + int comboSize = super.getSize(); + if (model != null) + { + model.removeListDataListener(this); + int oldsize = getSize(); + model = null; + fireIntervalRemoved(this, comboSize, oldsize - 1); + } + model = viewmodel.getDataModel(); + model.addListDataListener(this); + fireIntervalAdded(this, comboSize, getSize() - 1); } - public void actionPerformed(ActionEvent e) + @Override + public int getSize() { - throw new UnsupportedOperationException("Not supported yet."); + int comboSize = super.getSize(); + if (model == null) + { + return comboSize; + } + return comboSize + model.getSize(); } + @Override + public Object getElementAt(int index) + { + int comboSize = super.getSize(); + if (index < comboSize) + { + return super.getElementAt(index); + } + return model.getElementAt(index - comboSize); + } + + public void intervalAdded(ListDataEvent e) + { + int comboSize = super.getSize(); + fireIntervalAdded(this, comboSize + e.getIndex0(), comboSize + + e.getIndex1()); + } + + public void intervalRemoved(ListDataEvent e) + { + int comboSize = super.getSize(); + fireIntervalRemoved(this, comboSize + e.getIndex0(), comboSize + + e.getIndex1()); + } + + public void contentsChanged(ListDataEvent e) + { + int comboSize = super.getSize(); + fireContentsChanged(this, comboSize + e.getIndex0(), comboSize + + e.getIndex1()); + } + } - private class FilteredSelectionPanel extends FilteredTreeViewPanel + private class ButtonAction extends AbstractAction { - @Override - public JTreeViewPane createDefaultTreeViewPane() + public ButtonAction() { - return new JTreeViewSelectionPane(); + super("..."); } + public void actionPerformed(ActionEvent e) + { + throw new UnsupportedOperationException("Not supported yet."); + } + } + } Added: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form 2008-07-24 00:23:55 UTC (rev 7228) @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> + <NonVisualComponents> + <Component class="javax.swing.JLabel" name="jLabel1"> + <BindingProperties> + <BindingProperty name="text" source="filteredTreeViewSelectionPanel1" sourcePath="${selectedItem}" target="jLabel1" targetPath="text" updateStrategy="1" immediately="false"/> + </BindingProperties> + </Component> + </NonVisualComponents> + <SyntheticProperties> + <SyntheticProperty name="formSizePolicy" type="int" value="1"/> + </SyntheticProperties> + <Events> + <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/> + </Events> + <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,44,0,0,1,-112"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Container class="pcgen.gui.tools.ChooserPane" name="chooserPane1"> + <Properties> + <Property name="secondaryChooserComponent" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor"> + <ComponentRef name="jLabel1"/> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="1.0" weightY="1.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> + <SubComponents> + <Component class="pcgen.gui.tools.FilteredTreeViewSelectionPanel" name="filteredTreeViewSelectionPanel1"> + <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> + </Component> + </SubComponents> + </Container> + <Component class="javax.swing.JButton" name="okButton"> + <Properties> + <Property name="text" type="java.lang.String" value="OK"/> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/> + </Events> + <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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="13" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="cancelButton"> + <Properties> + <Property name="text" type="java.lang.String" value="Cancel"/> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/> + </Events> + <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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> +</Form> Added: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java 2008-07-24 00:23:55 UTC (rev 7228) @@ -0,0 +1,139 @@ +/* + * FilteredSelectionDialog.java + * + * Created on July 23, 2008, 3:43 PM + */ +package pcgen.gui.tools; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class FilteredSelectionDialog extends javax.swing.JDialog +{ + + /** A return status code - returned if Cancel button has been pressed */ + public static final int RET_CANCEL = 0; + /** A return status code - returned if OK button has been pressed */ + public static final int RET_OK = 1; + + /** Creates new form FilteredSelectionDialog */ + public FilteredSelectionDialog(java.awt.Frame parent) + { + super(parent, true); + initComponents(); + } + + /** Creates new form FilteredSelectionDialog */ + public FilteredSelectionDialog(java.awt.Dialog parent) + { + super(parent, true); + initComponents(); + } + + /** @return the return status of this dialog - one of RET_OK or RET_CANCEL */ + public int getReturnStatus() + { + return returnStatus; + } + + public Object getReturnItem() + { + return returnItem; + } + + /** 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; + bindingGroup = new org.jdesktop.beansbinding.BindingGroup(); + + jLabel1 = new javax.swing.JLabel(); + chooserPane1 = new pcgen.gui.tools.ChooserPane(); + filteredTreeViewSelectionPanel1 = new pcgen.gui.tools.FilteredTreeViewSelectionPanel(); + okButton = new javax.swing.JButton(); + cancelButton = new javax.swing.JButton(); + + org.jdesktop.beansbinding.Binding binding = org.jdesktop.beansbinding.Bindings.createAutoBinding(org.jdesktop.beansbinding.AutoBinding.UpdateStrategy.READ, filteredTreeViewSelectionPanel1, org.jdesktop.beansbinding.ELProperty.create("${selectedItem}"), jLabel1, org.jdesktop.beansbinding.BeanProperty.create("text")); + bindingGroup.addBinding(binding); + + addWindowListener(new java.awt.event.WindowAdapter() { + public void windowClosing(java.awt.event.WindowEvent evt) { + closeDialog(evt); + } + }); + getContentPane().setLayout(new java.awt.GridBagLayout()); + + chooserPane1.setSecondaryChooserComponent(jLabel1); + chooserPane1.setLeftComponent(filteredTreeViewSelectionPanel1); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(chooserPane1, gridBagConstraints); + + okButton.setText("OK"); + okButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + okButtonActionPerformed(evt); + } + }); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(okButton, gridBagConstraints); + + cancelButton.setText("Cancel"); + cancelButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cancelButtonActionPerformed(evt); + } + }); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(cancelButton, gridBagConstraints); + + bindingGroup.bind(); + + pack(); + }// </editor-fold>//GEN-END:initComponents + private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed + doClose(RET_OK); + }//GEN-LAST:event_okButtonActionPerformed + + private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed + doClose(RET_CANCEL); + }//GEN-LAST:event_cancelButtonActionPerformed + + /** Closes the dialog */ + private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog + doClose(RET_CANCEL); + }//GEN-LAST:event_closeDialog + + private void doClose(int retStatus) + { + returnStatus = retStatus; + returnItem = filteredTreeViewSelectionPanel1.getSelectedItem(); + setVisible(false); + dispose(); + } + + // Variables declaration - do not modify//GEN-BEGIN:variables + private javax.swing.JButton cancelButton; + private pcgen.gui.tools.ChooserPane chooserPane1; + private pcgen.gui.tools.FilteredTreeViewSelectionPanel filteredTreeViewSelectionPanel1; + private javax.swing.JLabel jLabel1; + private javax.swing.JButton okButton; + private org.jdesktop.beansbinding.BindingGroup bindingGroup; + // End of variables declaration//GEN-END:variables + private int returnStatus = RET_CANCEL; + private Object returnItem = null; +} Added: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewSelectionPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewSelectionPanel.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredTreeViewSelectionPanel.java 2008-07-24 00:23:55 UTC (rev 7228) @@ -0,0 +1,77 @@ +/* + * FilteredTreeViewSelectionPanel.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 23, 2008, 4:39:02 PM + */ +package pcgen.gui.tools; + +import java.awt.ItemSelectable; +import java.awt.event.ItemListener; +import javax.swing.ListSelectionModel; +import pcgen.gui.filter.FilteredTreeViewPanel; +import pcgen.gui.util.JTreeViewPane; +import pcgen.gui.util.JTreeViewSelectionPane; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class FilteredTreeViewSelectionPanel extends FilteredTreeViewPanel + implements ItemSelectable +{ + + @Override + public JTreeViewPane createDefaultTreeViewPane() + { + JTreeViewSelectionPane pane = new JTreeViewSelectionPane(); + pane.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + return pane; + } + + public Object getSelectedItem() + { + Object[] objs = getSelectedObjects(); + if (objs.length > 0) + { + return objs[0]; + } + return null; + } + + public Object[] getSelectedObjects() + { + return getTreeViewPane().getSelectedObjects(); + } + + @Override + protected JTreeViewSelectionPane getTreeViewPane() + { + return (JTreeViewSelectionPane) super.getTreeViewPane(); + } + + public void addItemListener(ItemListener l) + { + getTreeViewPane().addItemListener(l); + } + + public void removeItemListener(ItemListener l) + { + getTreeViewPane().removeItemListener(l); + } + +} Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-23 19:49:40 UTC (rev 7227) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-24 00:23:55 UTC (rev 7228) @@ -25,6 +25,7 @@ import java.awt.ItemSelectable; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.HashSet; import java.util.Set; @@ -133,6 +134,47 @@ } } + /** + * Notifies all listeners that have registered interest for + * notification on this event type. + * @param e the event of interest + * + * @see EventListenerList + */ + protected void fireItemStateChanged(ItemEvent e) + { + // Guaranteed to return a non-null array + Object[] listeners = listenerList.getListenerList(); + // Process the listeners last to first, notifying + // those that are interested in this event + for (int i = listeners.length - 2; i >= 0; i -= 2) + { + if (listeners[i] == ItemListener.class) + { + // Lazily create the event: + // if (changeEvent == null) + // changeEvent = new ChangeEvent(this); + ((ItemListener) listeners[i + 1]).itemStateChanged(e); + } + } + } + + public Object[] getSelectedObjects() + { + TreeViewSelectionTableModel<?> model = (TreeViewSelectionTableModel<?>) getTable().getTreeTableModel(); + return model.selectedSet.toArray(); + } + + public void addItemListener(ItemListener l) + { + listenerList.remove(ItemListener.class, l); + } + + public void removeItemListener(ItemListener l) + { + listenerList.add(ItemListener.class, l); + } + private class TreeViewSelectionTableModel<E> extends TreeViewTableModel<E> { @@ -183,15 +225,29 @@ E obj = (E) super.getValueAt(node, 0); if ((Boolean) aValue) { - if (selectionType == SelectionType.RADIO) + if (selectionType == SelectionType.RADIO && + !selectedSet.isEmpty()) { + Object item = selectedSet.iterator().next(); selectedSet.clear(); + fireItemStateChanged(new ItemEvent(JTreeViewSelectionPane.this, + ItemEvent.ITEM_STATE_CHANGED, + item, + ItemEvent.DESELECTED)); } selectedSet.add(obj); + fireItemStateChanged(new ItemEvent(JTreeViewSelectionPane.this, + ItemEvent.ITEM_STATE_CHANGED, + obj, + ItemEvent.SELECTED)); } else { selectedSet.remove(obj); + fireItemStateChanged(new ItemEvent(JTreeViewSelectionPane.this, + ItemEvent.ITEM_STATE_CHANGED, + obj, + ItemEvent.DESELECTED)); } rowheaderTable.repaint(rowheaderTable.getVisibleRect()); return; @@ -280,21 +336,4 @@ } } - - public Object[] getSelectedObjects() - { - TreeViewSelectionTableModel<?> model = (TreeViewSelectionTableModel<?>) getTable().getTreeTableModel(); - return model.selectedSet.toArray(); - } - - public void addItemListener(ItemListener l) - { - listenerList.remove(ItemListener.class, l); - } - - public void removeItemListener(ItemListener l) - { - listenerList.add(ItemListener.class, l); - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-24 20:23:56
|
Revision: 7237 http://pcgen.svn.sourceforge.net/pcgen/?rev=7237&view=rev Author: cpmeister Date: 2008-07-24 20:24:03 +0000 (Thu, 24 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-07-24 19:35:10 UTC (rev 7236) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-07-24 20:24:03 UTC (rev 7237) @@ -16,7 +16,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,-12,0,0,1,-34"/> + <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,2,0,0,1,-46"/> </AuxValues> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> @@ -170,30 +170,13 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <SubComponents> - <Component class="javax.swing.JComboBox" name="jComboBox2"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="1"> - <StringItem index="0" value="Human"/> - </StringArray> - </Property> - </Properties> + <Component class="pcgen.gui.tools.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> - <Component class="javax.swing.JButton" name="jButton1"> - <Properties> - <Property name="text" type="java.lang.String" value="Browse"/> - </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="After"/> - </Constraint> - </Constraints> - </Component> </SubComponents> </Container> <Container class="javax.swing.JPanel" name="jPanel5"> @@ -308,6 +291,7 @@ <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> @@ -316,46 +300,36 @@ </Constraint> </Constraints> </Component> - <Component class="javax.swing.JLabel" name="jLabel1"> - <Properties> - <Property name="text" type="java.lang.String" value="1st Class:"/> - </Properties> + <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"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JComboBox" name="jComboBox6"> + <Component class="javax.swing.JLabel" name="jLabel7"> <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="4"> - <StringItem index="0" value="Item 1"/> - <StringItem index="1" value="Item 2"/> - <StringItem index="2" value="Item 3"/> - <StringItem index="3" value="Item 4"/> - </StringArray> - </Property> + <Property name="text" type="java.lang.String" value="Class Generation"/> </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="17" weightX="1.0" weightY="0.0"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JButton" name="jButton4"> + <Component class="javax.swing.JLabel" name="jLabel5"> <Properties> - <Property name="text" type="java.lang.String" value="Browse"/> + <Property name="text" type="java.lang.String" value="Level Generation"/> </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="10" weightX="0.0" weightY="0.0"/> + <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.5" weightY="0.0"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JLabel" name="jLabel2"> + <Component class="javax.swing.JLabel" name="jLabel1"> <Properties> - <Property name="text" type="java.lang.String" value="2nd Class:"/> + <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"> @@ -363,7 +337,14 @@ </Constraint> </Constraints> </Component> - <Component class="javax.swing.JComboBox" name="jComboBox7"> + <Component class="pcgen.gui.tools.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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox2"> <Properties> <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> <StringArray count="4"> @@ -376,31 +357,31 @@ </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JButton" name="jButton5"> + <Component class="javax.swing.JLabel" name="jLabel2"> <Properties> - <Property name="text" type="java.lang.String" value="Browse"/> + <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="0" 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="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JLabel" name="jLabel3"> + <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox3"> <Properties> - <Property name="text" type="java.lang.String" value="3rd Class:"/> + <Property name="enabled" type="boolean" value="false"/> </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JComboBox" name="jComboBox8"> + <Component class="javax.swing.JComboBox" name="jComboBox6"> <Properties> <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> <StringArray count="4"> @@ -410,16 +391,17 @@ <StringItem index="3" value="Item 4"/> </StringArray> </Property> + <Property name="enabled" type="boolean" value="false"/> </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JButton" name="jButton6"> + <Component class="javax.swing.JLabel" name="jLabel3"> <Properties> - <Property name="text" type="java.lang.String" value="Browse"/> + <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"> @@ -427,24 +409,18 @@ </Constraint> </Constraints> </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel7"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> - <Connection component="jComboBox1" name="border" type="property"/> - </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Component class="javax.swing.JComboBox" name="jComboBox9"> + <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox4"> <Properties> + <Property name="enabled" type="boolean" value="false"/> + </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox7"> + <Properties> <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> <StringArray count="4"> <StringItem index="0" value="Item 1"/> @@ -453,29 +429,14 @@ <StringItem index="3" value="Item 4"/> </StringArray> </Property> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="null"/> - </Property> + <Property name="enabled" type="boolean" value="false"/> </Properties> <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="Center"/> + <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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JButton" name="jButton7"> - <Properties> - <Property name="text" type="java.lang.String" value="..."/> - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor"> - <Insets value="[0, 0, 0, 0]"/> - </Property> - </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="After"/> - </Constraint> - </Constraints> - </Component> </SubComponents> </Container> </SubComponents> Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-07-24 19:35:10 UTC (rev 7236) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-07-24 20:24:03 UTC (rev 7237) @@ -37,8 +37,7 @@ jPanel4 = new javax.swing.JPanel(); jComboBox4 = new javax.swing.JComboBox(); jPanel2 = new javax.swing.JPanel(); - jComboBox2 = new javax.swing.JComboBox(); - jButton1 = new javax.swing.JButton(); + comboSelectionBox1 = new pcgen.gui.tools.ComboSelectionBox(); jPanel5 = new javax.swing.JPanel(); jButton3 = new javax.swing.JButton(); jComboBox5 = new javax.swing.JComboBox(); @@ -46,18 +45,18 @@ 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(); jLabel1 = new javax.swing.JLabel(); + comboSelectionBox2 = new pcgen.gui.tools.ComboSelectionBox(); + jComboBox2 = new javax.swing.JComboBox(); + jLabel2 = new javax.swing.JLabel(); + comboSelectionBox3 = new pcgen.gui.tools.ComboSelectionBox(); jComboBox6 = new javax.swing.JComboBox(); - jButton4 = new javax.swing.JButton(); - jLabel2 = new javax.swing.JLabel(); + jLabel3 = new javax.swing.JLabel(); + comboSelectionBox4 = new pcgen.gui.tools.ComboSelectionBox(); jComboBox7 = new javax.swing.JComboBox(); - jButton5 = new javax.swing.JButton(); - jLabel3 = new javax.swing.JLabel(); - jComboBox8 = new javax.swing.JComboBox(); - jButton6 = new javax.swing.JButton(); - jPanel7 = new javax.swing.JPanel(); - jComboBox9 = new javax.swing.JComboBox(); - jButton7 = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); getContentPane().setLayout(new java.awt.GridBagLayout()); @@ -117,13 +116,8 @@ 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.PAGE_START); - jComboBox2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Human" })); - jPanel2.add(jComboBox2, java.awt.BorderLayout.CENTER); - - jButton1.setText("Browse"); - jPanel2.add(jButton1, java.awt.BorderLayout.LINE_END); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; @@ -194,63 +188,73 @@ 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()); + jLabel7.setText("Class Generation"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; + jPanel6.add(jLabel7, gridBagConstraints); + + jLabel5.setText("Level Generation"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 0.5; + jPanel6.add(jLabel5, gridBagConstraints); + jLabel1.setText("1st Class:"); jPanel6.add(jLabel1, new java.awt.GridBagConstraints()); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(comboSelectionBox2, gridBagConstraints); - jComboBox6.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - jPanel6.add(jComboBox6, new java.awt.GridBagConstraints()); - - jButton4.setText("Browse"); + jComboBox2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - jPanel6.add(jButton4, gridBagConstraints); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(jComboBox2, gridBagConstraints); jLabel2.setText("2nd Class:"); jPanel6.add(jLabel2, new java.awt.GridBagConstraints()); - jComboBox7.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - jPanel6.add(jComboBox7, new java.awt.GridBagConstraints()); + comboSelectionBox3.setEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(comboSelectionBox3, gridBagConstraints); - jButton5.setText("Browse"); + jComboBox6.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + jComboBox6.setEnabled(false); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - jPanel6.add(jButton5, gridBagConstraints); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(jComboBox6, gridBagConstraints); jLabel3.setText("3rd Class:"); jPanel6.add(jLabel3, new java.awt.GridBagConstraints()); - jComboBox8.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - jPanel6.add(jComboBox8, new java.awt.GridBagConstraints()); + comboSelectionBox4.setEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(comboSelectionBox4, gridBagConstraints); - jButton6.setText("Browse"); - jPanel6.add(jButton6, new java.awt.GridBagConstraints()); + jComboBox7.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + jComboBox7.setEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(jComboBox7, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; getContentPane().add(jPanel6, gridBagConstraints); - jPanel7.setBorder(jComboBox1.getBorder()); - jPanel7.setLayout(new java.awt.BorderLayout()); - - jComboBox9.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - jComboBox9.setBorder(null); - jPanel7.add(jComboBox9, java.awt.BorderLayout.CENTER); - - jButton7.setText("..."); - jButton7.setMargin(new java.awt.Insets(0, 0, 0, 0)); - jPanel7.add(jButton7, java.awt.BorderLayout.LINE_END); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - getContentPane().add(jPanel7, gridBagConstraints); - pack(); }// </editor-fold>//GEN-END:initComponents @@ -272,13 +276,12 @@ } // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton jButton1; + 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 javax.swing.JButton jButton2; private javax.swing.JButton jButton3; - private javax.swing.JButton jButton4; - private javax.swing.JButton jButton5; - private javax.swing.JButton jButton6; - private javax.swing.JButton jButton7; private javax.swing.JCheckBox jCheckBox1; private javax.swing.JComboBox jComboBox1; private javax.swing.JComboBox jComboBox2; @@ -287,19 +290,19 @@ private javax.swing.JComboBox jComboBox5; private javax.swing.JComboBox jComboBox6; private javax.swing.JComboBox jComboBox7; - private javax.swing.JComboBox jComboBox8; - private javax.swing.JComboBox jComboBox9; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel2; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4; + private javax.swing.JLabel jLabel5; + private javax.swing.JLabel jLabel6; + private javax.swing.JLabel jLabel7; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel3; private javax.swing.JPanel jPanel4; private javax.swing.JPanel jPanel5; private javax.swing.JPanel jPanel6; - private javax.swing.JPanel jPanel7; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTable jTable1; private javax.swing.JTextField jTextField1; Modified: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-24 19:35:10 UTC (rev 7236) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-24 20:24:03 UTC (rev 7237) @@ -73,9 +73,18 @@ add(button, BorderLayout.LINE_END); } + @Override + public void setEnabled(boolean enabled) + { + super.setEnabled(enabled); + comboBox.setEnabled(enabled); + button.setEnabled(enabled); + } + public void setTreeViewModel(FilterableTreeViewModel<?> viewmodel) { model.setTreeViewModel(viewmodel); + } public Object getSelectedItem() Modified: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form 2008-07-24 19:35:10 UTC (rev 7236) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form 2008-07-24 20:24:03 UTC (rev 7237) @@ -54,6 +54,7 @@ <Component class="javax.swing.JButton" name="okButton"> <Properties> <Property name="text" type="java.lang.String" value="OK"/> + <Property name="enabled" type="boolean" value="false"/> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/> Modified: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java 2008-07-24 19:35:10 UTC (rev 7236) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java 2008-07-24 20:24:03 UTC (rev 7237) @@ -87,6 +87,7 @@ getContentPane().add(chooserPane1, gridBagConstraints); okButton.setText("OK"); + okButton.setEnabled(false); okButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { okButtonActionPerformed(evt); Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-24 19:35:10 UTC (rev 7236) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-24 20:24:03 UTC (rev 7237) @@ -162,7 +162,11 @@ public Object[] getSelectedObjects() { TreeViewSelectionTableModel<?> model = (TreeViewSelectionTableModel<?>) getTable().getTreeTableModel(); - return model.selectedSet.toArray(); + if (model != null) + { + return model.selectedSet.toArray(); + } + return new Object[0]; } public void addItemListener(ItemListener l) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-24 23:45:41
|
Revision: 7238 http://pcgen.svn.sourceforge.net/pcgen/?rev=7238&view=rev Author: cpmeister Date: 2008-07-24 23:45:48 +0000 (Thu, 24 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeTablePane.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java branches/cdomui/code/src/java/pcgen/gui/util/panes/FlippingSplitPane.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-07-24 23:45:48 UTC (rev 7238) @@ -16,7 +16,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,2,2,0,0,1,-46"/> + <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,16,0,0,1,-77"/> </AuxValues> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> @@ -33,7 +33,7 @@ </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="2" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="2" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="1.0" weightY="0.0"/> </Constraint> </Constraints> @@ -94,7 +94,7 @@ </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="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -130,7 +130,7 @@ </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="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -164,7 +164,7 @@ </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="2" insetsLeft="0" insetsBottom="2" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -191,7 +191,7 @@ </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="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -283,7 +283,7 @@ </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="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -439,5 +439,50 @@ </Component> </SubComponents> </Container> + <Component class="javax.swing.JLabel" name="jLabel8"> + <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"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="okButton"> + <Properties> + <Property name="text" type="java.lang.String" value="OK"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="cancelButton"> + <Properties> + <Property name="text" type="java.lang.String" value="Cancel"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> </SubComponents> </Form> Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -57,6 +57,9 @@ jLabel3 = new javax.swing.JLabel(); comboSelectionBox4 = new pcgen.gui.tools.ComboSelectionBox(); jComboBox7 = new javax.swing.JComboBox(); + jLabel8 = new javax.swing.JLabel(); + okButton = new javax.swing.JButton(); + cancelButton = new javax.swing.JButton(); setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); getContentPane().setLayout(new java.awt.GridBagLayout()); @@ -90,6 +93,7 @@ gridBagConstraints.gridheight = 2; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); getContentPane().add(jPanel3, gridBagConstraints); jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Alignment", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); @@ -101,6 +105,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 4); getContentPane().add(jPanel1, gridBagConstraints); jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Gender", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); @@ -112,6 +117,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(0, 4, 4, 4); getContentPane().add(jPanel4, gridBagConstraints); 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))); @@ -121,7 +127,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 0); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); getContentPane().add(jPanel2, gridBagConstraints); jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Stats", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); @@ -183,6 +189,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); getContentPane().add(jPanel5, gridBagConstraints); 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))); @@ -253,8 +260,26 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); getContentPane().add(jPanel6, gridBagConstraints); + getContentPane().add(jLabel8, new java.awt.GridBagConstraints()); + okButton.setText("OK"); + okButton.setMaximumSize(new java.awt.Dimension(75, 23)); + okButton.setMinimumSize(new java.awt.Dimension(75, 23)); + okButton.setPreferredSize(new java.awt.Dimension(75, 23)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(okButton, gridBagConstraints); + + cancelButton.setText("Cancel"); + cancelButton.setMaximumSize(new java.awt.Dimension(75, 23)); + cancelButton.setMinimumSize(new java.awt.Dimension(75, 23)); + cancelButton.setPreferredSize(new java.awt.Dimension(75, 23)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(cancelButton, gridBagConstraints); + pack(); }// </editor-fold>//GEN-END:initComponents @@ -276,6 +301,7 @@ } // 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; @@ -297,6 +323,7 @@ private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel6; private javax.swing.JLabel jLabel7; + private javax.swing.JLabel jLabel8; private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel3; @@ -306,6 +333,7 @@ private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTable jTable1; private javax.swing.JTextField jTextField1; + private javax.swing.JButton okButton; // End of variables declaration//GEN-END:variables } Modified: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.form 2008-07-24 23:45:48 UTC (rev 7238) @@ -10,7 +10,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,-60,0,0,2,31"/> + <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,-20,0,0,2,21"/> </AuxValues> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> @@ -29,15 +29,6 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> <SubComponents> - <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> <Container class="pcgen.gui.util.panes.FlippingSplitPane" name="flippingSplitPane2"> <Properties> <Property name="dividerSize" type="int" value="7"/> @@ -53,16 +44,6 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> <SubComponents> - <Component class="pcgen.gui.util.panes.InfoPane" name="infoPane1"> - <Properties> - <Property name="title" type="java.lang.String" value="Skill Info"/> - </Properties> - <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> <Container class="javax.swing.JPanel" name="jPanel2"> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription"> @@ -70,19 +51,22 @@ </Constraint> </Constraints> - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <SubComponents> <Container class="javax.swing.JScrollPane" name="jScrollPane2"> <Properties> <Property name="horizontalScrollBarPolicy" type="int" value="31"/> <Property name="verticalScrollBarPolicy" type="int" value="21"/> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[300, 75]"/> + </Property> </Properties> <AuxValues> <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> </AuxValues> <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="60" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="First"/> </Constraint> </Constraints> @@ -109,6 +93,7 @@ </Column> </Table> </Property> + <Property name="enabled" type="boolean" value="false"/> </Properties> </Component> </SubComponents> @@ -118,8 +103,8 @@ <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> </AuxValues> <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="1.0" weightY="1.0"/> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> </Constraint> </Constraints> @@ -136,8 +121,8 @@ <Data value="4"/> </Column> <Column editable="false" title="Class" type="java.lang.Object"/> - <Column editable="false" title="Skill Points" type="java.lang.Integer"/> - <Column editable="false" title="Points Left" type="java.lang.Integer"/> + <Column editable="false" title="Points Spent" type="java.lang.Integer"/> + <Column editable="false" title="Points Gained" type="java.lang.Integer"/> </Table> </Property> </Properties> @@ -146,8 +131,25 @@ </Container> </SubComponents> </Container> + <Component class="pcgen.gui.tools.InfoPane" name="infoPane1"> + <Properties> + <Property name="title" type="java.lang.String" value="Skill Info"/> + </Properties> + <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> + </Component> </SubComponents> </Container> + <Component class="pcgen.gui.filter.FilteredTreeViewPanel" name="filteredTreeViewPanel1"> + <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> + </Component> </SubComponents> </Container> </SubComponents> Modified: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/SkillsTab.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -24,37 +24,33 @@ */ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents private void initComponents() { - java.awt.GridBagConstraints gridBagConstraints; flippingSplitPane1 = new pcgen.gui.util.panes.FlippingSplitPane(); - jPanel1 = new javax.swing.JPanel(); flippingSplitPane2 = new pcgen.gui.util.panes.FlippingSplitPane(); - infoPane1 = new pcgen.gui.tools.InfoPane(); jPanel2 = new javax.swing.JPanel(); jScrollPane2 = new javax.swing.JScrollPane(); jTable2 = new javax.swing.JTable(); jScrollPane1 = new javax.swing.JScrollPane(); jTable1 = new javax.swing.JTable(); + infoPane1 = new pcgen.gui.tools.InfoPane(); + filteredTreeViewPanel1 = new pcgen.gui.filter.FilteredTreeViewPanel(); setLayout(new java.awt.BorderLayout()); flippingSplitPane1.setDividerSize(7); flippingSplitPane1.setContinuousLayout(true); flippingSplitPane1.setOneTouchExpandable(true); - flippingSplitPane1.setLeftComponent(jPanel1); flippingSplitPane2.setDividerSize(7); flippingSplitPane2.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT); flippingSplitPane2.setContinuousLayout(true); flippingSplitPane2.setOneTouchExpandable(true); - infoPane1.setTitle("Skill Info"); - flippingSplitPane2.setTopComponent(infoPane1); + jPanel2.setLayout(new java.awt.BorderLayout()); - jPanel2.setLayout(new java.awt.GridBagLayout()); - jScrollPane2.setHorizontalScrollBarPolicy(javax.swing.ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); jScrollPane2.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + jScrollPane2.setPreferredSize(new java.awt.Dimension(300, 75)); jTable2.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -74,14 +70,10 @@ return types [columnIndex]; } }); + jTable2.setEnabled(false); jScrollPane2.setViewportView(jTable2); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.ipady = 60; - gridBagConstraints.weightx = 1.0; - jPanel2.add(jScrollPane2, gridBagConstraints); + jPanel2.add(jScrollPane2, java.awt.BorderLayout.PAGE_START); jTable1.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -91,7 +83,7 @@ {new Integer(4), null, null, null} }, new String [] { - "Level", "Class", "Skill Points", "Points Left" + "Level", "Class", "Points Spent", "Points Gained" } ) { Class[] types = new Class [] { @@ -111,26 +103,25 @@ }); jScrollPane1.setViewportView(jTable1); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - jPanel2.add(jScrollPane1, gridBagConstraints); + jPanel2.add(jScrollPane1, java.awt.BorderLayout.CENTER); flippingSplitPane2.setRightComponent(jPanel2); + infoPane1.setTitle("Skill Info"); + flippingSplitPane2.setLeftComponent(infoPane1); + flippingSplitPane1.setRightComponent(flippingSplitPane2); + flippingSplitPane1.setLeftComponent(filteredTreeViewPanel1); add(flippingSplitPane1, java.awt.BorderLayout.CENTER); }// </editor-fold>//GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables + private pcgen.gui.filter.FilteredTreeViewPanel filteredTreeViewPanel1; private pcgen.gui.util.panes.FlippingSplitPane flippingSplitPane1; private pcgen.gui.util.panes.FlippingSplitPane flippingSplitPane2; private pcgen.gui.tools.InfoPane infoPane1; - private javax.swing.JPanel jPanel1; private javax.swing.JPanel jPanel2; private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane2; Modified: branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ChooserPane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -30,6 +30,7 @@ public class ChooserPane extends FlippingSplitPane { + private static final long serialVersionUID = -8364721218562027273L; private FlippingSplitPane subSplitPane; private InfoPane infoPane; Modified: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -37,7 +37,6 @@ import javax.swing.SwingUtilities; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; -import pcgen.gui.filter.FilterableTreeViewModel; import pcgen.gui.util.treeview.TreeViewModel; /** @@ -47,6 +46,7 @@ public class ComboSelectionBox extends JPanel implements ItemSelectable { + private static final long serialVersionUID = 4240590146578106112L; private FilteredSelectionDialog dialog = null; private ComboSelectionBoxModel model; private JComboBox comboBox; @@ -60,13 +60,13 @@ private void initComponents() { - model = new ComboSelectionBoxModel(); - comboBox = new JComboBox(model); + comboBox = new JComboBox(); setBorder(comboBox.getBorder()); comboBox.setBorder(BorderFactory.createEmptyBorder()); button = new JButton(new ButtonAction()); + button.setEnabled(false); button.setMargin(new java.awt.Insets(0, 0, 0, 0)); add(comboBox, BorderLayout.CENTER); @@ -81,10 +81,13 @@ button.setEnabled(enabled); } - public void setTreeViewModel(FilterableTreeViewModel<?> viewmodel) + public void setComboSelectionBoxModel(ComboSelectionBoxModel model) { - model.setTreeViewModel(viewmodel); - + this.model = model; + ComboBoxModel boxmodel = new ComboBoxModel(model.getComboBoxData(), + model.getTreeViewModel()); + comboBox.setModel(boxmodel); + button.setEnabled(true); } public Object getSelectedItem() @@ -129,6 +132,8 @@ dialog = new FilteredSelectionDialog((Dialog) window); } } + dialog.restoreState(dialog.createState(model.getCharacter(), + model.getTreeViewModel())); SwingUtilities.invokeLater( new Runnable() { @@ -148,34 +153,19 @@ } - private static class ComboSelectionBoxModel extends DefaultComboBoxModel + private static class ComboBoxModel extends DefaultComboBoxModel implements ListDataListener { - private TreeViewModel<?> viewmodel; private ListModel model; - public void setTreeViewModel(TreeViewModel<?> viewmodel) + public ComboBoxModel(Object[] items, TreeViewModel<?> viewmodel) { - this.viewmodel = viewmodel; - int comboSize = super.getSize(); - if (model != null) - { - model.removeListDataListener(this); - int oldsize = getSize(); - model = null; - fireIntervalRemoved(this, comboSize, oldsize - 1); - } + super(items); model = viewmodel.getDataModel(); model.addListDataListener(this); - fireIntervalAdded(this, comboSize, getSize() - 1); } - public TreeViewModel<?> getTreeViewModel() - { - return viewmodel; - } - @Override public int getSize() { Added: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -0,0 +1,45 @@ +/* + * ComboSelectionBoxModel.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 24, 2008, 2:20:11 PM + */ +package pcgen.gui.tools; + +import pcgen.gui.facade.CharacterFacade; +import pcgen.gui.filter.FilterableTreeViewModel; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface ComboSelectionBoxModel +{ + + /** + * Note: The returned data should not be the same as the data used in the + * <code>FilterableTreeViewModel</code> returned by <code>getTreeViewModel()</code> + * . Data from the <code>FilterableTreeViewModel</code> model is automatically added to the <code>JComboBox</code>'s model. + * @return an array of objects + */ + public Object[] getComboBoxData(); + + public CharacterFacade getCharacter(); + + public FilterableTreeViewModel<?> getTreeViewModel(); + +} Modified: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.form 2008-07-24 23:45:48 UTC (rev 7238) @@ -55,6 +55,15 @@ <Properties> <Property name="text" type="java.lang.String" value="OK"/> <Property name="enabled" type="boolean" value="false"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/> @@ -68,6 +77,15 @@ <Component class="javax.swing.JButton" name="cancelButton"> <Properties> <Property name="text" type="java.lang.String" value="Cancel"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> </Properties> <Events> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/> Modified: branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/tools/FilteredSelectionDialog.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -88,6 +88,9 @@ okButton.setText("OK"); okButton.setEnabled(false); + okButton.setMaximumSize(new java.awt.Dimension(75, 23)); + okButton.setMinimumSize(new java.awt.Dimension(75, 23)); + okButton.setPreferredSize(new java.awt.Dimension(75, 23)); okButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { okButtonActionPerformed(evt); @@ -100,6 +103,9 @@ getContentPane().add(okButton, gridBagConstraints); cancelButton.setText("Cancel"); + cancelButton.setMaximumSize(new java.awt.Dimension(75, 23)); + cancelButton.setMinimumSize(new java.awt.Dimension(75, 23)); + cancelButton.setPreferredSize(new java.awt.Dimension(75, 23)); cancelButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { cancelButtonActionPerformed(evt); Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -43,6 +43,7 @@ public class JTablePane extends JScrollPane { + private static final long serialVersionUID = 4706817975828759006L; private final DynamicTableColumnModelListener listener = new DynamicTableColumnModelListener() { Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTableSortingHeader.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -45,6 +45,7 @@ public class JTableSortingHeader extends JTableHeader implements MouseListener { + private static final long serialVersionUID = -2459707147524421794L; private static final Icon ASCENDING_ICON = ResourceManager.getImageIcon(ResourceManager.Icons.Down16); private static final Icon DESCENDING_ICON = ResourceManager.getImageIcon(ResourceManager.Icons.Up16); private static final ButtonModel defaultModel = new DefaultButtonModel(); Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeTablePane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeTablePane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeTablePane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -30,6 +30,8 @@ public class JTreeTablePane extends JTablePane { + private static final long serialVersionUID = -2581915114516430509L; + public JTreeTablePane() { this(null); @@ -49,7 +51,7 @@ @Override public void setModel(SortableTableModel model) { - //TODO: log something + //TODO: log something } public void setTreeTableModel(TreeTableModel model) Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -51,6 +51,7 @@ public class JTreeViewPane extends JTablePane { + private static final long serialVersionUID = -819160273659674383L; private static final TreeView<Object> searchView = new TreeView<Object>() { Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -49,6 +49,7 @@ public class JTreeViewSelectionPane extends JTreeViewPane implements ItemSelectable { + private static final long serialVersionUID = -4024848218899529700L; private static final Object COLUMN_ID = new Object(); public static enum SelectionType Modified: branches/cdomui/code/src/java/pcgen/gui/util/panes/FlippingSplitPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/panes/FlippingSplitPane.java 2008-07-24 20:24:03 UTC (rev 7237) +++ branches/cdomui/code/src/java/pcgen/gui/util/panes/FlippingSplitPane.java 2008-07-24 23:45:48 UTC (rev 7238) @@ -71,7 +71,7 @@ public class FlippingSplitPane extends JSplitPane { - static final long serialVersionUID = -6343545558990369582L; + private static final long serialVersionUID = -6343545558990369582L; /** * Icon for Center item in popup menu. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-07-30 20:23:55
|
Revision: 7278 http://pcgen.svn.sourceforge.net/pcgen/?rev=7278&view=rev Author: cpmeister Date: 2008-07-30 20:23:56 +0000 (Wed, 30 Jul 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/facade/AbilityFacade.java branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java branches/cdomui/code/src/java/pcgen/gui/facade/SkillFacade.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java branches/cdomui/code/src/java/pcgen/gui/facade/InfoFacade.java Added: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form 2008-07-30 20:23:56 UTC (rev 7278) @@ -0,0 +1,494 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> + <SyntheticProperties> + <SyntheticProperty name="formSizePolicy" type="int" value="1"/> + </SyntheticProperties> + <Events> + <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/> + </Events> + <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,2,6,0,0,1,-101"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Container class="javax.swing.JPanel" name="jPanel3"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Name"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="2" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JTextField" name="jTextField1"> + <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="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="jButton2"> + <Properties> + <Property name="text" type="java.lang.String" value="Generate Name"/> + </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="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel4"> + <Properties> + <Property name="text" type="java.lang.String" value="Name Set:"/> + </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"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox3"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="1"> + <StringItem index="0" value="1990uscensus"/> + </StringArray> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel1"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Alignment"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Component class="javax.swing.JComboBox" name="jComboBox1"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="3"> + <StringItem index="0" value="True Neutral"/> + <StringItem index="1" value="Lawful Good"/> + <StringItem index="2" value="Chaotic Neutral"/> + </StringArray> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel4"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Gender"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Component class="javax.swing.JComboBox" name="jComboBox4"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="1"> + <StringItem index="0" value="Male"/> + </StringArray> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel2"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Race"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox1"> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="First"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel5"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Stats"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JButton" name="jButton3"> + <Properties> + <Property name="text" type="java.lang.String" value="Roll"/> + </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="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox5"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="6"> + <StringItem index="0" value="3d6"/> + <StringItem index="1" value="4d4"/> + <StringItem index="2" value="4d6 drop lowest"/> + <StringItem index="3" value="4d6, reroll 1's"/> + <StringItem index="4" value="4d6, reroll 1's, drop lowest"/> + <StringItem index="5" value="5d6, drop 2 lowest"/> + </StringArray> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Container class="javax.swing.JScrollPane" name="jScrollPane1"> + <Properties> + <Property name="verticalScrollBarPolicy" type="int" value="21"/> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[8, 120]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[375, 120]"/> + </Property> + </Properties> + <AuxValues> + <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + </AuxValues> + <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="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> + <SubComponents> + <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="5" rowCount="6"> + <Column editable="false" title="Stat" type="java.lang.String"> + <Data value="Strength"/> + <Data value="Dexterity"/> + <Data value="Constitution"/> + <Data value="Intelligence"/> + <Data value="Wisdom"/> + <Data value="Charisma"/> + </Column> + <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"/> + </Table> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel6"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Classes"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <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"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel7"> + <Properties> + <Property name="text" type="java.lang.String" value="Class Generation"/> + </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="17" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel5"> + <Properties> + <Property name="text" type="java.lang.String" value="Level Generation"/> + </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.5" 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"/> + </Constraint> + </Constraints> + </Component> + <Component class="pcgen.gui.tools.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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox2"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel2"> + <Properties> + <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="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox3"> + <Properties> + <Property name="enabled" type="boolean" value="false"/> + </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox6"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </Property> + <Property name="enabled" type="boolean" value="false"/> + </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="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel3"> + <Properties> + <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="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox4"> + <Properties> + <Property name="enabled" type="boolean" value="false"/> + </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox7"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="4"> + <StringItem index="0" value="Item 1"/> + <StringItem index="1" value="Item 2"/> + <StringItem index="2" value="Item 3"/> + <StringItem index="3" value="Item 4"/> + </StringArray> + </Property> + <Property name="enabled" type="boolean" value="false"/> + </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Component class="javax.swing.JLabel" name="jLabel8"> + <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"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="okButton"> + <Properties> + <Property name="text" type="java.lang.String" value="OK"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/> + </Events> + <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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="cancelButton"> + <Properties> + <Property name="text" type="java.lang.String" value="Cancel"/> + <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[75, 23]"/> + </Property> + </Properties> + <Events> + <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/> + </Events> + <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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> +</Form> Added: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-07-30 20:23:56 UTC (rev 7278) @@ -0,0 +1,382 @@ +/* + * CharacterCreationDialog.java + * + * Created on July 24, 2008, 5:18 PM + */ + +package pcgen.gui; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class CharacterCreationDialog extends javax.swing.JDialog { + /** A return status code - returned if Cancel button has been pressed */ + public static final int RET_CANCEL = 0; + /** A return status code - returned if OK button has been pressed */ + public static final int RET_OK = 1; + + /** Creates new form CharacterCreationDialog */ + public CharacterCreationDialog(java.awt.Frame parent, boolean modal) { + super(parent, modal); + initComponents(); + } + + /** @return the return status of this dialog - one of RET_OK or RET_CANCEL */ + public int getReturnStatus() { + return returnStatus; + } + + /** 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; + + jPanel3 = new javax.swing.JPanel(); + jTextField1 = new javax.swing.JTextField(); + jButton2 = new javax.swing.JButton(); + jLabel4 = new javax.swing.JLabel(); + jComboBox3 = new javax.swing.JComboBox(); + jPanel1 = new javax.swing.JPanel(); + jComboBox1 = new javax.swing.JComboBox(); + jPanel4 = new javax.swing.JPanel(); + jComboBox4 = new javax.swing.JComboBox(); + jPanel2 = new javax.swing.JPanel(); + comboSelectionBox1 = new pcgen.gui.tools.ComboSelectionBox(); + jPanel5 = new javax.swing.JPanel(); + jButton3 = new javax.swing.JButton(); + jComboBox5 = new javax.swing.JComboBox(); + 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(); + jLabel1 = new javax.swing.JLabel(); + comboSelectionBox2 = new pcgen.gui.tools.ComboSelectionBox(); + jComboBox2 = new javax.swing.JComboBox(); + jLabel2 = new javax.swing.JLabel(); + comboSelectionBox3 = new pcgen.gui.tools.ComboSelectionBox(); + jComboBox6 = new javax.swing.JComboBox(); + jLabel3 = new javax.swing.JLabel(); + comboSelectionBox4 = new pcgen.gui.tools.ComboSelectionBox(); + jComboBox7 = new javax.swing.JComboBox(); + jLabel8 = new javax.swing.JLabel(); + okButton = new javax.swing.JButton(); + cancelButton = new javax.swing.JButton(); + + addWindowListener(new java.awt.event.WindowAdapter() { + public void windowClosing(java.awt.event.WindowEvent evt) { + closeDialog(evt); + } + }); + getContentPane().setLayout(new java.awt.GridBagLayout()); + + jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Name", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); + jPanel3.setLayout(new java.awt.GridBagLayout()); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); + jPanel3.add(jTextField1, gridBagConstraints); + + jButton2.setText("Generate Name"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); + jPanel3.add(jButton2, gridBagConstraints); + + jLabel4.setText("Name Set:"); + jPanel3.add(jLabel4, new java.awt.GridBagConstraints()); + + jComboBox3.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1990uscensus" })); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); + jPanel3.add(jComboBox3, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(jPanel3, gridBagConstraints); + + jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Alignment", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); + jPanel1.setLayout(new java.awt.BorderLayout()); + + jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "True Neutral", "Lawful Good", "Chaotic Neutral" })); + jPanel1.add(jComboBox1, java.awt.BorderLayout.CENTER); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 4); + getContentPane().add(jPanel1, gridBagConstraints); + + jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Gender", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); + jPanel4.setLayout(new java.awt.BorderLayout()); + + jComboBox4.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Male" })); + jPanel4.add(jComboBox4, java.awt.BorderLayout.CENTER); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(0, 4, 4, 4); + getContentPane().add(jPanel4, gridBagConstraints); + + 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.PAGE_START); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(jPanel2, gridBagConstraints); + + jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Stats", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); + jPanel5.setLayout(new java.awt.GridBagLayout()); + + jButton3.setText("Roll"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); + jPanel5.add(jButton3, gridBagConstraints); + + jComboBox5.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "3d6", "4d4", "4d6 drop lowest", "4d6, reroll 1's", "4d6, reroll 1's, drop lowest", "5d6, drop 2 lowest" })); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); + jPanel5.add(jComboBox5, gridBagConstraints); + + jScrollPane1.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); + jScrollPane1.setMinimumSize(new java.awt.Dimension(8, 120)); + jScrollPane1.setPreferredSize(new java.awt.Dimension(375, 120)); + + jTable1.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {"Strength", null, null, null, null}, + {"Dexterity", null, null, null, null}, + {"Constitution", null, null, null, null}, + {"Intelligence", null, null, null, null}, + {"Wisdom", null, null, null, null}, + {"Charisma", null, null, null, null} + }, + new String [] { + "Stat", "Base Score", "Racial Adj", "Total", "Mod" + } + ) { + Class[] types = new Class [] { + java.lang.String.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class + }; + boolean[] canEdit = new boolean [] { + false, true, false, false, false + }; + + public Class getColumnClass(int columnIndex) { + return types [columnIndex]; + } + + public boolean isCellEditable(int rowIndex, int columnIndex) { + return canEdit [columnIndex]; + } + }); + jScrollPane1.setViewportView(jTable1); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0); + jPanel5.add(jScrollPane1, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(jPanel5, gridBagConstraints); + + 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()); + + jLabel7.setText("Class Generation"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; + jPanel6.add(jLabel7, gridBagConstraints); + + jLabel5.setText("Level Generation"); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 0.5; + jPanel6.add(jLabel5, gridBagConstraints); + + jLabel1.setText("1st Class:"); + jPanel6.add(jLabel1, new java.awt.GridBagConstraints()); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(comboSelectionBox2, gridBagConstraints); + + jComboBox2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(jComboBox2, gridBagConstraints); + + jLabel2.setText("2nd Class:"); + jPanel6.add(jLabel2, new java.awt.GridBagConstraints()); + + comboSelectionBox3.setEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(comboSelectionBox3, gridBagConstraints); + + jComboBox6.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + jComboBox6.setEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(jComboBox6, gridBagConstraints); + + jLabel3.setText("3rd Class:"); + jPanel6.add(jLabel3, new java.awt.GridBagConstraints()); + + comboSelectionBox4.setEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(comboSelectionBox4, gridBagConstraints); + + jComboBox7.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); + jComboBox7.setEnabled(false); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + jPanel6.add(jComboBox7, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(jPanel6, gridBagConstraints); + getContentPane().add(jLabel8, new java.awt.GridBagConstraints()); + + okButton.setText("OK"); + okButton.setMaximumSize(new java.awt.Dimension(75, 23)); + okButton.setMinimumSize(new java.awt.Dimension(75, 23)); + okButton.setPreferredSize(new java.awt.Dimension(75, 23)); + okButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + okButtonActionPerformed(evt); + } + }); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(okButton, gridBagConstraints); + + cancelButton.setText("Cancel"); + cancelButton.setMaximumSize(new java.awt.Dimension(75, 23)); + cancelButton.setMinimumSize(new java.awt.Dimension(75, 23)); + cancelButton.setPreferredSize(new java.awt.Dimension(75, 23)); + cancelButton.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + cancelButtonActionPerformed(evt); + } + }); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); + getContentPane().add(cancelButton, gridBagConstraints); + + pack(); + }// </editor-fold>//GEN-END:initComponents + + private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed + doClose(RET_OK); + }//GEN-LAST:event_okButtonActionPerformed + + private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed + doClose(RET_CANCEL); + }//GEN-LAST:event_cancelButtonActionPerformed + + /** Closes the dialog */ + private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog + doClose(RET_CANCEL); + }//GEN-LAST:event_closeDialog + + private void doClose(int retStatus) { + returnStatus = retStatus; + setVisible(false); + dispose(); + } + + /** + * @param args the command line arguments + */ + public static void main(String args[]) { + java.awt.EventQueue.invokeLater(new Runnable() { + public void run() { + CharacterCreationDialog dialog = new CharacterCreationDialog(new javax.swing.JFrame(), true); + dialog.addWindowListener(new java.awt.event.WindowAdapter() { + public void windowClosing(java.awt.event.WindowEvent e) { + System.exit(0); + } + }); + dialog.setVisible(true); + } + }); + } + + // 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 javax.swing.JButton jButton2; + private javax.swing.JButton jButton3; + private javax.swing.JCheckBox jCheckBox1; + private javax.swing.JComboBox jComboBox1; + private javax.swing.JComboBox jComboBox2; + private javax.swing.JComboBox jComboBox3; + private javax.swing.JComboBox jComboBox4; + private javax.swing.JComboBox jComboBox5; + 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; + private javax.swing.JLabel jLabel5; + private javax.swing.JLabel jLabel6; + private javax.swing.JLabel jLabel7; + private javax.swing.JLabel jLabel8; + private javax.swing.JPanel jPanel1; + private javax.swing.JPanel jPanel2; + private javax.swing.JPanel jPanel3; + private javax.swing.JPanel jPanel4; + private javax.swing.JPanel jPanel5; + private javax.swing.JPanel jPanel6; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JTable jTable1; + private javax.swing.JTextField jTextField1; + private javax.swing.JButton okButton; + // End of variables declaration//GEN-END:variables + + private int returnStatus = RET_CANCEL; +} Modified: branches/cdomui/code/src/java/pcgen/gui/facade/AbilityFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/AbilityFacade.java 2008-07-30 17:22:23 UTC (rev 7277) +++ branches/cdomui/code/src/java/pcgen/gui/facade/AbilityFacade.java 2008-07-30 20:23:56 UTC (rev 7278) @@ -26,7 +26,7 @@ * * @author Connor Petty <cpm...@us...> */ -public interface AbilityFacade +public interface AbilityFacade extends InfoFacade { public List<AbilityFacade> getRequiredAbilities(); @@ -39,11 +39,4 @@ public String getDescription(); - public String getSource(); - - public String getInfo(); - - @Override - public String toString(); - } Modified: branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java 2008-07-30 17:22:23 UTC (rev 7277) +++ branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java 2008-07-30 20:23:56 UTC (rev 7278) @@ -35,6 +35,10 @@ public SkillCost getSkillCost(SkillFacade skill); + public float getMaxRanks(SkillCost cost); + + public int getRankCost(SkillCost cost); + public int getGainedSkillPoints(); public void setGainedSkillPoints(int points); Modified: branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java 2008-07-30 17:22:23 UTC (rev 7277) +++ branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java 2008-07-30 20:23:56 UTC (rev 7278) @@ -26,11 +26,9 @@ * * @author Connor Petty <cpm...@us...> */ -public interface ClassFacade +public interface ClassFacade extends InfoFacade { - public String getInfo(); - public Filter<CharacterFacade> getPrerequisites(); public String getHD(); @@ -39,6 +37,4 @@ public String getBaseStat(); - public String getSource(); - } Added: branches/cdomui/code/src/java/pcgen/gui/facade/InfoFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/InfoFacade.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/facade/InfoFacade.java 2008-07-30 20:23:56 UTC (rev 7278) @@ -0,0 +1,37 @@ +/* + * InfoFacade.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 26, 2008, 4:32:09 PM + */ +package pcgen.gui.facade; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface InfoFacade +{ + + public String getInfo(); + + public String getSource(); + + @Override + public String toString(); + +} Modified: branches/cdomui/code/src/java/pcgen/gui/facade/SkillFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/SkillFacade.java 2008-07-30 17:22:23 UTC (rev 7277) +++ branches/cdomui/code/src/java/pcgen/gui/facade/SkillFacade.java 2008-07-30 20:23:56 UTC (rev 7278) @@ -24,7 +24,7 @@ * * @author Connor Petty <cpm...@us...> */ -public interface SkillFacade +public interface SkillFacade extends InfoFacade { public boolean isUntrained(); @@ -33,8 +33,4 @@ public String getKeyStat(); - public String getInfo(); - - public String getSource(); - } Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-30 17:22:23 UTC (rev 7277) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-07-30 20:23:56 UTC (rev 7278) @@ -96,7 +96,9 @@ public Hashtable<Object, Object> createState(CharacterFacade character) { - throw new UnsupportedOperationException("Not supported yet."); + SkillCostTableModel costModel = new SkillCostTableModel(); + SkillPointTableModel pointModel = new SkillPointTableModel(character.getLevels()); + return null; } public void storeState(Hashtable<Object, Object> state) @@ -106,7 +108,12 @@ public void restoreState(Hashtable<?, ?> state) { - throw new UnsupportedOperationException("Not supported yet."); + SkillCostTableModel costModel = (SkillCostTableModel) state.get("SkillCostTableModel"); + SkillPointTableModel pointModel = (SkillPointTableModel) state.get("SkillPointTableModel"); + CharacterLevelFacade selectedLevel = (CharacterLevelFacade) state.get("SelectedCharacterLevel"); + + skillcostTable.setModel(costModel); + skillpointTable.setModel(pointModel); } private static final class SkillTreeViewModel implements FilterableTreeViewModel<SkillFacade>, @@ -263,11 +270,11 @@ private static class SkillCostTableModel extends AbstractTableModel { - private final CharacterFacade character; + private CharacterLevelFacade level; - public SkillCostTableModel(CharacterFacade character) + public void setCharacterLevel(CharacterLevelFacade level) { - this.character = character; + this.level = level; } public int getRowCount() @@ -290,7 +297,7 @@ case 1: return Integer.class; case 2: - return Double.class; + return Float.class; default: return Object.class; } @@ -314,7 +321,22 @@ public Object getValueAt(int rowIndex, int columnIndex) { - throw new UnsupportedOperationException("Not supported yet."); + SkillCost cost = SkillCost.values()[rowIndex]; + if (level == null) + { + return null; + } + switch (columnIndex) + { + case 0: + return cost; + case 1: + return level.getRankCost(cost); + case 2: + return level.getMaxRanks(cost); + default: + throw new IndexOutOfBoundsException(); + } } } @@ -330,9 +352,9 @@ }; private final GenericListModel<CharacterLevelFacade> model; - public SkillPointTableModel(CharacterFacade character) + public SkillPointTableModel(GenericListModel<CharacterLevelFacade> levels) { - model = character.getLevels(); + model = levels; model.addListDataListener(this); } @@ -425,24 +447,35 @@ private static class SkillRankSpinnerModel extends AbstractSpinnerModel { + private final CharacterFacade character; + private CharacterLevelFacade level; + private SkillFacade skill; + + public SkillRankSpinnerModel(CharacterFacade character) + { + this.character = character; + } + public Object getValue() { - throw new UnsupportedOperationException("Not supported yet."); + return character.getSkillRanks(skill); } public void setValue(Object value) { - throw ne... [truncated message content] |
From: <cpm...@us...> - 2008-08-06 01:04:11
|
Revision: 7365 http://pcgen.svn.sourceforge.net/pcgen/?rev=7365&view=rev Author: cpmeister Date: 2008-08-06 01:04:17 +0000 (Wed, 06 Aug 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ClassTab.form branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ClassTab.java Modified: branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-08-06 00:53:17 UTC (rev 7364) +++ branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-08-06 01:04:17 UTC (rev 7365) @@ -20,6 +20,8 @@ */ package pcgen.gui; +import java.util.EnumMap; +import java.util.Map; import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.AbilityFacade; import pcgen.gui.facade.CharacterFacade; @@ -35,6 +37,17 @@ public final class PCGenUIManager { + private static final Map<HouseRule, Boolean> rulesMap; + + static + { + rulesMap = new EnumMap<HouseRule, Boolean>(HouseRule.class); + for (HouseRule key : rulesMap.keySet()) + { + rulesMap.put(key, false); + } + } + private PCGenUIManager() { } @@ -60,4 +73,14 @@ return null; } + public static boolean isHouseRuleSelected(HouseRule rule) + { + return rulesMap.get(rule); + } + + public static enum HouseRule + { + //TODO add the rest of the rules + SKILLMAX; + } } Modified: branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java 2008-08-06 00:53:17 UTC (rev 7364) +++ branches/cdomui/code/src/java/pcgen/gui/facade/CharacterLevelFacade.java 2008-08-06 01:04:17 UTC (rev 7365) @@ -29,7 +29,17 @@ public interface CharacterLevelFacade { - public void investSkillPoints(SkillFacade skill, int points); + /** + * + * This method handles adding and removing skill points to the character's + * skills. This methods takes into acount the skill cost and spendable skill + * points and will call appropriate message dialogs when an inappropriate + * action is called. + * @param skill the skill to invest points in + * @param points the amount of points to invest + * @return true if the points were successfuly invested + */ + public boolean investSkillPoints(SkillFacade skill, int points); public ClassFacade getSelectedClass(); Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-08-06 00:53:17 UTC (rev 7364) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-08-06 01:04:17 UTC (rev 7365) @@ -28,6 +28,8 @@ import javax.swing.JPanel; import javax.swing.ListSelectionModel; import javax.swing.TransferHandler; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; import javax.swing.undo.StateEditable; import pcgen.gui.facade.CharacterFacade; import pcgen.gui.util.GenericListModelWrapper; @@ -125,6 +127,17 @@ getTreeViewPane().setDragEnabled(b); } + public void setDefaultRenderer(Class<?> columnClass, + TableCellRenderer renderer) + { + getTreeViewPane().setDefaultRenderer(columnClass, renderer); + } + + public void setDefaultEditor(Class<?> columnClass, TableCellEditor editor) + { + getTreeViewPane().setDefaultEditor(columnClass, editor); + } + public <T> Hashtable<Object, Object> createState(CharacterFacade character, FilterableTreeViewModel<T> model) { Added: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ClassTab.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ClassTab.form (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ClassTab.form 2008-08-06 01:04:17 UTC (rev 7365) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo"> + <NonVisualComponents> + <Container class="javax.swing.JPanel" name="jPanel1"> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JButton" name="jButton1"> + <Properties> + <Property name="text" type="java.lang.String" value="Add"/> + <Property name="defaultCapable" type="boolean" value="false"/> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[100, 9]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[100, 9]"/> + </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="3" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="13" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JSpinner" name="jSpinner1"> + <Properties> + <Property name="model" type="javax.swing.SpinnerModel" editor="org.netbeans.modules.form.editors2.SpinnerModelEditor"> + <SpinnerModel initial="0" minimum="0" numberType="java.lang.Integer" stepSize="1" type="number"/> + </Property> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[50, 18]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[50, 18]"/> + </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="3" 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="Remove"/> + <Property name="defaultCapable" type="boolean" value="false"/> + <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[100, 23]"/> + </Property> + <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> + <Dimension value="[100, 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="0" gridHeight="1" fill="3" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="2" insetsBottom="2" insetsRight="2" anchor="17" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Container class="javax.swing.JScrollPane" name="jScrollPane1"> + <AuxValues> + <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + </AuxValues> + <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="2" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="1.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> + <SubComponents> + <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="3" rowCount="4"> + <Column editable="true" title="Level" type="java.lang.Integer"> + <Data value="1"/> + <Data value="2"/> + <Data value="3"/> + <Data value="4"/> + </Column> + <Column editable="true" title="Class" type="java.lang.String"> + <Data value="Fighter"/> + <Data value="Fighter"/> + <Data value="Fighter"/> + <Data value="Fighter"/> + </Column> + <Column editable="true" title="Source" type="java.lang.String"> + <Data value="RSRD 3.5"/> + <Data value="RSRD 3.5"/> + <Data value="RSRD 3.5"/> + <Data value="RSRD 3.5"/> + </Column> + </Table> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> + </SubComponents> + </Container> + </NonVisualComponents> + <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,80,0,0,1,-35"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> + <SubComponents> + <Container class="pcgen.gui.tools.ChooserPane" name="chooserPane1"> + <Properties> + <Property name="infoPaneTitle" type="java.lang.String" value="Class Info"/> + <Property name="secondaryChooserComponent" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor"> + <ComponentRef name="jPanel1"/> + </Property> + </Properties> + <Constraints> + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> + <BorderConstraints direction="Center"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/> + <SubComponents> + <Component class="pcgen.gui.filter.FilteredTreeViewPanel" name="filteredTreeViewPanel1"> + <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> + </Component> + </SubComponents> + </Container> + </SubComponents> +</Form> Added: branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ClassTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ClassTab.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/tabs/ClassTab.java 2008-08-06 01:04:17 UTC (rev 7365) @@ -0,0 +1,120 @@ +/* + * ClassTab.java + * + * Created on June 26, 2008, 4:20 PM + */ + +package pcgen.gui.proto.tabs; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class ClassTab extends javax.swing.JPanel { + + /** Creates new form ClassTab */ + public ClassTab() { + 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; + + jPanel1 = new javax.swing.JPanel(); + jButton1 = new javax.swing.JButton(); + jSpinner1 = new javax.swing.JSpinner(); + jButton2 = new javax.swing.JButton(); + jScrollPane1 = new javax.swing.JScrollPane(); + jTable1 = new javax.swing.JTable(); + chooserPane1 = new pcgen.gui.tools.ChooserPane(); + filteredTreeViewPanel1 = new pcgen.gui.filter.FilteredTreeViewPanel(); + + jPanel1.setLayout(new java.awt.GridBagLayout()); + + jButton1.setText("Add"); + jButton1.setDefaultCapable(false); + jButton1.setMinimumSize(new java.awt.Dimension(100, 9)); + jButton1.setPreferredSize(new java.awt.Dimension(100, 9)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2); + jPanel1.add(jButton1, gridBagConstraints); + + jSpinner1.setModel(new javax.swing.SpinnerNumberModel(Integer.valueOf(0), Integer.valueOf(0), null, Integer.valueOf(1))); + jSpinner1.setMinimumSize(new java.awt.Dimension(50, 18)); + jSpinner1.setPreferredSize(new java.awt.Dimension(50, 18)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; + gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2); + jPanel1.add(jSpinner1, gridBagConstraints); + + jButton2.setText("Remove"); + jButton2.setDefaultCapable(false); + jButton2.setMinimumSize(new java.awt.Dimension(100, 23)); + jButton2.setPreferredSize(new java.awt.Dimension(100, 23)); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2); + jPanel1.add(jButton2, gridBagConstraints); + + jTable1.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {new Integer(1), "Fighter", "RSRD 3.5"}, + {new Integer(2), "Fighter", "RSRD 3.5"}, + {new Integer(3), "Fighter", "RSRD 3.5"}, + {new Integer(4), "Fighter", "RSRD 3.5"} + }, + new String [] { + "Level", "Class", "Source" + } + ) { + Class[] types = new Class [] { + java.lang.Integer.class, java.lang.String.class, java.lang.String.class + }; + + public Class getColumnClass(int columnIndex) { + return types [columnIndex]; + } + }); + jScrollPane1.setViewportView(jTable1); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2); + jPanel1.add(jScrollPane1, gridBagConstraints); + + setLayout(new java.awt.BorderLayout()); + + chooserPane1.setInfoPaneTitle("Class Info"); + chooserPane1.setSecondaryChooserComponent(jPanel1); + chooserPane1.setLeftComponent(filteredTreeViewPanel1); + + add(chooserPane1, java.awt.BorderLayout.CENTER); + }// </editor-fold>//GEN-END:initComponents + + + // Variables declaration - do not modify//GEN-BEGIN:variables + private pcgen.gui.tools.ChooserPane chooserPane1; + private pcgen.gui.filter.FilteredTreeViewPanel filteredTreeViewPanel1; + private javax.swing.JButton jButton1; + private javax.swing.JButton jButton2; + private javax.swing.JPanel jPanel1; + private javax.swing.JScrollPane jScrollPane1; + private javax.swing.JSpinner jSpinner1; + private javax.swing.JTable jTable1; + // End of variables declaration//GEN-END:variables + +} Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-08-06 00:53:17 UTC (rev 7364) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-08-06 01:04:17 UTC (rev 7365) @@ -20,6 +20,8 @@ */ package pcgen.gui.tabs; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ListSelectionEvent; import pcgen.gui.tools.ChooserPane; import java.awt.Component; import java.awt.GridBagConstraints; @@ -33,19 +35,23 @@ import javax.swing.JScrollPane; import javax.swing.JSpinner; import javax.swing.JTable; -import javax.swing.SpinnerNumberModel; +import javax.swing.ListSelectionModel; +import javax.swing.event.ChangeListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; +import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel; +import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; import pcgen.cdom.enumeration.SkillCost; import pcgen.gui.PCGenUIManager; +import pcgen.gui.PCGenUIManager.HouseRule; import pcgen.gui.facade.CharacterFacade; import pcgen.gui.facade.CharacterLevelFacade; import pcgen.gui.facade.ClassFacade; import pcgen.gui.facade.SkillFacade; import pcgen.gui.filter.FilterableTreeViewModel; +import pcgen.gui.filter.FilteredTreeViewPanel; import pcgen.gui.util.GenericListModel; import pcgen.gui.util.treeview.DataView; import pcgen.gui.util.treeview.DataViewColumn; @@ -59,12 +65,19 @@ */ public class SkillInfoTab extends ChooserPane implements CharacterStateEditable { -//private final FilterableTreeViewPane + + private final FilteredTreeViewPanel skillPanel; private final JTable skillcostTable; private final JTable skillpointTable; + private SkillTreeViewModel treeviewModel; + private SkillPointTableModel skillpointModel; + private SkillCostTableModel skillcostModel; + private CharacterLevelFacade selectedLevel; + private SkillFacade selectedSkill; public SkillInfoTab() { + this.skillPanel = new FilteredTreeViewPanel(); this.skillcostTable = new JTable(); this.skillpointTable = new JTable(); initComponents(); @@ -72,6 +85,32 @@ private void initComponents() { + skillPanel.setDefaultRenderer(Float.class, + new SkillRankSpinnerRenderer()); + ListSelectionModel selectionModel = skillPanel.getSelectionModel(); + selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + selectionModel.addListSelectionListener( + new ListSelectionListener() + { + + public void valueChanged(ListSelectionEvent e) + { + if (!e.getValueIsAdjusting()) + { + List<Object> data = skillPanel.getSelectedData(); + SkillFacade skill = null; + if (!data.isEmpty() && + data.get(0) instanceof SkillFacade) + { + skill = (SkillFacade) data.get(0); + } + setSelectedSkill(skill); + } + } + + }); + setPrimaryChooserComponent(skillPanel); + JScrollPane tableScrollPane; JPanel tablePanel = new JPanel(new GridBagLayout()); GridBagConstraints constraints = new GridBagConstraints(); @@ -94,28 +133,95 @@ setSecondaryChooserComponent(tablePanel); } + private void setSelectedSkill(SkillFacade skill) + { + this.selectedSkill = skill; + setInfoPaneText(skill.getInfo()); + } + + private void setSelectedLevel(CharacterLevelFacade selectedLevel) + { + this.selectedLevel = selectedLevel; + skillcostModel.setCharacterLevel(selectedLevel); + treeviewModel.setCharacterLevel(selectedLevel); + } + public Hashtable<Object, Object> createState(CharacterFacade character) { + SkillTreeViewModel viewModel = new SkillTreeViewModel(character); SkillCostTableModel costModel = new SkillCostTableModel(); - SkillPointTableModel pointModel = new SkillPointTableModel(character.getLevels()); - return null; + SkillPointTableModel pointModel = new SkillPointTableModel(character); + SkillRankSpinnerEditor rankEditor = new SkillRankSpinnerEditor(character); + + Hashtable<Object, Object> state = skillPanel.createState(character, + viewModel); + state.put("SkillTreeViewModel", viewModel); + state.put("SkillCostTableModel", costModel); + state.put("SkillPointTableModel", pointModel); + state.put("SkillRankSpinnerEditor", rankEditor); + state.put("SelectedCharacterLevel", + character.getLevels().getElementAt(0)); + return state; } public void storeState(Hashtable<Object, Object> state) { - throw new UnsupportedOperationException("Not supported yet."); + state.put("SelectedCharacterLevel", selectedLevel); + state.put("SelectedSkill", selectedSkill); } public void restoreState(Hashtable<?, ?> state) { - SkillCostTableModel costModel = (SkillCostTableModel) state.get("SkillCostTableModel"); - SkillPointTableModel pointModel = (SkillPointTableModel) state.get("SkillPointTableModel"); - CharacterLevelFacade selectedLevel = (CharacterLevelFacade) state.get("SelectedCharacterLevel"); + treeviewModel = (SkillTreeViewModel) state.get("SkillTreeViewModel"); + skillcostModel = (SkillCostTableModel) state.get("SkillCostTableModel"); + skillpointModel = (SkillPointTableModel) state.get("SkillPointTableModel"); - skillcostTable.setModel(costModel); - skillpointTable.setModel(pointModel); + skillcostTable.setModel(skillcostModel); + skillpointTable.setModel(skillpointModel); + + skillPanel.restoreState(state); + skillPanel.setDefaultEditor(Float.class, + (SkillRankSpinnerEditor) state.get("SkillRankSpinnerEditor")); + setSelectedLevel((CharacterLevelFacade) state.get("SelectedCharacterLevel")); + setSelectedSkill((SkillFacade) state.get("SelectedSkill")); } + private class SkillRankSpinnerEditor extends AbstractCellEditor + implements TableCellEditor, ChangeListener + { + + private final JSpinner spinner; + private final SkillRankSpinnerModel model; + + public SkillRankSpinnerEditor(CharacterFacade character) + { + this.model = new SkillRankSpinnerModel(character); + this.spinner = new JSpinner(model); + spinner.addChangeListener(this); + } + + public Object getCellEditorValue() + { + return model.getValue(); + } + + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, + int row, + int column) + { + model.setSkill(selectedSkill); + model.setLevel(selectedLevel); + return spinner; + } + + public void stateChanged(ChangeEvent e) + { + stopCellEditing(); + } + + } + private static final class SkillTreeViewModel implements FilterableTreeViewModel<SkillFacade>, DataView<SkillFacade> { @@ -275,6 +381,7 @@ public void setCharacterLevel(CharacterLevelFacade level) { this.level = level; + fireTableRowsUpdated(0, 2); } public int getRowCount() @@ -321,11 +428,11 @@ public Object getValueAt(int rowIndex, int columnIndex) { - SkillCost cost = SkillCost.values()[rowIndex]; if (level == null) { return null; } + SkillCost cost = SkillCost.values()[rowIndex]; switch (columnIndex) { case 0: @@ -352,9 +459,9 @@ }; private final GenericListModel<CharacterLevelFacade> model; - public SkillPointTableModel(GenericListModel<CharacterLevelFacade> levels) + public SkillPointTableModel(CharacterFacade character) { - model = levels; + model = character.getLevels(); model.addListDataListener(this); } @@ -456,69 +563,83 @@ this.character = character; } - public Object getValue() + public Float getValue() { return character.getSkillRanks(skill); } - public void setValue(Object value) + public void setSkill(SkillFacade skill) { - + this.skill = skill; } - public Object getNextValue() + public void setLevel(CharacterLevelFacade level) { - level.investSkillPoints(skill, 1); - return character.getSkillRanks(skill); + this.level = level; } - public Object getPreviousValue() + public void setValue(Object value) { - level.investSkillPoints(skill, -1); - return character.getSkillRanks(skill); + if (value instanceof Float) + { + setValue((Float) value); + } } - } + public void setValue(Float value) + { + SkillCost cost = level.getSkillCost(skill); + if (value < 0) + { + value = Float.valueOf(0); + } + else if (!PCGenUIManager.isHouseRuleSelected(HouseRule.SKILLMAX)) + { + float max = level.getMaxRanks(cost); + if (value > max) + { + value = max; + } + } + int points = (int) ((value - getValue()) * level.getRankCost(cost)); - private static class TableCellSpinnerEditor extends AbstractCellEditor - implements TableCellEditor - { - - private JSpinner spinner; - - public TableCellSpinnerEditor() - { - SpinnerNumberModel model = new SpinnerNumberModel(); - model.setMinimum(0); - this.spinner = new JSpinner(model); + if (level.investSkillPoints(skill, points)) + { + fireStateChanged(); + } } - public Object getCellEditorValue() + public Float getNextValue() { - return spinner.getValue(); + float value = getValue(); + SkillCost cost = level.getSkillCost(skill); + if (!PCGenUIManager.isHouseRuleSelected(HouseRule.SKILLMAX) && + value == level.getMaxRanks(cost)) + { + return null; + } + return value + 1f / level.getRankCost(cost); } - public Component getTableCellEditorComponent(JTable table, Object value, - boolean isSelected, - int row, - int column) + public Float getPreviousValue() { - if (value == null) + float value = getValue(); + SkillCost cost = level.getSkillCost(skill); + if (value == 0) { - spinner.setValue(0); + return null; } - else - { - spinner.setValue(value); - } - return spinner; + return value - 1f / level.getRankCost(cost); } } - private static class TableCellSpinnerRenderer extends JSpinner implements TableCellRenderer + private static class SkillRankSpinnerRenderer extends DefaultTableCellRenderer { + private JSpinner spinner = new JSpinner(); + + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, @@ -526,15 +647,16 @@ int row, int column) { + super.getTableCellRendererComponent(table, value, isSelected, + hasFocus, row, column); if (value == null) { - setValue(0); + return this; } - else - { - setValue(value); - } - return this; + spinner.setBackground(getBackground()); + spinner.setForeground(getForeground()); + spinner.setValue(value); + return spinner; } } Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java 2008-08-06 00:53:17 UTC (rev 7364) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTablePane.java 2008-08-06 01:04:17 UTC (rev 7365) @@ -30,6 +30,8 @@ import javax.swing.ListSelectionModel; import javax.swing.TransferHandler; import javax.swing.event.TableColumnModelEvent; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import pcgen.gui.util.event.DynamicTableColumnModelListener; import pcgen.gui.util.table.DefaultDynamicTableColumnModel; @@ -176,6 +178,17 @@ return table.getSelectionModel(); } + public void setDefaultRenderer(Class<?> columnClass, + TableCellRenderer renderer) + { + table.setDefaultRenderer(columnClass, renderer); + } + + public void setDefaultEditor(Class<?> columnClass, TableCellEditor editor) + { + table.setDefaultEditor(columnClass, editor); + } + private class CornerAction extends AbstractAction { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-08-07 06:51:30
|
Revision: 7424 http://pcgen.svn.sourceforge.net/pcgen/?rev=7424&view=rev Author: cpmeister Date: 2008-08-07 06:51:34 +0000 (Thu, 07 Aug 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeTable.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewPane.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/proto/SourceSelectionDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/SourceSelectionDialog.java branches/cdomui/code/src/java/pcgen/gui/proto/tabs/EquipmentTab.form branches/cdomui/code/src/java/pcgen/gui/proto/tabs/EquipmentTab.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java Modified: branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-08-07 05:52:25 UTC (rev 7423) +++ branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-08-07 06:51:34 UTC (rev 7424) @@ -25,6 +25,7 @@ import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.AbilityFacade; import pcgen.gui.facade.CharacterFacade; +import pcgen.gui.facade.ClassFacade; import pcgen.gui.facade.SkillFacade; import pcgen.gui.filter.NamedFilter; import pcgen.gui.util.DefaultGenericListModel; @@ -52,6 +53,11 @@ { } + public static boolean isQualified(CharacterFacade character, ClassFacade c) + { + return false; + } + public static <T> GenericListModel<NamedFilter<? super T>> getDisplayedFilters(Class<T> c) { return null; Modified: branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java 2008-08-07 05:52:25 UTC (rev 7423) +++ branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java 2008-08-07 06:51:34 UTC (rev 7424) @@ -20,8 +20,6 @@ */ package pcgen.gui.facade; -import pcgen.gui.filter.Filter; - /** * * @author Connor Petty <cpm...@us...> @@ -29,7 +27,7 @@ public interface ClassFacade extends InfoFacade { - public Filter<CharacterFacade> getPrerequisites(); + public String[] getTypes(); public String getHD(); Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-08-07 05:52:25 UTC (rev 7423) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilteredTreeViewPanel.java 2008-08-07 06:51:34 UTC (rev 7424) @@ -30,6 +30,7 @@ import javax.swing.TransferHandler; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; +import javax.swing.tree.TreeCellRenderer; import javax.swing.undo.StateEditable; import pcgen.gui.facade.CharacterFacade; import pcgen.gui.util.GenericListModelWrapper; @@ -127,6 +128,11 @@ getTreeViewPane().setDragEnabled(b); } + public void setTreeCellRenderer(TreeCellRenderer renderer) + { + getTreeViewPane().setTreeCellRenderer(renderer); + } + public void setDefaultRenderer(Class<?> columnClass, TableCellRenderer renderer) { Deleted: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-08-07 05:52:25 UTC (rev 7423) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.form 2008-08-07 06:51:34 UTC (rev 7424) @@ -1,488 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> - <Properties> - <Property name="defaultCloseOperation" type="int" value="2"/> - </Properties> - <SyntheticProperties> - <SyntheticProperty name="formSizePolicy" type="int" value="1"/> - </SyntheticProperties> - <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,2,16,0,0,1,-77"/> - </AuxValues> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> - <SubComponents> - <Container class="javax.swing.JPanel" name="jPanel3"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Name"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="2" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> - <SubComponents> - <Component class="javax.swing.JTextField" name="jTextField1"> - <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="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JButton" name="jButton2"> - <Properties> - <Property name="text" type="java.lang.String" value="Generate Name"/> - </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="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel4"> - <Properties> - <Property name="text" type="java.lang.String" value="Name Set:"/> - </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"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox3"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="1"> - <StringItem index="0" value="1990uscensus"/> - </StringArray> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel1"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Alignment"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Component class="javax.swing.JComboBox" name="jComboBox1"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="3"> - <StringItem index="0" value="True Neutral"/> - <StringItem index="1" value="Lawful Good"/> - <StringItem index="2" value="Chaotic Neutral"/> - </StringArray> - </Property> - </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="Center"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel4"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Gender"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Component class="javax.swing.JComboBox" name="jComboBox4"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="1"> - <StringItem index="0" value="Male"/> - </StringArray> - </Property> - </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="Center"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel2"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Race"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox1"> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="First"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel5"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Stats"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> - <SubComponents> - <Component class="javax.swing.JButton" name="jButton3"> - <Properties> - <Property name="text" type="java.lang.String" value="Roll"/> - </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="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox5"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="6"> - <StringItem index="0" value="3d6"/> - <StringItem index="1" value="4d4"/> - <StringItem index="2" value="4d6 drop lowest"/> - <StringItem index="3" value="4d6, reroll 1's"/> - <StringItem index="4" value="4d6, reroll 1's, drop lowest"/> - <StringItem index="5" value="5d6, drop 2 lowest"/> - </StringArray> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Container class="javax.swing.JScrollPane" name="jScrollPane1"> - <Properties> - <Property name="verticalScrollBarPolicy" type="int" value="21"/> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[8, 120]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[375, 120]"/> - </Property> - </Properties> - <AuxValues> - <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> - </AuxValues> - <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="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> - <SubComponents> - <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="5" rowCount="6"> - <Column editable="false" title="Stat" type="java.lang.String"> - <Data value="Strength"/> - <Data value="Dexterity"/> - <Data value="Constitution"/> - <Data value="Intelligence"/> - <Data value="Wisdom"/> - <Data value="Charisma"/> - </Column> - <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"/> - </Table> - </Property> - </Properties> - </Component> - </SubComponents> - </Container> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel6"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Classes"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <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"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel7"> - <Properties> - <Property name="text" type="java.lang.String" value="Class Generation"/> - </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="17" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel5"> - <Properties> - <Property name="text" type="java.lang.String" value="Level Generation"/> - </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.5" 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"/> - </Constraint> - </Constraints> - </Component> - <Component class="pcgen.gui.tools.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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox2"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="4"> - <StringItem index="0" value="Item 1"/> - <StringItem index="1" value="Item 2"/> - <StringItem index="2" value="Item 3"/> - <StringItem index="3" value="Item 4"/> - </StringArray> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel2"> - <Properties> - <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="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox3"> - <Properties> - <Property name="enabled" type="boolean" value="false"/> - </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox6"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="4"> - <StringItem index="0" value="Item 1"/> - <StringItem index="1" value="Item 2"/> - <StringItem index="2" value="Item 3"/> - <StringItem index="3" value="Item 4"/> - </StringArray> - </Property> - <Property name="enabled" type="boolean" value="false"/> - </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="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel3"> - <Properties> - <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="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox4"> - <Properties> - <Property name="enabled" type="boolean" value="false"/> - </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox7"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="4"> - <StringItem index="0" value="Item 1"/> - <StringItem index="1" value="Item 2"/> - <StringItem index="2" value="Item 3"/> - <StringItem index="3" value="Item 4"/> - </StringArray> - </Property> - <Property name="enabled" type="boolean" value="false"/> - </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Component class="javax.swing.JLabel" name="jLabel8"> - <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"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JButton" name="okButton"> - <Properties> - <Property name="text" type="java.lang.String" value="OK"/> - <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JButton" name="cancelButton"> - <Properties> - <Property name="text" type="java.lang.String" value="Cancel"/> - <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> -</Form> Deleted: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-08-07 05:52:25 UTC (rev 7423) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterGenerationDialog.java 2008-08-07 06:51:34 UTC (rev 7424) @@ -1,339 +0,0 @@ -/* - * CharacterGenerationDialog.java - * - * Created on July 22, 2008, 1:14 PM - */ - -package pcgen.gui.proto; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class CharacterGenerationDialog extends javax.swing.JDialog { - - /** Creates new form CharacterGenerationDialog */ - public CharacterGenerationDialog(java.awt.Frame parent, boolean modal) { - super(parent, modal); - 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; - - jPanel3 = new javax.swing.JPanel(); - jTextField1 = new javax.swing.JTextField(); - jButton2 = new javax.swing.JButton(); - jLabel4 = new javax.swing.JLabel(); - jComboBox3 = new javax.swing.JComboBox(); - jPanel1 = new javax.swing.JPanel(); - jComboBox1 = new javax.swing.JComboBox(); - jPanel4 = new javax.swing.JPanel(); - jComboBox4 = new javax.swing.JComboBox(); - jPanel2 = new javax.swing.JPanel(); - comboSelectionBox1 = new pcgen.gui.tools.ComboSelectionBox(); - jPanel5 = new javax.swing.JPanel(); - jButton3 = new javax.swing.JButton(); - jComboBox5 = new javax.swing.JComboBox(); - 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(); - jLabel1 = new javax.swing.JLabel(); - comboSelectionBox2 = new pcgen.gui.tools.ComboSelectionBox(); - jComboBox2 = new javax.swing.JComboBox(); - jLabel2 = new javax.swing.JLabel(); - comboSelectionBox3 = new pcgen.gui.tools.ComboSelectionBox(); - jComboBox6 = new javax.swing.JComboBox(); - jLabel3 = new javax.swing.JLabel(); - comboSelectionBox4 = new pcgen.gui.tools.ComboSelectionBox(); - jComboBox7 = new javax.swing.JComboBox(); - jLabel8 = new javax.swing.JLabel(); - okButton = new javax.swing.JButton(); - cancelButton = new javax.swing.JButton(); - - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); - getContentPane().setLayout(new java.awt.GridBagLayout()); - - jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Name", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); - jPanel3.setLayout(new java.awt.GridBagLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); - jPanel3.add(jTextField1, gridBagConstraints); - - jButton2.setText("Generate Name"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); - jPanel3.add(jButton2, gridBagConstraints); - - jLabel4.setText("Name Set:"); - jPanel3.add(jLabel4, new java.awt.GridBagConstraints()); - - jComboBox3.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1990uscensus" })); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); - jPanel3.add(jComboBox3, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(jPanel3, gridBagConstraints); - - jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Alignment", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); - jPanel1.setLayout(new java.awt.BorderLayout()); - - jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "True Neutral", "Lawful Good", "Chaotic Neutral" })); - jPanel1.add(jComboBox1, java.awt.BorderLayout.CENTER); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 4); - getContentPane().add(jPanel1, gridBagConstraints); - - jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Gender", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); - jPanel4.setLayout(new java.awt.BorderLayout()); - - jComboBox4.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Male" })); - jPanel4.add(jComboBox4, java.awt.BorderLayout.CENTER); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(0, 4, 4, 4); - getContentPane().add(jPanel4, gridBagConstraints); - - 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.PAGE_START); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(jPanel2, gridBagConstraints); - - jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Stats", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); - jPanel5.setLayout(new java.awt.GridBagLayout()); - - jButton3.setText("Roll"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); - jPanel5.add(jButton3, gridBagConstraints); - - jComboBox5.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "3d6", "4d4", "4d6 drop lowest", "4d6, reroll 1's", "4d6, reroll 1's, drop lowest", "5d6, drop 2 lowest" })); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); - jPanel5.add(jComboBox5, gridBagConstraints); - - jScrollPane1.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); - jScrollPane1.setMinimumSize(new java.awt.Dimension(8, 120)); - jScrollPane1.setPreferredSize(new java.awt.Dimension(375, 120)); - - jTable1.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - {"Strength", null, null, null, null}, - {"Dexterity", null, null, null, null}, - {"Constitution", null, null, null, null}, - {"Intelligence", null, null, null, null}, - {"Wisdom", null, null, null, null}, - {"Charisma", null, null, null, null} - }, - new String [] { - "Stat", "Base Score", "Racial Adj", "Total", "Mod" - } - ) { - Class[] types = new Class [] { - java.lang.String.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class - }; - boolean[] canEdit = new boolean [] { - false, true, false, false, false - }; - - public Class getColumnClass(int columnIndex) { - return types [columnIndex]; - } - - public boolean isCellEditable(int rowIndex, int columnIndex) { - return canEdit [columnIndex]; - } - }); - jScrollPane1.setViewportView(jTable1); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0); - jPanel5.add(jScrollPane1, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(jPanel5, gridBagConstraints); - - 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()); - - jLabel7.setText("Class Generation"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.weightx = 1.0; - jPanel6.add(jLabel7, gridBagConstraints); - - jLabel5.setText("Level Generation"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.weightx = 0.5; - jPanel6.add(jLabel5, gridBagConstraints); - - jLabel1.setText("1st Class:"); - jPanel6.add(jLabel1, new java.awt.GridBagConstraints()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(comboSelectionBox2, gridBagConstraints); - - jComboBox2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(jComboBox2, gridBagConstraints); - - jLabel2.setText("2nd Class:"); - jPanel6.add(jLabel2, new java.awt.GridBagConstraints()); - - comboSelectionBox3.setEnabled(false); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(comboSelectionBox3, gridBagConstraints); - - jComboBox6.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - jComboBox6.setEnabled(false); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(jComboBox6, gridBagConstraints); - - jLabel3.setText("3rd Class:"); - jPanel6.add(jLabel3, new java.awt.GridBagConstraints()); - - comboSelectionBox4.setEnabled(false); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(comboSelectionBox4, gridBagConstraints); - - jComboBox7.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - jComboBox7.setEnabled(false); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(jComboBox7, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(jPanel6, gridBagConstraints); - getContentPane().add(jLabel8, new java.awt.GridBagConstraints()); - - okButton.setText("OK"); - okButton.setMaximumSize(new java.awt.Dimension(75, 23)); - okButton.setMinimumSize(new java.awt.Dimension(75, 23)); - okButton.setPreferredSize(new java.awt.Dimension(75, 23)); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(okButton, gridBagConstraints); - - cancelButton.setText("Cancel"); - cancelButton.setMaximumSize(new java.awt.Dimension(75, 23)); - cancelButton.setMinimumSize(new java.awt.Dimension(75, 23)); - cancelButton.setPreferredSize(new java.awt.Dimension(75, 23)); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(cancelButton, gridBagConstraints); - - pack(); - }// </editor-fold>//GEN-END:initComponents - - /** - * @param args the command line arguments - */ - public static void main(String args[]) { - java.awt.EventQueue.invokeLater(new Runnable() { - public void run() { - CharacterGenerationDialog dialog = new CharacterGenerationDialog(new javax.swing.JFrame(), true); - dialog.addWindowListener(new java.awt.event.WindowAdapter() { - public void windowClosing(java.awt.event.WindowEvent e) { - System.exit(0); - } - }); - dialog.setVisible(true); - } - }); - } - - // 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 javax.swing.JButton jButton2; - private javax.swing.JButton jButton3; - private javax.swing.JCheckBox jCheckBox1; - private javax.swing.JComboBox jComboBox1; - private javax.swing.JComboBox jComboBox2; - private javax.swing.JComboBox jComboBox3; - private javax.swing.JComboBox jComboBox4; - private javax.swing.JComboBox jComboBox5; - 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; - private javax.swing.JLabel jLabel5; - private javax.swing.JLabel jLabel6; - private javax.swing.JLabel jLabel7; - private javax.swing.JLabel jLabel8; - private javax.swing.JPanel jPanel1; - private javax.swing.JPanel jPanel2; - private javax.swing.JPanel jPanel3; - private javax.swing.JPanel jPanel4; - private javax.swing.JPanel jPanel5; - private javax.swing.JPanel jPanel6; - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JTable jTable1; - private javax.swing.JTextField jTextField1; - private javax.swing.JButton okButton; - // End of variables declaration//GEN-END:variables - -} Added: branches/cdomui/code/src/java/pcgen/gui/proto/SourceSelectionDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/SourceSelectionDialog.form (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/SourceSelectionDialog.form 2008-08-07 06:51:34 UTC (rev 7424) @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<Form version="1.3" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> + <Properties> + <Property name="defaultCloseOperation" type="int" value="2"/> + </Properties> + <SyntheticProperties> + <SyntheticProperty name="formSizePolicy" type="int" value="1"/> + </SyntheticProperties> + <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,44,0,0,1,-112"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JLabel" name="jLabel1"> + <Properties> + <Property name="text" type="java.lang.String" value="Select a Source to load, or define a new set of sources"/> + </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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="17" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Container class="javax.swing.JScrollPane" name="jScrollPane1"> + <AuxValues> + <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + </AuxValues> + <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="2" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="1.0" weightY="1.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> + <SubComponents> + <Component class="javax.swing.JList" name="jList1"> + <Properties> + <Property name="model" type="javax.swing.ListModel" editor="org.netbeans.modules.form.editors2.ListModelEditor"> + <StringArray count="5"> + <StringItem index="0" value="SRD 3.0 for Players"/> + <StringItem index="1" value="SRD 3.0 for Game Masters (includes Monsters)"/> + <StringItem index="2" value="SRD 3.5 for Players"/> + <StringItem index="3" value="SRD 3.5 for Game Masters (includes Monsters)"/> + <StringItem index="4" value="MSRD"/> + </StringArray> + </Property> + <Property name="selectionMode" type="int" value="0"/> + <Property name="cellRenderer" type="javax.swing.ListCellRenderer" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> + <Connection code="new SourceListCellRenderer()" type="code"/> + </Property> + </Properties> + </Component> + </SubComponents> + </Container> + <Component class="javax.swing.JButton" name="jButton1"> + <Properties> + <Property name="text" type="java.lang.String" value="Add"/> + </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="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" 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="Remove"/> + </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="2" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="11" 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="Load"/> + </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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="13" 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="Cancel"/> + </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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> +</Form> Added: branches/cdomui/code/src/java/pcgen/gui/proto/SourceSelectionDialog.java =================================================================== --- branches/cdomui/code/src... [truncated message content] |
From: <cpm...@us...> - 2008-08-08 01:56:06
|
Revision: 7427 http://pcgen.svn.sourceforge.net/pcgen/?rev=7427&view=rev Author: cpmeister Date: 2008-08-08 01:56:14 +0000 (Fri, 08 Aug 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/util/CompactScrollPane.java Modified: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form 2008-08-07 21:32:06 UTC (rev 7426) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form 2008-08-08 01:56:14 UTC (rev 7427) @@ -1,6 +1,33 @@ <?xml version="1.0" encoding="UTF-8" ?> <Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> + <NonVisualComponents> + <Component class="javax.swing.JButton" name="jButton3"> + <Properties> + <Property name="text" type="java.lang.String" value="Roll"/> + <Property name="focusable" type="boolean" value="false"/> + </Properties> + </Component> + <Component class="javax.swing.JTable" name="jTable2"> + <Properties> + <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor"> + <Table columnCount="1" rowCount="6"> + <Column editable="false" title="Title 1" type="java.lang.Object"> + <Data value="Strength"/> + <Data value="Dexterity"/> + <Data value="Constitution"/> + <Data value="Intelligence"/> + <Data value="Wisdom"/> + <Data value="Charisma"/> + </Column> + </Table> + </Property> + </Properties> + <AuxValues> + <AuxValue name="JavaCodeGenerator_InitCodePre" type="java.lang.String" value="jTable2.setPreferredScrollableViewportSize(new Dimension(75, 0));"/> + </AuxValues> + </Component> + </NonVisualComponents> <SyntheticProperties> <SyntheticProperty name="formSizePolicy" type="int" value="1"/> </SyntheticProperties> @@ -16,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,2,6,0,0,1,-101"/> + <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,10,0,0,1,-105"/> </AuxValues> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> @@ -197,16 +224,6 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> <SubComponents> - <Component class="javax.swing.JButton" name="jButton3"> - <Properties> - <Property name="text" type="java.lang.String" value="Roll"/> - </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="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> <Component class="javax.swing.JComboBox" name="jComboBox5"> <Properties> <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> @@ -226,22 +243,13 @@ </Constraint> </Constraints> </Component> - <Container class="javax.swing.JScrollPane" name="jScrollPane1"> - <Properties> - <Property name="verticalScrollBarPolicy" type="int" value="21"/> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[8, 120]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[375, 120]"/> - </Property> - </Properties> + <Container class="pcgen.gui.util.CompactScrollPane" name="compactScrollPane1"> <AuxValues> - <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/> + <AuxValue name="JavaCodeGenerator_LayoutCodePost" type="java.lang.String" value="compactScrollPane1.setRowHeaderView(jTable2);
compactScrollPane1.setCorner(JScrollPane.UPPER_LEFT_CORNER, jButton3);"/> </AuxValues> <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="4" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <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="0.0"/> </Constraint> </Constraints> @@ -250,15 +258,7 @@ <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="5" rowCount="6"> - <Column editable="false" title="Stat" type="java.lang.String"> - <Data value="Strength"/> - <Data value="Dexterity"/> - <Data value="Constitution"/> - <Data value="Intelligence"/> - <Data value="Wisdom"/> - <Data value="Charisma"/> - </Column> + <Table columnCount="4" 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"/> Modified: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-07 21:32:06 UTC (rev 7426) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-08 01:56:14 UTC (rev 7427) @@ -6,6 +6,10 @@ package pcgen.gui; +import java.awt.Dimension; +import javax.swing.JButton; +import javax.swing.JScrollPane; + /** * * @author Connor Petty <cpm...@us...> @@ -36,6 +40,8 @@ private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; + jButton3 = new javax.swing.JButton(); + jTable2 = new javax.swing.JTable(); jPanel3 = new javax.swing.JPanel(); jTextField1 = new javax.swing.JTextField(); jButton2 = new javax.swing.JButton(); @@ -48,9 +54,8 @@ jPanel2 = new javax.swing.JPanel(); comboSelectionBox1 = new pcgen.gui.tools.ComboSelectionBox(); jPanel5 = new javax.swing.JPanel(); - jButton3 = new javax.swing.JButton(); jComboBox5 = new javax.swing.JComboBox(); - jScrollPane1 = new javax.swing.JScrollPane(); + compactScrollPane1 = new pcgen.gui.util.CompactScrollPane(); jTable1 = new javax.swing.JTable(); jPanel6 = new javax.swing.JPanel(); jCheckBox1 = new javax.swing.JCheckBox(); @@ -70,6 +75,32 @@ okButton = new javax.swing.JButton(); cancelButton = new javax.swing.JButton(); + jButton3.setText("Roll"); + jButton3.setFocusable(false); + + jTable2.setPreferredScrollableViewportSize(new Dimension(75, 0)); + jTable2.setModel(new javax.swing.table.DefaultTableModel( + new Object [][] { + {"Strength"}, + {"Dexterity"}, + {"Constitution"}, + {"Intelligence"}, + {"Wisdom"}, + {"Charisma"} + }, + new String [] { + "Title 1" + } + ) { + boolean[] canEdit = new boolean [] { + false + }; + + public boolean isCellEditable(int rowIndex, int columnIndex) { + return canEdit [columnIndex]; + } + }); + addWindowListener(new java.awt.event.WindowAdapter() { public void windowClosing(java.awt.event.WindowEvent evt) { closeDialog(evt); @@ -146,11 +177,6 @@ jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Stats", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); jPanel5.setLayout(new java.awt.GridBagLayout()); - jButton3.setText("Roll"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); - jPanel5.add(jButton3, gridBagConstraints); - jComboBox5.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "3d6", "4d4", "4d6 drop lowest", "4d6, reroll 1's", "4d6, reroll 1's, drop lowest", "5d6, drop 2 lowest" })); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; @@ -159,28 +185,24 @@ gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); jPanel5.add(jComboBox5, gridBagConstraints); - jScrollPane1.setVerticalScrollBarPolicy(javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); - jScrollPane1.setMinimumSize(new java.awt.Dimension(8, 120)); - jScrollPane1.setPreferredSize(new java.awt.Dimension(375, 120)); - jTable1.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { - {"Strength", null, null, null, null}, - {"Dexterity", null, null, null, null}, - {"Constitution", null, null, null, null}, - {"Intelligence", null, null, null, null}, - {"Wisdom", null, null, null, null}, - {"Charisma", 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 [] { - "Stat", "Base Score", "Racial Adj", "Total", "Mod" + "Base Score", "Racial Adj", "Total", "Mod" } ) { Class[] types = new Class [] { - java.lang.String.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 }; boolean[] canEdit = new boolean [] { - false, true, false, false, false + true, false, false, false }; public Class getColumnClass(int columnIndex) { @@ -191,13 +213,15 @@ return canEdit [columnIndex]; } }); - jScrollPane1.setViewportView(jTable1); + compactScrollPane1.setViewportView(jTable1); + compactScrollPane1.setRowHeaderView(jTable2); + compactScrollPane1.setCorner(JScrollPane.UPPER_LEFT_CORNER, jButton3); + gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 0, 0, 0); - jPanel5.add(jScrollPane1, gridBagConstraints); + jPanel5.add(compactScrollPane1, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; @@ -348,6 +372,7 @@ private pcgen.gui.tools.ComboSelectionBox comboSelectionBox2; private pcgen.gui.tools.ComboSelectionBox comboSelectionBox3; private pcgen.gui.tools.ComboSelectionBox comboSelectionBox4; + private pcgen.gui.util.CompactScrollPane compactScrollPane1; private javax.swing.JButton jButton2; private javax.swing.JButton jButton3; private javax.swing.JCheckBox jCheckBox1; @@ -372,8 +397,8 @@ private javax.swing.JPanel jPanel4; private javax.swing.JPanel jPanel5; private javax.swing.JPanel jPanel6; - private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTable jTable1; + private javax.swing.JTable jTable2; private javax.swing.JTextField jTextField1; private javax.swing.JButton okButton; // End of variables declaration//GEN-END:variables Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-08-07 21:32:06 UTC (rev 7426) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ClassInfoTab.java 2008-08-08 01:56:14 UTC (rev 7427) @@ -186,12 +186,14 @@ public Hashtable<Object, Object> createState(CharacterFacade character) { + ClassTreeViewModel treeviewModel = new ClassTreeViewModel(character); ClassTableModel classModel = new ClassTableModel(character); Hashtable<Object, Object> state = treeviewPanel.createState(character, - null); - state.put("ClassTableModel", classModel); - + treeviewModel); + state.put(ClassTableModel.class, classModel); + state.put(AddClassAction.class, new AddClassAction(character)); + state.put(RemoveClassAction.class, new RemoveClassAction(character)); return state; } @@ -202,7 +204,10 @@ public void restoreState(Hashtable<?, ?> state) { - classTable.setModel((ClassTableModel) state.get("ClassTableModel")); + classTable.setModel((ClassTableModel) state.get(ClassTableModel.class)); + addButton.setAction((AddClassAction) state.get(AddClassAction.class)); + removeButton.setAction((RemoveClassAction) state.get(RemoveClassAction.class)); + treeviewPanel.restoreState(state); } private class AddClassAction extends AbstractAction @@ -353,12 +358,18 @@ private static final List<DefaultDataViewColumn> columns = Arrays.asList(new DefaultDataViewColumn("HD", String.class), - new DefaultDataViewColumn("Type", String[].class), + new DefaultDataViewColumn("Type", String.class), new DefaultDataViewColumn("Base Stat", String.class), new DefaultDataViewColumn("Spell Type", String.class)); + private CharacterFacade character; + public ClassTreeViewModel(CharacterFacade character) + { + this.character = character; + } + public Class<ClassFacade> getFilterClass() { return ClassFacade.class; @@ -386,10 +397,25 @@ public List<?> getData(ClassFacade obj) { - return Arrays.asList(obj.getHD(), obj.getTypes(), obj.getBaseStat(), + return Arrays.asList(obj.getHD(), getTypes(obj), obj.getBaseStat(), obj.getSpellType()); } + private String getTypes(ClassFacade obj) + { + String ret = ""; + String[] types = obj.getTypes(); + if (types != null && types.length > 0) + { + ret += types[0]; + for (int x = 1; x < types.length; x++) + { + ret += ", " + types[x]; + } + } + return ret; + } + public List<? extends DataViewColumn> getDataColumns() { return columns; Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-08-07 21:32:06 UTC (rev 7426) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-08-08 01:56:14 UTC (rev 7427) @@ -155,10 +155,10 @@ Hashtable<Object, Object> state = skillPanel.createState(character, viewModel); - state.put("SkillTreeViewModel", viewModel); - state.put("SkillCostTableModel", costModel); - state.put("SkillPointTableModel", pointModel); - state.put("SkillRankSpinnerEditor", rankEditor); + state.put(SkillTreeViewModel.class, viewModel); + state.put(SkillCostTableModel.class, costModel); + state.put(SkillPointTableModel.class, pointModel); + state.put(SkillRankSpinnerEditor.class, rankEditor); state.put("SelectedCharacterLevel", character.getLevels().getElementAt(0)); return state; @@ -172,16 +172,16 @@ public void restoreState(Hashtable<?, ?> state) { - treeviewModel = (SkillTreeViewModel) state.get("SkillTreeViewModel"); - skillcostModel = (SkillCostTableModel) state.get("SkillCostTableModel"); - skillpointModel = (SkillPointTableModel) state.get("SkillPointTableModel"); + treeviewModel = (SkillTreeViewModel) state.get(SkillTreeViewModel.class); + skillcostModel = (SkillCostTableModel) state.get(SkillCostTableModel.class); + skillpointModel = (SkillPointTableModel) state.get(SkillPointTableModel.class); skillcostTable.setModel(skillcostModel); skillpointTable.setModel(skillpointModel); skillPanel.restoreState(state); skillPanel.setDefaultEditor(Float.class, - (SkillRankSpinnerEditor) state.get("SkillRankSpinnerEditor")); + (SkillRankSpinnerEditor) state.get(SkillRankSpinnerEditor.class)); setSelectedLevel((CharacterLevelFacade) state.get("SelectedCharacterLevel")); setSelectedSkill((SkillFacade) state.get("SelectedSkill")); } Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-08-07 21:32:06 UTC (rev 7426) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/ability/AbilityChooserTab.java 2008-08-08 01:56:14 UTC (rev 7427) @@ -649,32 +649,28 @@ } } - private static final String CATAGORY_TABLE_MODEL = "CatagoryTableModel"; private static final String SELECTED_TREEVIEW_PANEL_STATE = "SelectedTreeViewPanelState"; - private static final String SELECTED_ABILITY_TREEVIEW_MODEL = "SelectedAbilityTreeViewModel"; private static final String AVAILABLE_TREEVIEW_PANEL_STATE = "AvailableTreeViewPanelState"; - private static final String AVAILABLE_ABILITY_TREEVIEW_MODEL = "AvailableAbilityTreeViewModel"; - private static final String ABILITY_TRANSFER_HANDLER = "AbilityTransferHandler"; public Hashtable<Object, Object> createState(CharacterFacade character, DefaultGenericListModel<AbilityCatagoryFacade> catagories) { Hashtable<Object, Object> state = new Hashtable<Object, Object>(); - state.put(CATAGORY_TABLE_MODEL, + state.put(CatagoryTableModel.class, new CatagoryTableModel(character, catagories)); SelectedAbilityTreeViewModel selectedAbilityModel = new SelectedAbilityTreeViewModel(character, catagories); AvailableAbilityTreeViewModel availableAbilityModel = new AvailableAbilityTreeViewModel(character); - state.put(SELECTED_ABILITY_TREEVIEW_MODEL, selectedAbilityModel); - state.put(AVAILABLE_ABILITY_TREEVIEW_MODEL, availableAbilityModel); + state.put(SelectedAbilityTreeViewModel.class, selectedAbilityModel); + state.put(AvailableAbilityTreeViewModel.class, availableAbilityModel); state.put(SELECTED_TREEVIEW_PANEL_STATE, selectedTreeViewPanel.createState(character, selectedAbilityModel)); state.put(AVAILABLE_TREEVIEW_PANEL_STATE, availableTreeViewPanel.createState(character, availableAbilityModel)); - state.put(ABILITY_TRANSFER_HANDLER, + state.put(AbilityTransferHandler.class, new AbilityTransferHandler(character)); return state; } @@ -686,10 +682,10 @@ public void restoreState(Hashtable<?, ?> state) { - catagoryModel = (CatagoryTableModel) state.get(CATAGORY_TABLE_MODEL); - selectedModel = (SelectedAbilityTreeViewModel) state.get(SELECTED_ABILITY_TREEVIEW_MODEL); - availableModel = (AvailableAbilityTreeViewModel) state.get(AVAILABLE_ABILITY_TREEVIEW_MODEL); - AbilityTransferHandler handler = (AbilityTransferHandler) state.get(ABILITY_TRANSFER_HANDLER); + catagoryModel = (CatagoryTableModel) state.get(CatagoryTableModel.class); + selectedModel = (SelectedAbilityTreeViewModel) state.get(SelectedAbilityTreeViewModel.class); + availableModel = (AvailableAbilityTreeViewModel) state.get(AvailableAbilityTreeViewModel.class); + AbilityTransferHandler handler = (AbilityTransferHandler) state.get(AbilityTransferHandler.class); catagoryTable.setModel(catagoryModel); selectedTreeViewPanel.setTransferHandler(handler); Added: branches/cdomui/code/src/java/pcgen/gui/util/CompactScrollPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/CompactScrollPane.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/util/CompactScrollPane.java 2008-08-08 01:56:14 UTC (rev 7427) @@ -0,0 +1,92 @@ +/* + * CompactScrollPane.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 7, 2008, 5:09:31 PM + */ +package pcgen.gui.util; + +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Insets; +import javax.swing.JScrollPane; +import javax.swing.JViewport; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class CompactScrollPane extends JScrollPane +{ + + public CompactScrollPane() + { + super(JScrollPane.VERTICAL_SCROLLBAR_NEVER, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + } + + @Override + public Dimension getMinimumSize() + { + JViewport view = getViewport(); + if (view != null) + { + Dimension size = view.getMinimumSize(); + view = getRowHeader(); + if (view != null) + { + size.width += view.getMinimumSize().width; + } + view = getColumnHeader(); + if (view != null) + { + size.height += view.getMinimumSize().height; + } + Insets insets = getInsets(); + size.width += insets.left + insets.right; + size.height += insets.top + insets.bottom; + return size; + } + return super.getMinimumSize(); + } + + @Override + public Dimension getPreferredSize() + { + Component view = getViewport().getView(); + if (view != null) + { + Dimension size = view.getPreferredSize(); + view = getRowHeader(); + if (view != null) + { + size.width += view.getPreferredSize().width; + } + view = getColumnHeader(); + if (view != null) + { + size.height += view.getPreferredSize().height; + } + Insets insets = getInsets(); + size.width += insets.left + insets.right; + size.height += insets.top + insets.bottom; + return size; + } + return super.getPreferredSize(); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2008-08-08 01:58:27
|
Revision: 7428 http://pcgen.svn.sourceforge.net/pcgen/?rev=7428&view=rev Author: cpmeister Date: 2008-08-08 01:58:35 +0000 (Fri, 08 Aug 2008) Log Message: ----------- UI update Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java Deleted: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form 2008-08-08 01:56:14 UTC (rev 7427) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form 2008-08-08 01:58:35 UTC (rev 7428) @@ -1,494 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> - <NonVisualComponents> - <Component class="javax.swing.JButton" name="jButton3"> - <Properties> - <Property name="text" type="java.lang.String" value="Roll"/> - <Property name="focusable" type="boolean" value="false"/> - </Properties> - </Component> - <Component class="javax.swing.JTable" name="jTable2"> - <Properties> - <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor"> - <Table columnCount="1" rowCount="6"> - <Column editable="false" title="Title 1" type="java.lang.Object"> - <Data value="Strength"/> - <Data value="Dexterity"/> - <Data value="Constitution"/> - <Data value="Intelligence"/> - <Data value="Wisdom"/> - <Data value="Charisma"/> - </Column> - </Table> - </Property> - </Properties> - <AuxValues> - <AuxValue name="JavaCodeGenerator_InitCodePre" type="java.lang.String" value="jTable2.setPreferredScrollableViewportSize(new Dimension(75, 0));"/> - </AuxValues> - </Component> - </NonVisualComponents> - <SyntheticProperties> - <SyntheticProperty name="formSizePolicy" type="int" value="1"/> - </SyntheticProperties> - <Events> - <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/> - </Events> - <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,2,10,0,0,1,-105"/> - </AuxValues> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> - <SubComponents> - <Container class="javax.swing.JPanel" name="jPanel3"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Name"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="2" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> - <SubComponents> - <Component class="javax.swing.JTextField" name="jTextField1"> - <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="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JButton" name="jButton2"> - <Properties> - <Property name="text" type="java.lang.String" value="Generate Name"/> - </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="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel4"> - <Properties> - <Property name="text" type="java.lang.String" value="Name Set:"/> - </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"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox3"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="1"> - <StringItem index="0" value="1990uscensus"/> - </StringArray> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel1"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Alignment"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Component class="javax.swing.JComboBox" name="jComboBox1"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="3"> - <StringItem index="0" value="True Neutral"/> - <StringItem index="1" value="Lawful Good"/> - <StringItem index="2" value="Chaotic Neutral"/> - </StringArray> - </Property> - </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="Center"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel4"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Gender"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Component class="javax.swing.JComboBox" name="jComboBox4"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="1"> - <StringItem index="0" value="Male"/> - </StringArray> - </Property> - </Properties> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="Center"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel2"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Race"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> - <SubComponents> - <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox1"> - <Constraints> - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="First"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel5"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Stats"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> - <SubComponents> - <Component class="javax.swing.JComboBox" name="jComboBox5"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="6"> - <StringItem index="0" value="3d6"/> - <StringItem index="1" value="4d4"/> - <StringItem index="2" value="4d6 drop lowest"/> - <StringItem index="3" value="4d6, reroll 1's"/> - <StringItem index="4" value="4d6, reroll 1's, drop lowest"/> - <StringItem index="5" value="5d6, drop 2 lowest"/> - </StringArray> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Container class="pcgen.gui.util.CompactScrollPane" name="compactScrollPane1"> - <AuxValues> - <AuxValue name="JavaCodeGenerator_LayoutCodePost" type="java.lang.String" value="compactScrollPane1.setRowHeaderView(jTable2);
compactScrollPane1.setCorner(JScrollPane.UPPER_LEFT_CORNER, jButton3);"/> - </AuxValues> - <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="0.0"/> - </Constraint> - </Constraints> - - <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/> - <SubComponents> - <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"> - <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"/> - </Table> - </Property> - </Properties> - </Component> - </SubComponents> - </Container> - </SubComponents> - </Container> - <Container class="javax.swing.JPanel" name="jPanel6"> - <Properties> - <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> - <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> - <TitledBorder title="Classes"> - <Font PropertyName="font" name="Tahoma" size="12" style="1"/> - </TitledBorder> - </Border> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - - <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"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel7"> - <Properties> - <Property name="text" type="java.lang.String" value="Class Generation"/> - </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="17" weightX="1.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel5"> - <Properties> - <Property name="text" type="java.lang.String" value="Level Generation"/> - </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.5" 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"/> - </Constraint> - </Constraints> - </Component> - <Component class="pcgen.gui.tools.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="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox2"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="4"> - <StringItem index="0" value="Item 1"/> - <StringItem index="1" value="Item 2"/> - <StringItem index="2" value="Item 3"/> - <StringItem index="3" value="Item 4"/> - </StringArray> - </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel2"> - <Properties> - <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="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox3"> - <Properties> - <Property name="enabled" type="boolean" value="false"/> - </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox6"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="4"> - <StringItem index="0" value="Item 1"/> - <StringItem index="1" value="Item 2"/> - <StringItem index="2" value="Item 3"/> - <StringItem index="3" value="Item 4"/> - </StringArray> - </Property> - <Property name="enabled" type="boolean" value="false"/> - </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="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JLabel" name="jLabel3"> - <Properties> - <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="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox4"> - <Properties> - <Property name="enabled" type="boolean" value="false"/> - </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JComboBox" name="jComboBox7"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="4"> - <StringItem index="0" value="Item 1"/> - <StringItem index="1" value="Item 2"/> - <StringItem index="2" value="Item 3"/> - <StringItem index="3" value="Item 4"/> - </StringArray> - </Property> - <Property name="enabled" type="boolean" value="false"/> - </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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> - </Container> - <Component class="javax.swing.JLabel" name="jLabel8"> - <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"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JButton" name="okButton"> - <Properties> - <Property name="text" type="java.lang.String" value="OK"/> - <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="okButtonActionPerformed"/> - </Events> - <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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - <Component class="javax.swing.JButton" name="cancelButton"> - <Properties> - <Property name="text" type="java.lang.String" value="Cancel"/> - <Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> - <Dimension value="[75, 23]"/> - </Property> - </Properties> - <Events> - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/> - </Events> - <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="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> - </Constraint> - </Constraints> - </Component> - </SubComponents> -</Form> Deleted: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-08 01:56:14 UTC (rev 7427) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-08 01:58:35 UTC (rev 7428) @@ -1,407 +0,0 @@ -/* - * CharacterCreationDialog.java - * - * Created on July 24, 2008, 5:18 PM - */ - -package pcgen.gui; - -import java.awt.Dimension; -import javax.swing.JButton; -import javax.swing.JScrollPane; - -/** - * - * @author Connor Petty <cpm...@us...> - */ -public class CharacterCreationDialog extends javax.swing.JDialog { - /** A return status code - returned if Cancel button has been pressed */ - public static final int RET_CANCEL = 0; - /** A return status code - returned if OK button has been pressed */ - public static final int RET_OK = 1; - - /** Creates new form CharacterCreationDialog */ - public CharacterCreationDialog(java.awt.Frame parent, boolean modal) { - super(parent, modal); - initComponents(); - } - - /** @return the return status of this dialog - one of RET_OK or RET_CANCEL */ - public int getReturnStatus() { - return returnStatus; - } - - /** 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; - - jButton3 = new javax.swing.JButton(); - jTable2 = new javax.swing.JTable(); - jPanel3 = new javax.swing.JPanel(); - jTextField1 = new javax.swing.JTextField(); - jButton2 = new javax.swing.JButton(); - jLabel4 = new javax.swing.JLabel(); - jComboBox3 = new javax.swing.JComboBox(); - jPanel1 = new javax.swing.JPanel(); - jComboBox1 = new javax.swing.JComboBox(); - jPanel4 = new javax.swing.JPanel(); - jComboBox4 = new javax.swing.JComboBox(); - jPanel2 = new javax.swing.JPanel(); - comboSelectionBox1 = new pcgen.gui.tools.ComboSelectionBox(); - jPanel5 = new javax.swing.JPanel(); - jComboBox5 = new javax.swing.JComboBox(); - compactScrollPane1 = new pcgen.gui.util.CompactScrollPane(); - 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(); - jLabel1 = new javax.swing.JLabel(); - comboSelectionBox2 = new pcgen.gui.tools.ComboSelectionBox(); - jComboBox2 = new javax.swing.JComboBox(); - jLabel2 = new javax.swing.JLabel(); - comboSelectionBox3 = new pcgen.gui.tools.ComboSelectionBox(); - jComboBox6 = new javax.swing.JComboBox(); - jLabel3 = new javax.swing.JLabel(); - comboSelectionBox4 = new pcgen.gui.tools.ComboSelectionBox(); - jComboBox7 = new javax.swing.JComboBox(); - jLabel8 = new javax.swing.JLabel(); - okButton = new javax.swing.JButton(); - cancelButton = new javax.swing.JButton(); - - jButton3.setText("Roll"); - jButton3.setFocusable(false); - - jTable2.setPreferredScrollableViewportSize(new Dimension(75, 0)); - jTable2.setModel(new javax.swing.table.DefaultTableModel( - new Object [][] { - {"Strength"}, - {"Dexterity"}, - {"Constitution"}, - {"Intelligence"}, - {"Wisdom"}, - {"Charisma"} - }, - new String [] { - "Title 1" - } - ) { - boolean[] canEdit = new boolean [] { - false - }; - - public boolean isCellEditable(int rowIndex, int columnIndex) { - return canEdit [columnIndex]; - } - }); - - addWindowListener(new java.awt.event.WindowAdapter() { - public void windowClosing(java.awt.event.WindowEvent evt) { - closeDialog(evt); - } - }); - getContentPane().setLayout(new java.awt.GridBagLayout()); - - jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Name", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); - jPanel3.setLayout(new java.awt.GridBagLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); - jPanel3.add(jTextField1, gridBagConstraints); - - jButton2.setText("Generate Name"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); - jPanel3.add(jButton2, gridBagConstraints); - - jLabel4.setText("Name Set:"); - jPanel3.add(jLabel4, new java.awt.GridBagConstraints()); - - jComboBox3.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1990uscensus" })); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); - jPanel3.add(jComboBox3, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridheight = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(jPanel3, gridBagConstraints); - - jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Alignment", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); - jPanel1.setLayout(new java.awt.BorderLayout()); - - jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "True Neutral", "Lawful Good", "Chaotic Neutral" })); - jPanel1.add(jComboBox1, java.awt.BorderLayout.CENTER); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 0, 4); - getContentPane().add(jPanel1, gridBagConstraints); - - jPanel4.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Gender", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); - jPanel4.setLayout(new java.awt.BorderLayout()); - - jComboBox4.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Male" })); - jPanel4.add(jComboBox4, java.awt.BorderLayout.CENTER); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(0, 4, 4, 4); - getContentPane().add(jPanel4, gridBagConstraints); - - 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.PAGE_START); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(jPanel2, gridBagConstraints); - - jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Stats", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); - jPanel5.setLayout(new java.awt.GridBagLayout()); - - jComboBox5.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "3d6", "4d4", "4d6 drop lowest", "4d6, reroll 1's", "4d6, reroll 1's, drop lowest", "5d6, drop 2 lowest" })); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); - jPanel5.add(jComboBox5, gridBagConstraints); - - 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} - }, - new String [] { - "Base Score", "Racial Adj", "Total", "Mod" - } - ) { - Class[] types = new Class [] { - java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class, java.lang.Integer.class - }; - boolean[] canEdit = new boolean [] { - true, false, false, false - }; - - public Class getColumnClass(int columnIndex) { - return types [columnIndex]; - } - - public boolean isCellEditable(int rowIndex, int columnIndex) { - return canEdit [columnIndex]; - } - }); - compactScrollPane1.setViewportView(jTable1); - - compactScrollPane1.setRowHeaderView(jTable2); - compactScrollPane1.setCorner(JScrollPane.UPPER_LEFT_CORNER, jButton3); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel5.add(compactScrollPane1, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(jPanel5, gridBagConstraints); - - 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()); - - jLabel7.setText("Class Generation"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.weightx = 1.0; - jPanel6.add(jLabel7, gridBagConstraints); - - jLabel5.setText("Level Generation"); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.weightx = 0.5; - jPanel6.add(jLabel5, gridBagConstraints); - - jLabel1.setText("1st Class:"); - jPanel6.add(jLabel1, new java.awt.GridBagConstraints()); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(comboSelectionBox2, gridBagConstraints); - - jComboBox2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(jComboBox2, gridBagConstraints); - - jLabel2.setText("2nd Class:"); - jPanel6.add(jLabel2, new java.awt.GridBagConstraints()); - - comboSelectionBox3.setEnabled(false); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(comboSelectionBox3, gridBagConstraints); - - jComboBox6.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - jComboBox6.setEnabled(false); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(jComboBox6, gridBagConstraints); - - jLabel3.setText("3rd Class:"); - jPanel6.add(jLabel3, new java.awt.GridBagConstraints()); - - comboSelectionBox4.setEnabled(false); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(comboSelectionBox4, gridBagConstraints); - - jComboBox7.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); - jComboBox7.setEnabled(false); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel6.add(jComboBox7, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(jPanel6, gridBagConstraints); - getContentPane().add(jLabel8, new java.awt.GridBagConstraints()); - - okButton.setText("OK"); - okButton.setMaximumSize(new java.awt.Dimension(75, 23)); - okButton.setMinimumSize(new java.awt.Dimension(75, 23)); - okButton.setPreferredSize(new java.awt.Dimension(75, 23)); - okButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - okButtonActionPerformed(evt); - } - }); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(okButton, gridBagConstraints); - - cancelButton.setText("Cancel"); - cancelButton.setMaximumSize(new java.awt.Dimension(75, 23)); - cancelButton.setMinimumSize(new java.awt.Dimension(75, 23)); - cancelButton.setPreferredSize(new java.awt.Dimension(75, 23)); - cancelButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - cancelButtonActionPerformed(evt); - } - }); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.insets = new java.awt.Insets(4, 4, 4, 4); - getContentPane().add(cancelButton, gridBagConstraints); - - pack(); - }// </editor-fold>//GEN-END:initComponents - - private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed - doClose(RET_OK); - }//GEN-LAST:event_okButtonActionPerformed - - private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed - doClose(RET_CANCEL); - }//GEN-LAST:event_cancelButtonActionPerformed - - /** Closes the dialog */ - private void closeDialog(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_closeDialog - doClose(RET_CANCEL); - }//GEN-LAST:event_closeDialog - - private void doClose(int retStatus) { - returnStatus = retStatus; - setVisible(false); - dispose(); - } - - /** - * @param args the command line arguments - */ - public static void main(String args[]) { - java.awt.EventQueue.invokeLater(new Runnable() { - public void run() { - CharacterCreationDialog dialog = new CharacterCreationDialog(new javax.swing.JFrame(), true); - dialog.addWindowListener(new java.awt.event.WindowAdapter() { - public void windowClosing(java.awt.event.WindowEvent e) { - System.exit(0); - } - }); - dialog.setVisible(true); - } - }); - } - - // 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.util.CompactScrollPane compactScrollPane1; - private javax.swing.JButton jButton2; - private javax.swing.JButton jButton3; - private javax.swing.JCheckBox jCheckBox1; - private javax.swing.JComboBox jComboBox1; - private javax.swing.JComboBox jComboBox2; - private javax.swing.JComboBox jComboBox3; - private javax.swing.JComboBox jComboBox4; - private javax.swing.JComboBox jComboBox5; - 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; - private javax.swing.JLabel jLabel5; - private javax.swing.JLabel jLabel6; - private javax.swing.JLabel jLabel7; - private javax.swing.JLabel jLabel8; - private javax.swing.JPanel jPanel1; - private javax.swing.JPanel jPanel2; - private javax.swing.JPanel jPanel3; - private javax.swing.JPanel jPanel4; - private javax.swing.JPanel jPanel5; - private javax.swing.JPanel jPanel6; - private javax.swing.JTable jTable1; - private javax.swing.JTable jTable2; - private javax.swing.JTextField jTextField1; - private javax.swing.JButton okButton; - // End of variables declaration//GEN-END:variables - - private int returnStatus = RET_CANCEL; -} Copied: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form (from rev 7427, branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.form) =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form 2008-08-08 01:58:35 UTC (rev 7428) @@ -0,0 +1,494 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo"> + <NonVisualComponents> + <Component class="javax.swing.JButton" name="jButton3"> + <Properties> + <Property name="text" type="java.lang.String" value="Roll"/> + <Property name="focusable" type="boolean" value="false"/> + </Properties> + </Component> + <Component class="javax.swing.JTable" name="jTable2"> + <Properties> + <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor"> + <Table columnCount="1" rowCount="6"> + <Column editable="false" title="Title 1" type="java.lang.Object"> + <Data value="Strength"/> + <Data value="Dexterity"/> + <Data value="Constitution"/> + <Data value="Intelligence"/> + <Data value="Wisdom"/> + <Data value="Charisma"/> + </Column> + </Table> + </Property> + </Properties> + <AuxValues> + <AuxValue name="JavaCodeGenerator_InitCodePre" type="java.lang.String" value="jTable2.setPreferredScrollableViewportSize(new Dimension(75, 0));"/> + </AuxValues> + </Component> + </NonVisualComponents> + <SyntheticProperties> + <SyntheticProperty name="formSizePolicy" type="int" value="1"/> + </SyntheticProperties> + <Events> + <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeDialog"/> + </Events> + <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,2,10,0,0,1,-105"/> + </AuxValues> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Container class="javax.swing.JPanel" name="jPanel3"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Name"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="2" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="4" insetsRight="4" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> + <SubComponents> + <Component class="javax.swing.JTextField" name="jTextField1"> + <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="2" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JButton" name="jButton2"> + <Properties> + <Property name="text" type="java.lang.String" value="Generate Name"/> + </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="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JLabel" name="jLabel4"> + <Properties> + <Property name="text" type="java.lang.String" value="Name Set:"/> + </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"/> + </Constraint> + </Constraints> + </Component> + <Component class="javax.swing.JComboBox" name="jComboBox3"> + <Properties> + <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> + <StringArray count="1"> + <StringItem index="0" value="1990uscensus"/> + </StringArray> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Constraints> + </Component> + </SubComponents> + </Container> + <Container class="javax.swing.JPanel" name="jPanel1"> + <Properties> + <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor"> + <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo"> + <TitledBorder title="Alignment"> + <Font PropertyName="font" name="Tahoma" size="12" style="1"/> + </TitledBorder> + </Border> + </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="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="4" insetsBottom="0" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> + </Constraint> + </Con... [truncated message content] |
From: <cpm...@us...> - 2008-08-09 02:09:31
|
Revision: 7444 http://pcgen.svn.sourceforge.net/pcgen/?rev=7444&view=rev Author: cpmeister Date: 2008-08-09 02:09:38 +0000 (Sat, 09 Aug 2008) Log Message: ----------- UI update Modified Paths: -------------- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java branches/cdomui/code/src/java/pcgen/gui/util/DefaultGenericListModel.java Added 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/generator/ branches/cdomui/code/src/java/pcgen/gui/generator/Generator.java branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionDialog.java branches/cdomui/code/src/java/pcgen/gui/util/DefaultGenericComboBoxModel.java branches/cdomui/code/src/java/pcgen/gui/util/GenericComboBoxModel.java branches/cdomui/code/src/java/pcgen/gui/util/event/DocumentChangeAdapter.java Removed Paths: ------------- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBoxModel.java branches/cdomui/code/src/java/pcgen/gui/util/CompactScrollPane.java Added: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-09 02:09:38 UTC (rev 7444) @@ -0,0 +1,586 @@ +/* + * CharacterCreationDialog.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 7, 2008, 6:58:58 PM + */ +package pcgen.gui; + +import java.beans.PropertyChangeEvent; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.beans.PropertyChangeListener; +import java.util.List; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.ListSelectionModel; +import javax.swing.border.TitledBorder; +import javax.swing.event.DocumentEvent; +import javax.swing.table.TableColumn; +import javax.swing.table.TableColumnModel; +import javax.swing.table.TableColumnModel; +import javax.swing.table.TableModel; +import pcgen.gui.generator.Generator; +import pcgen.gui.tools.ComboSelectionBox; +import pcgen.gui.util.DefaultGenericComboBoxModel; +import pcgen.gui.util.GenericComboBoxModel; +import pcgen.gui.util.event.DocumentChangeAdapter; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public class CharacterCreationDialog extends JDialog +{ + + private final TitledPanel namePanel; + private final JTextField nameField; + private final JComboBox namesetComboBox; + private final TitledPanel alignmentPanel; + private final JComboBox alignmentComboBox; + private final TitledPanel genderPanel; + private final JComboBox genderComboBox; + private final TitledPanel racePanel; + private final ComboSelectionBox raceSelectionBox; + private final TitledPanel statPanel; + private final ComboSelectionBox statSelectionBox; + private final StatTablePane statTablePane; + private final TitledPanel classPanel; + private final JCheckBox classGenerationCheckBox1; + private final JCheckBox classGenerationCheckBox2; + private final JCheckBox classGenerationCheckBox3; + private final ComboSelectionBox classSelectionBox1; + private final ComboSelectionBox classSelectionBox2; + private final ComboSelectionBox classSelectionBox3; + private final JComboBox levelComboBox1; + private final JComboBox levelComboBox2; + private final JComboBox levelComboBox3; + private final OKAction okAction; + private final Action cancelAction; + private CharacterCreationManager creationManager; + + public CharacterCreationDialog() + { + this.namePanel = new TitledPanel("Name"); + this.nameField = new JTextField(); + this.namesetComboBox = new JComboBox(); + this.alignmentPanel = new TitledPanel("Alignment"); + this.alignmentComboBox = new JComboBox(); + this.genderPanel = new TitledPanel("Gender"); + this.genderComboBox = new JComboBox(); + this.racePanel = new TitledPanel("Race"); + this.raceSelectionBox = new ComboSelectionBox(); + this.statPanel = new TitledPanel("Stats"); + this.statSelectionBox = new ComboSelectionBox(); + this.statTablePane = new StatTablePane(); + this.classPanel = new TitledPanel("Classes"); + this.classGenerationCheckBox1 = new JCheckBox(); + this.classGenerationCheckBox2 = new JCheckBox(); + this.classGenerationCheckBox3 = new JCheckBox(); + this.classSelectionBox1 = new ComboSelectionBox(); + this.classSelectionBox2 = new ComboSelectionBox(); + this.classSelectionBox3 = new ComboSelectionBox(); + this.levelComboBox1 = new JComboBox(); + this.levelComboBox2 = new JComboBox(); + this.levelComboBox3 = new JComboBox(); + this.okAction = new OKAction(); + this.cancelAction = new CancelAction(); + initComponents(); + } + + private void initComponents() + { + getContentPane().setLayout(new GridBagLayout()); + GridBagConstraints gridBagConstraints = new GridBagConstraints(); + {//Initialize namePanel + namePanel.setLayout(new GridBagLayout()); + {//Initialize nameField + nameField.getDocument().addDocumentListener( + new DocumentChangeAdapter() + { + + @Override + public void documentChanged(DocumentEvent e) + { + String text = nameField.getText(); + creationManager.setCharacterNameValidity(text != + null && + text.length() > + 0); + } + + }); + } + gridBagConstraints.gridwidth = 2; + gridBagConstraints.fill = GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new Insets(4, 0, 4, 0); + namePanel.add(nameField, gridBagConstraints); + JButton nameButton; + {//Initialize nameButton + nameButton = new JButton(new GenerateNameAction()); + nameButton.setFocusable(false); + } + gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER; + gridBagConstraints.weightx = 0.0; + namePanel.add(nameButton, gridBagConstraints); + + gridBagConstraints.gridwidth = 1; + namePanel.add(new JLabel("Name Set:"), gridBagConstraints); + {//Initialize namesetComboBox + namesetComboBox.setModel(createComboBoxModel(PCGenUIManager.getRegisteredNameGenerators())); + } + gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER; + namePanel.add(namesetComboBox, gridBagConstraints); + } + gridBagConstraints = new GridBagConstraints(); + gridBagConstraints.gridheight = 2; + gridBagConstraints.fill = GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new Insets(4, 4, 4, 4); + getContentPane().add(namePanel, gridBagConstraints); + {//Initialize alignmentPanel + alignmentPanel.setLayout(new BorderLayout()); + {//Initialize alignmentComboBox + + } + alignmentPanel.add(alignmentComboBox, BorderLayout.CENTER); + } + gridBagConstraints = new GridBagConstraints(); + gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER; + gridBagConstraints.fill = GridBagConstraints.BOTH; + gridBagConstraints.insets = new Insets(4, 4, 0, 4); + getContentPane().add(alignmentPanel, gridBagConstraints); + {//Initialize genderPanel + genderPanel.setLayout(new BorderLayout()); + {//Initialize genderComboBox + + } + genderPanel.add(genderComboBox, BorderLayout.CENTER); + } + gridBagConstraints.insets = new Insets(0, 4, 4, 4); + getContentPane().add(genderPanel, gridBagConstraints); + {//Initialize racePanel + racePanel.setLayout(new BorderLayout()); + {//Initialize raceSelectionBox + + } + racePanel.add(raceSelectionBox, BorderLayout.CENTER); + } + gridBagConstraints.insets = new Insets(4, 4, 4, 4); + getContentPane().add(racePanel, gridBagConstraints); + {//Initialize statPanel + statPanel.setLayout(new GridBagLayout()); + {//Initialize statSelectionBox + + } + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new Insets(2, 0, 2, 0); + statPanel.add(statSelectionBox, gridBagConstraints); + {//Initialize statTablePane + + } + statPanel.add(statTablePane, gridBagConstraints); + } + gridBagConstraints.weightx = 0.0; + gridBagConstraints.insets = new Insets(4, 4, 4, 4); + getContentPane().add(statPanel, gridBagConstraints); + {//Initialize classPanel + classPanel.setLayout(new GridBagLayout()); + + gridBagConstraints = new GridBagConstraints(); + classPanel.add(new JLabel(), gridBagConstraints); + + gridBagConstraints.anchor = GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new Insets(0, 4, 0, 0); + classPanel.add(new JLabel("Class Generation"), gridBagConstraints); + + gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER; + gridBagConstraints.weightx = 0.5; + classPanel.add(new JLabel("Level Generation"), gridBagConstraints); + SelectClassRowAction rowAction; + {//Initialize classGenerationCheckBox1 + classGenerationCheckBox1.setText("1st Class:"); + rowAction = new SelectClassRowAction(classGenerationCheckBox1, + classSelectionBox1, + levelComboBox1); + classGenerationCheckBox1.setAction(rowAction); + } + {//Initialize classSelectionBox1 + + } + {//Initialize levelComboBox1 + + } + initClassSelectionRow(classGenerationCheckBox1, classSelectionBox1, + levelComboBox1); + {//Initialize classGenerationCheckBox2 + classGenerationCheckBox2.setText("2nd Class:"); + SelectClassRowAction action = new SelectClassRowAction(classGenerationCheckBox2, + classSelectionBox2, + levelComboBox2); + rowAction.setRowAction(action); + rowAction = action; + classGenerationCheckBox2.setAction(rowAction); + } + {//Initialize classSelectionBox2 + + } + {//Initialize levelComboBox2 + + } + initClassSelectionRow(classGenerationCheckBox2, classSelectionBox2, + levelComboBox2); + {//Initialize classGenerationCheckBox3 + classGenerationCheckBox3.setText("3rd Class:"); + SelectClassRowAction action = new SelectClassRowAction(classGenerationCheckBox3, + classSelectionBox3, + levelComboBox3); + rowAction.setRowAction(action); + rowAction = action; + classGenerationCheckBox2.setAction(rowAction); + } + {//Initialize classSelectionBox3 + + } + {//Initialize levelComboBox3 + + } + initClassSelectionRow(classGenerationCheckBox3, classSelectionBox3, + levelComboBox3); + } + gridBagConstraints = new GridBagConstraints(); + gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER; + gridBagConstraints.fill = GridBagConstraints.BOTH; + gridBagConstraints.insets = new Insets(4, 4, 4, 4); + getContentPane().add(classPanel, gridBagConstraints); + + gridBagConstraints = new GridBagConstraints(); + getContentPane().add(new JLabel(), gridBagConstraints); + + Dimension buttonSize = new Dimension(75, 23); + gridBagConstraints.insets = new Insets(4, 4, 4, 4); + initControlButton(okAction, buttonSize, gridBagConstraints); + initControlButton(cancelAction, buttonSize, gridBagConstraints); + } + + private void initClassSelectionRow(JCheckBox classGenerationBox, + ComboSelectionBox classSelectionBox, + JComboBox levelComboBox) + { + GridBagConstraints gridBagConstraints = new GridBagConstraints(); + gridBagConstraints.anchor = GridBagConstraints.EAST; + classPanel.add(classGenerationBox, gridBagConstraints); + + gridBagConstraints.fill = GridBagConstraints.BOTH; + gridBagConstraints.insets = new Insets(2, 0, 2, 4); + classPanel.add(classSelectionBox, gridBagConstraints); + + gridBagConstraints.gridwidth = GridBagConstraints.REMAINDER; + gridBagConstraints.insets = new Insets(2, 0, 2, 2); + classPanel.add(levelComboBox, gridBagConstraints); + } + + private void initControlButton(Action action, Dimension buttonSize, + GridBagConstraints gridBagConstraints) + { + JButton button = new JButton(action); + button.setMinimumSize(buttonSize); + button.setPreferredSize(buttonSize); + button.setMaximumSize(buttonSize); + getContentPane().add(button, gridBagConstraints); + } + + private <T> GenericComboBoxModel<T> createComboBoxModel(List<T> data) + { + return new DefaultGenericComboBoxModel<T>(data); + } + + public void setCharacterCreationManager(CharacterCreationManager manager) + { + if (creationManager != null) + { + creationManager.removePropertyChangeListener(okAction); + creationManager.removePropertyChangeListener(CharacterCreationManager.NAME_VALIDITY, + namePanel); + creationManager.removePropertyChangeListener(CharacterCreationManager.ALIGNMENT_VALIDITY, + alignmentPanel); + creationManager.removePropertyChangeListener(CharacterCreationManager.GENDER_VALIDITY, + genderPanel); + creationManager.removePropertyChangeListener(CharacterCreationManager.RACE_VALIDITY, + racePanel); + creationManager.removePropertyChangeListener(CharacterCreationManager.STATS_VALIDITY, + statPanel); + creationManager.removePropertyChangeListener(CharacterCreationManager.CLASSES_VALIDITY, + classPanel); + } + creationManager = manager; + if (creationManager != null) + { + creationManager.addPropertyChangeListener(okAction); + creationManager.addPropertyChangeListener(CharacterCreationManager.NAME_VALIDITY, + namePanel); + creationManager.addPropertyChangeListener(CharacterCreationManager.ALIGNMENT_VALIDITY, + alignmentPanel); + creationManager.addPropertyChangeListener(CharacterCreationManager.GENDER_VALIDITY, + genderPanel); + creationManager.addPropertyChangeListener(CharacterCreationManager.RACE_VALIDITY, + racePanel); + creationManager.addPropertyChangeListener(CharacterCreationManager.STATS_VALIDITY, + statPanel); + creationManager.addPropertyChangeListener(CharacterCreationManager.CLASSES_VALIDITY, + classPanel); + + nameField.setText(PCGenUIManager.getDefaultCharacterName()); + alignmentComboBox.setModel(createComboBoxModel(creationManager.getAlignmentGenerators())); + genderComboBox.setModel(createComboBoxModel(creationManager.getGenderGenerators())); + raceSelectionBox.setModel(createComboBoxModel(creationManager.getRaceGenerators())); + statSelectionBox.setModel(createComboBoxModel(creationManager.getStatGenerators())); + } + } + + private class OKAction extends AbstractAction implements PropertyChangeListener + { + + public OKAction() + { + super("OK"); + } + + public void actionPerformed(ActionEvent e) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void propertyChange(PropertyChangeEvent evt) + { + setEnabled(creationManager.isCharacterValid()); + } + + } + + private class CancelAction extends AbstractAction + { + + public CancelAction() + { + super("Cancel"); + } + + public void actionPerformed(ActionEvent e) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + } + + private class GenerateNameAction extends AbstractAction + { + + public GenerateNameAction() + { + super("Generate Name"); + } + + public void actionPerformed(ActionEvent e) + { + @SuppressWarnings("unchecked") + Generator<String> nameGenerator = (Generator<String>) namesetComboBox.getSelectedItem(); + nameField.setText(nameGenerator.getRandom()); + } + + } + + private static class SelectClassRowAction extends AbstractAction + { + + private JCheckBox actionBox; + private ComboSelectionBox selectionBox; + private JComboBox comboBox; + private SelectClassRowAction rowAction; + + public SelectClassRowAction(JCheckBox actionBox, + ComboSelectionBox selectionBox, + JComboBox comboBox) + { + super(actionBox.getText()); + this.actionBox = actionBox; + this.selectionBox = selectionBox; + this.comboBox = comboBox; + } + + public void actionPerformed(ActionEvent e) + { + setEnabled(true); + } + + @Override + public void setEnabled(boolean newValue) + { + super.setEnabled(newValue); + newValue &= actionBox.isSelected(); + selectionBox.setEnabled(newValue); + comboBox.setEnabled(newValue); + if (rowAction != null) + { + rowAction.setEnabled(newValue); + } + } + + public void setRowAction(SelectClassRowAction rowAction) + { + this.rowAction = rowAction; + rowAction.setEnabled(false); + } + + } + + private static class TitledPanel extends JPanel implements PropertyChangeListener + { + + private final TitledBorder titleBorder; + + public TitledPanel(String title) + { + this.titleBorder = new TitledBorder(null, title, + TitledBorder.DEFAULT_JUSTIFICATION, + TitledBorder.DEFAULT_POSITION, + new Font("Tahoma", + Font.BOLD, + 12)); + setBorder(this.titleBorder); + } + + public void propertyChange(PropertyChangeEvent evt) + { + if ((Boolean) evt.getNewValue()) + { + titleBorder.setTitleColor(Color.BLACK); + } + else + { + titleBorder.setTitleColor(Color.RED); + } + repaint(); + } + + } + + private static class StatTablePane extends JScrollPane + { + + private final JTable rowTable; + private final JTable statTable; + + public StatTablePane() + { + super(JScrollPane.VERTICAL_SCROLLBAR_NEVER, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + this.rowTable = new JTable(); + this.statTable = new JTable(); + initComponents(); + } + + private void initComponents() + { + + rowTable.setPreferredScrollableViewportSize(new Dimension(75, 0)); + rowTable.setAutoCreateColumnsFromModel(false); + rowTable.addColumn(new TableColumn()); + ListSelectionModel selectionModel = rowTable.getSelectionModel(); + selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + setRowHeaderView(rowTable); + + statTable.setAutoCreateColumnsFromModel(false); + statTable.setSelectionModel(selectionModel); + setViewportView(statTable); + } + + public void setTableModel(TableModel model) + { + rowTable.setModel(model); + statTable.setModel(model); + + TableColumnModel columnModel = statTable.getColumnModel(); + while (columnModel.getColumnCount() > 0) + { + columnModel.removeColumn(columnModel.getColumn(0)); + } + + // Create new columns from the data model info + for (int i = 1; i < model.getColumnCount(); i++) + { + TableColumn column = new TableColumn(i); + statTable.addColumn(column); + } + } + + public void setUpperLeft(Component upperLeft) + { + setCorner(JScrollPane.UPPER_LEFT_CORNER, upperLeft); + } + + @Override + public Dimension getMinimumSize() + { + return getPreferredSize(); + } + + @Override + public Dimension getPreferredSize() + { + Component view = getViewport().getView(); + if (view != null) + { + Dimension size = view.getPreferredSize(); + view = getRowHeader(); + if (view != null) + { + size.width += view.getPreferredSize().width; + } + view = getColumnHeader(); + if (view != null) + { + size.height += view.getPreferredSize().height; + } + Insets insets = getInsets(); + size.width += insets.left + insets.right; + size.height += insets.top + insets.bottom; + return size; + } + return super.getPreferredSize(); + } + + } +} Added: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java 2008-08-09 02:09:38 UTC (rev 7444) @@ -0,0 +1,69 @@ +/* + * CharacterCreationManager.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 8, 2008, 3:18:20 PM + */ +package pcgen.gui; + +import java.beans.PropertyChangeListener; +import java.util.List; +import pcgen.cdom.enumeration.Gender; +import pcgen.gui.facade.ClassFacade; +import pcgen.gui.facade.RaceFacade; +import pcgen.gui.generator.Generator; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface CharacterCreationManager +{ + + public static final String NAME_VALIDITY = "Name"; + public static final String ALIGNMENT_VALIDITY = "Alignment"; + public static final String GENDER_VALIDITY = "Gender"; + public static final String RACE_VALIDITY = "Race"; + public static final String STATS_VALIDITY = "Stats"; + public static final String CLASSES_VALIDITY = "Classes"; + + public void addPropertyChangeListener(PropertyChangeListener l); + + public void addPropertyChangeListener(String prop, PropertyChangeListener l); + + public void removePropertyChangeListener(PropertyChangeListener l); + + public void removePropertyChangeListener(String prop, + PropertyChangeListener l); + + public boolean isCharacterValid(); + + public boolean isCharacterNameValid(); + + public void setCharacterNameValidity(boolean b); + + public List<Generator<Integer>> getAlignmentGenerators(); + + public List<Generator<Gender>> getGenderGenerators(); + + public List<Generator<RaceFacade>> getRaceGenerators(); + + public List<Generator<ClassFacade>> getClassGenerators(); + + public List<Generator<Integer>> getStatGenerators(); + +} Modified: branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-08-09 01:36:13 UTC (rev 7443) +++ branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-08-09 02:09:38 UTC (rev 7444) @@ -21,6 +21,7 @@ package pcgen.gui; import java.util.EnumMap; +import java.util.List; import java.util.Map; import pcgen.gui.facade.AbilityCatagoryFacade; import pcgen.gui.facade.AbilityFacade; @@ -28,6 +29,7 @@ import pcgen.gui.facade.ClassFacade; import pcgen.gui.facade.SkillFacade; import pcgen.gui.filter.NamedFilter; +import pcgen.gui.generator.Generator; import pcgen.gui.util.DefaultGenericListModel; import pcgen.gui.util.GenericListModel; @@ -38,17 +40,8 @@ public final class PCGenUIManager { - private static final Map<HouseRule, Boolean> rulesMap; + private static final Map<HouseRule, Boolean> rulesMap = new EnumMap<HouseRule, Boolean>(HouseRule.class); - static - { - rulesMap = new EnumMap<HouseRule, Boolean>(HouseRule.class); - for (HouseRule key : rulesMap.keySet()) - { - rulesMap.put(key, false); - } - } - private PCGenUIManager() { } @@ -79,11 +72,22 @@ return null; } + public static List<Generator<String>> getRegisteredNameGenerators() + { + return null; + } + public static boolean isHouseRuleSelected(HouseRule rule) { - return rulesMap.get(rule); + Boolean b = rulesMap.get(rule); + return b != null && b; } + public static String getDefaultCharacterName() + { + return null; + } + public static enum HouseRule { //TODO add the rest of the rules Added: branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java 2008-08-09 02:09:38 UTC (rev 7444) @@ -0,0 +1,29 @@ +/* + * RaceFacade.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 8, 2008, 4:06:32 PM + */ +package pcgen.gui.facade; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface RaceFacade extends InfoFacade +{ +} Modified: branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java 2008-08-09 01:36:13 UTC (rev 7443) +++ branches/cdomui/code/src/java/pcgen/gui/filter/FilterPanel.java 2008-08-09 02:09:38 UTC (rev 7444) @@ -39,7 +39,6 @@ import javax.swing.JToggleButton; import javax.swing.JToolBar; import javax.swing.event.DocumentEvent; -import javax.swing.event.DocumentListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import javax.swing.undo.StateEditable; @@ -48,6 +47,7 @@ import pcgen.gui.util.GenericListModel; import pcgen.gui.util.GenericListModelWrapper; import pcgen.gui.util.SimpleTextIcon; +import pcgen.gui.util.event.DocumentChangeAdapter; import pcgen.gui.util.event.ListDataAdapter; import pcgen.util.PropertyFactory; @@ -106,24 +106,15 @@ toolbar.add(button); textfield.getDocument().addDocumentListener( - new DocumentListener() + new DocumentChangeAdapter() { - public void insertUpdate(DocumentEvent e) + @Override + public void documentChanged(DocumentEvent e) { fireApplyFilter(); } - public void removeUpdate(DocumentEvent e) - { - fireApplyFilter(); - } - - public void changedUpdate(DocumentEvent e) - { - fireApplyFilter(); - } - }); toolbar.add(textfield); Added: branches/cdomui/code/src/java/pcgen/gui/generator/Generator.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/generator/Generator.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/generator/Generator.java 2008-08-09 02:09:38 UTC (rev 7444) @@ -0,0 +1,45 @@ +/* + * Generator.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 8, 2008, 4:08:28 PM + */ +package pcgen.gui.generator; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface Generator<E> +{ + + /** + * This causes the generator to return a randomly generated element. + * <br> + * Note: This may return the same element each time if it is a singleton Generator + * @return returns a random element from the <code>Generator</code> + */ + public E getRandom(); + + /** + * This returns the name of this generator that will be displayed. + * @return the string representation for this Generator + */ + @Override + public String toString(); + +} Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form 2008-08-09 01:36:13 UTC (rev 7443) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form 2008-08-09 02:09:38 UTC (rev 7444) @@ -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,2,10,0,0,1,-105"/> + <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,-27,0,0,1,-29"/> </AuxValues> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> @@ -79,7 +79,7 @@ </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="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -89,7 +89,7 @@ </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="1" ipadX="0" ipadY="0" insetsTop="4" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -200,7 +200,7 @@ <Component class="pcgen.gui.tools.ComboSelectionBox" name="comboSelectionBox1"> <Constraints> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> - <BorderConstraints direction="First"/> + <BorderConstraints direction="Center"/> </Constraint> </Constraints> </Component> @@ -224,32 +224,17 @@ <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> <SubComponents> - <Component class="javax.swing.JComboBox" name="jComboBox5"> - <Properties> - <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor"> - <StringArray count="6"> - <StringItem index="0" value="3d6"/> - <StringItem index="1" value="4d4"/> - <StringItem index="2" value="4d6 drop lowest"/> - <StringItem index="3" value="4d6, reroll 1's"/> - <StringItem index="4" value="4d6, reroll 1's, drop lowest"/> - <StringItem index="5" value="5d6, drop 2 lowest"/> - </StringArray> - </Property> - </Properties> + <Component class="pcgen.gui.tools.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="0" insetsLeft="0" insetsBottom="4" insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/> + <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"/> </Constraint> </Constraints> </Component> - <Container class="pcgen.gui.util.CompactScrollPane" name="compactScrollPane1"> - <AuxValues> - <AuxValue name="JavaCodeGenerator_LayoutCodePost" type="java.lang.String" value="compactScrollPane1.setRowHeaderView(jTable2);
compactScrollPane1.setCorner(JScrollPane.UPPER_LEFT_CORNER, jButton3);"/> - </AuxValues> + <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="0" gridHeight="1" fill="1" 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="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> @@ -313,7 +298,7 @@ </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="17" weightX="1.0" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="0" insetsRight="0" anchor="17" weightX="1.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -323,11 +308,11 @@ </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.5" weightY="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="4" insetsBottom="0" insetsRight="0" anchor="17" weightX="0.5" weightY="0.0"/> </Constraint> </Constraints> </Component> - <Component class="javax.swing.JLabel" name="jLabel1"> + <Component class="javax.swing.JCheckBox" name="jCheckBox2"> <Properties> <Property name="text" type="java.lang.String" value="1st Class:"/> </Properties> @@ -340,7 +325,7 @@ <Component class="pcgen.gui.tools.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="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="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -357,7 +342,7 @@ </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="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -367,7 +352,7 @@ </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> @@ -377,7 +362,7 @@ </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="1" 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="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -395,7 +380,7 @@ </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="0.0"/> + <GridBagConstraints gridX="-1" gridY="-1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -405,7 +390,7 @@ </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> @@ -415,7 +400,7 @@ </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="1" 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="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="4" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> @@ -433,7 +418,7 @@ </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="1" 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="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="2" anchor="10" weightX="0.0" weightY="0.0"/> </Constraint> </Constraints> </Component> Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java 2008-08-09 01:36:13 UTC (rev 7443) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java 2008-08-09 02:09:38 UTC (rev 7444) @@ -54,15 +54,15 @@ jPanel2 = new javax.swing.JPanel(); comboSelectionBox1 = new pcgen.gui.tools.ComboSelectionBox(); jPanel5 = new javax.swing.JPanel(); - jComboBox5 = new javax.swing.JComboBox(); - compactScrollPane1 = new pcgen.gui.util.CompactScrollPane(); + comboSelectionBox5 = new pcgen.gui.tools.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(); - jLabel1 = new javax.swing.JLabel(); + jCheckBox2 = new javax.swing.JCheckBox(); comboSelectionBox2 = new pcgen.gui.tools.ComboSelectionBox(); jComboBox2 = new javax.swing.JComboBox(); jLabel2 = new javax.swing.JLabel(); @@ -120,11 +120,15 @@ jButton2.setText("Generate Name"); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); jPanel3.add(jButton2, gridBagConstraints); jLabel4.setText("Name Set:"); - jPanel3.add(jLabel4, new java.awt.GridBagConstraints()); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(4, 0, 4, 0); + jPanel3.add(jLabel4, gridBagConstraints); jComboBox3.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "1990uscensus" })); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -166,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.PAGE_START); + jPanel2.add(comboSelectionBox1, java.awt.BorderLayout.CENTER); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; @@ -176,14 +180,12 @@ jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder(null, "Stats", javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Tahoma", 1, 12))); jPanel5.setLayout(new java.awt.GridBagLayout()); - - jComboBox5.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "3d6", "4d4", "4d6 drop lowest", "4d6, reroll 1's", "4d6, reroll 1's, drop lowest", "5d6, drop 2 lowest" })); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 4, 0); - jPanel5.add(jComboBox5, gridBagConstraints); + gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 0); + jPanel5.add(comboSelectionBox5, gridBagConstraints); jTable1.setModel(new javax.swing.table.DefaultTableModel( new Object [][] { @@ -213,15 +215,11 @@ return canEdit [columnIndex]; } }); - compactScrollPane1.setViewportView(jTable1); + jScrollPane1.setViewportView(jTable1); - compactScrollPane1.setRowHeaderView(jTable2); - compactScrollPane1.setCorner(JScrollPane.UPPER_LEFT_CORNER, jButton3); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - jPanel5.add(compactScrollPane1, gridBagConstraints); + jPanel5.add(jScrollPane1, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; @@ -244,6 +242,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(0, 4, 0, 0); jPanel6.add(jLabel7, gridBagConstraints); jLabel5.setText("Level Generation"); @@ -251,26 +250,32 @@ gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weightx = 0.5; + gridBagConstraints.insets = new java.awt.Insets(0, 4, 0, 0); jPanel6.add(jLabel5, gridBagConstraints); - jLabel1.setText("1st Class:"); - jPanel6.add(jLabel1, new java.awt.GridBagConstraints()); + jCheckBox2.setText("1st Class:"); + jPanel6.add(jCheckBox2, new java.awt.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); jComboBox2.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 2); jPanel6.add(jComboBox2, gridBagConstraints); jLabel2.setText("2nd Class:"); - jPanel6.add(jLabel2, new java.awt.GridBagConstraints()); + 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); jPanel6.add(comboSelectionBox3, gridBagConstraints); jComboBox6.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); @@ -278,20 +283,25 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 2); jPanel6.add(jComboBox6, gridBagConstraints); jLabel3.setText("3rd Class:"); - jPanel6.add(jLabel3, new java.awt.GridBagConstraints()); + 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); jPanel6.add(comboSelectionBox4, gridBagConstraints); jComboBox7.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "Item 1", "Item 2", "Item 3", "Item 4" })); jComboBox7.setEnabled(false); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 2); jPanel6.add(jComboBox7, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -372,18 +382,17 @@ private pcgen.gui.tools.ComboSelectionBox comboSelectionBox2; private pcgen.gui.tools.ComboSelectionBox comboSelectionBox3; private pcgen.gui.tools.ComboSelectionBox comboSelectionBox4; - private pcgen.gui.util.CompactScrollPane compactScrollPane1; + private pcgen.gui.tools.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.JComboBox jComboBox1; private javax.swing.JComboBox jComboBox2; private javax.swing.JComboBox jComboBox3; private javax.swing.JComboBox jComboBox4; - private javax.swing.JComboBox jComboBox5; 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; @@ -397,6 +406,7 @@ private javax.swing.JPanel jPanel4; private javax.swing.JPanel jPanel5; private javax.swing.JPanel jPanel6; + private javax.swing.JScrollPane jScrollPane1; private javax.swing.JTable jTable1; private javax.swing.JTable jTable2; private javax.swing.JTextField jTextField1; Modified: branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-08-09 01:36:13 UTC (rev 7443) +++ branches/cdomui/code/src/java/pcgen/gui/tools/ComboSelectionBox.java 2008-08-09 02:09:38 UTC (rev 7444) @@ -21,23 +21,16 @@ package pcgen.gui.tools; import java.awt.BorderLayout; -import java.awt.Dialog; -import java.awt.Frame; import java.awt.ItemSelectable; -import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ItemListener; import javax.swing.AbstractAction; import javax.swing.BorderFactory; -import javax.swing.DefaultComboBoxModel; +import javax.swing.ComboBoxModel; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JPanel; -import javax.swing.ListModel; import javax.swing.SwingUtilities; -import javax.swing.event.ListDataEvent; -import javax.sw... [truncated message content] |
From: <cpm...@us...> - 2008-08-09 05:56:52
|
Revision: 7448 http://pcgen.svn.sourceforge.net/pcgen/?rev=7448&view=rev Author: cpmeister Date: 2008-08-09 05:57:01 +0000 (Sat, 09 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/PCGenUIManager.java branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java branches/cdomui/code/src/java/pcgen/gui/generator/Generator.java branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java Modified: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-09 05:36:48 UTC (rev 7447) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-09 05:57:01 UTC (rev 7448) @@ -30,10 +30,12 @@ import java.awt.GridBagLayout; import java.awt.Insets; import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.beans.PropertyChangeListener; import java.util.List; import javax.swing.AbstractAction; import javax.swing.Action; +import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; @@ -46,10 +48,14 @@ import javax.swing.ListSelectionModel; import javax.swing.border.TitledBorder; import javax.swing.event.DocumentEvent; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; 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.generator.Generator; import pcgen.gui.tools.ComboSelectionBox; import pcgen.gui.util.DefaultGenericComboBoxModel; @@ -172,7 +178,67 @@ {//Initialize alignmentPanel alignmentPanel.setLayout(new BorderLayout()); {//Initialize alignmentComboBox + alignmentComboBox.addActionListener( + new ActionListener() + { + @SuppressWarnings("unchecked") + public void actionPerformed(ActionEvent e) + { + Generator<Integer> alignmentGenerator = (Generator<Integer>) alignmentComboBox.getSelectedItem(); + if (alignmentGenerator.isSingleton()) + { + int alignment = alignmentGenerator.getRandom(); + Generator<RaceFacade> raceGenerator = (Generator<RaceFacade>) raceSelectionBox.getSelectedItem(); + if (raceGenerator.isSingleton()) + { + RaceFacade race = raceGenerator.getRandom(); + creationManager.setValidity(creationManager.RACE_VALIDITY, + race.isAcceptableAlignment(alignment)); + } + Generator<ClassFacade> classGenerator = (Generator<ClassFacade>) classSelectionBox1.getSelectedItem(); + if (classGenerator.isSingleton()) + { + ClassFacade c = classGenerator.getRandom(); + boolean accept = c.isAcceptableAlignment(alignment); + creationManager.setValidity(creationManager.CLASSES_VALIDITY, + accept); + if (!accept) + { + return; + } + } + if (!classSelectionBox2.isEnabled()) + { + return; + } + classGenerator = (Generator<ClassFacade>) classSelectionBox2.getSelectedItem(); + if (classGenerator.isSingleton()) + { + ClassFacade c = classGenerator.getRandom(); + boolean accept = c.isAcceptableAlignment(alignment); + creationManager.setValidity(creationManager.CLASSES_VALIDITY, + accept); + if (!accept) + { + return; + } + } + if (!classSelectionBox3.isEnabled()) + { + return; + } + classGenerator = (Generator<ClassFacade>) classSelectionBox3.getSelectedItem(); + if (classGenerator.isSingleton()) + { + ClassFacade c = classGenerator.getRandom(); + creationManager.setValidity(creationManager.CLASSES_VALIDITY, + c.isAcceptableAlignment(alignment)); + } + } + } + + }); } alignmentPanel.add(alignmentComboBox, BorderLayout.CENTER); } @@ -367,6 +433,18 @@ genderComboBox.setModel(createComboBoxModel(creationManager.getGenderGenerators())); raceSelectionBox.setModel(createComboBoxModel(creationManager.getRaceGenerators())); statSelectionBox.setModel(createComboBoxModel(creationManager.getStatGenerators())); + + DefaultComboBoxModel classComboBoxModel = new DefaultComboBoxModel(creationManager.getClassGenerators().toArray()); + classSelectionBox1.setModel(classComboBoxModel); + classComboBoxModel = new ExclusiveComboBoxModel(classComboBoxModel); + classSelectionBox2.setModel(classComboBoxModel); + classComboBoxModel = new ExclusiveComboBoxModel(classComboBoxModel); + classSelectionBox3.setModel(classComboBoxModel); + + List<Generator<Integer>> levelGenerators = creationManager.getClassLevelGenerators(); + levelComboBox1.setModel(createComboBoxModel(levelGenerators)); + levelComboBox2.setModel(createComboBoxModel(levelGenerators)); + levelComboBox3.setModel(createComboBoxModel(levelGenerators)); } } @@ -422,6 +500,89 @@ } + private static class ExclusiveComboBoxModel extends DefaultComboBoxModel + implements ListDataListener + { + + private int excludedIndex = -1; + private DefaultComboBoxModel excludedModel; + + public ExclusiveComboBoxModel(DefaultComboBoxModel excludedModel) + { + this.excludedModel = excludedModel; + excludedModel.addListDataListener(this); + for (int index = 0; index < excludedModel.getSize(); index++) + { + Object item = excludedModel.getElementAt(index); + if (item == excludedModel.getSelectedItem()) + { + excludedIndex = index; + } + else + { + addElement(item); + } + } + } + + public void intervalAdded(ListDataEvent e) + { + for (int index = e.getIndex0(); index <= e.getIndex1(); index++) + { + if (excludedIndex != -1 && excludedIndex < index) + { + insertElementAt(excludedModel.getElementAt(index), index - 1); + } + else + { + insertElementAt(excludedModel.getElementAt(index), index); + excludedIndex++; + } + } + } + + public void intervalRemoved(ListDataEvent e) + { + for (int index = e.getIndex0(); index <= e.getIndex1(); index++) + { + if (excludedIndex != -1 && excludedIndex < e.getIndex0()) + { + removeElementAt(e.getIndex0() - 1); + } + else + { + removeElementAt(e.getIndex0()); + if (excludedIndex != -1) + { + if (excludedIndex == e.getIndex0()) + { + excludedIndex = -1; + } + excludedIndex--; + } + } + } + } + + public void contentsChanged(ListDataEvent e) + { + if (e.getIndex0() < 0) + { + if (excludedIndex != -1) + { + insertElementAt(excludedModel.getElementAt(excludedIndex), + excludedIndex); + } + excludedIndex = excludedModel.getIndexOf(excludedModel.getSelectedItem()); + if (excludedIndex != -1) + { + removeElementAt(excludedIndex); + } + } + } + + } + private static class SelectClassRowAction extends AbstractAction { @@ -517,6 +678,7 @@ rowTable.setPreferredScrollableViewportSize(new Dimension(75, 0)); rowTable.setAutoCreateColumnsFromModel(false); + rowTable.setFocusable(false); rowTable.addColumn(new TableColumn()); ListSelectionModel selectionModel = rowTable.getSelectionModel(); selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); Modified: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java 2008-08-09 05:36:48 UTC (rev 7447) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java 2008-08-09 05:57:01 UTC (rev 7448) @@ -56,6 +56,8 @@ public void setCharacterNameValidity(boolean b); + public void setValidity(String prop, boolean valid); + public List<Generator<Integer>> getAlignmentGenerators(); public List<Generator<Gender>> getGenderGenerators(); @@ -66,4 +68,6 @@ public List<Generator<Integer>> getStatGenerators(); + public List<Generator<Integer>> getClassLevelGenerators(); + } Modified: branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-08-09 05:36:48 UTC (rev 7447) +++ branches/cdomui/code/src/java/pcgen/gui/PCGenUIManager.java 2008-08-09 05:57:01 UTC (rev 7448) @@ -90,7 +90,25 @@ public static enum HouseRule { - //TODO add the rest of the rules - SKILLMAX; + + ABILRANGE, //Allow any range for ability scores + AMMOSTACKSWITHWEAPON, // Do ammunition enhancement bonus stack with those of the weapon + BONUSSPELLKNOWN, // Add stat bonus to Spells Known + CLASSPRE, // Bypass Class Prerequisites + EQUIPATTACK, // Treat Weapons In Hand As Equipped For Attacks + FEATPRE, // Bypass Feat Prerequisites + FREECLOTHES, // Ask For Free Clothing at First Level + INTBEFORE, // Increment STAT before calculating skill points when leveling + INTBONUSLANG, // Allow Selection of Int bonus Languages after 1st level + LEVELCAP, // Ignore Level Cap + PROHIBITSPELLS, // Restict Cleric/Druid spells based on alignment + SIZECAT, // Use 3.5 Weapon Categories + SIZEOBJ, // Use 3.0 Weapon Size + SKILLMAX, // Bypass Max Skill Ranks + SYS_35WP, // Apply 3.5 Size Category Penalty to Attacks + // SYS_CIP, //Improper tools incure a -2 circumstance penalty + // SYS_DOMAIN, // Apply Casterlevel Bonuses from Domains to Spells + SYS_LDPACSK, // Apply Load Penalty to AC and Skills + SYS_WTPSK; // Apply Weight Penalty to Skills } } Modified: branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java 2008-08-09 05:36:48 UTC (rev 7447) +++ branches/cdomui/code/src/java/pcgen/gui/facade/ClassFacade.java 2008-08-09 05:57:01 UTC (rev 7448) @@ -27,6 +27,8 @@ public interface ClassFacade extends InfoFacade { + public boolean isAcceptableAlignment(int alignment); + public String[] getTypes(); public String getHD(); Modified: branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java 2008-08-09 05:36:48 UTC (rev 7447) +++ branches/cdomui/code/src/java/pcgen/gui/facade/RaceFacade.java 2008-08-09 05:57:01 UTC (rev 7448) @@ -26,4 +26,7 @@ */ public interface RaceFacade extends InfoFacade { + + public boolean isAcceptableAlignment(int alignment); + } Modified: branches/cdomui/code/src/java/pcgen/gui/generator/Generator.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/generator/Generator.java 2008-08-09 05:36:48 UTC (rev 7447) +++ branches/cdomui/code/src/java/pcgen/gui/generator/Generator.java 2008-08-09 05:57:01 UTC (rev 7448) @@ -35,6 +35,8 @@ */ public E getRandom(); + public boolean isSingleton(); + /** * This returns the name of this generator that will be displayed. * @return the string representation for this Generator Modified: branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form 2008-08-09 05:36:48 UTC (rev 7447) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.form 2008-08-09 05:57:01 UTC (rev 7448) @@ -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,-27,0,0,1,-29"/> + <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"/> </AuxValues> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/> @@ -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="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="1" ipadX="0" ipadY="0" insetsTop="2" insetsLeft="0" insetsBottom="2" insetsRight="0" 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-09 05:36:48 UTC (rev 7447) +++ branches/cdomui/code/src/java/pcgen/gui/proto/CharacterCreationDialog.java 2008-08-09 05:57:01 UTC (rev 7448) @@ -219,6 +219,7 @@ gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.insets = new java.awt.Insets(2, 0, 2, 0); jPanel5.add(jScrollPane1, gridBagConstraints); gridBagConstraints = new java.awt.GridBagConstraints(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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] |
From: <cpm...@us...> - 2008-08-10 23:26:17
|
Revision: 7480 http://pcgen.svn.sourceforge.net/pcgen/?rev=7480&view=rev Author: cpmeister Date: 2008-08-10 23:26:25 +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/tabs/SkillInfoTab.java branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java Added Paths: ----------- branches/cdomui/code/src/java/pcgen/gui/util/table/TableCellUtils.java Modified: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-10 23:01:25 UTC (rev 7479) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationDialog.java 2008-08-10 23:26:25 UTC (rev 7480) @@ -36,6 +36,8 @@ import java.beans.PropertyChangeListener; import java.util.List; import javax.swing.AbstractAction; +import javax.swing.AbstractCellEditor; +import javax.swing.AbstractSpinnerModel; import javax.swing.Action; import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; @@ -45,9 +47,11 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.JSpinner; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.ListSelectionModel; +import javax.swing.SpinnerNumberModel; import javax.swing.border.TitledBorder; import javax.swing.event.DocumentEvent; import javax.swing.event.ListDataEvent; @@ -55,6 +59,8 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; import javax.swing.table.TableColumnModel; @@ -87,6 +93,7 @@ private final TitledPanel statPanel; private final ComboSelectionBox statSelectionBox; private final JButton statRollButton; + private final StatPointsLabel statPointsLabel; private final StatTablePane statTablePane; private final TitledPanel classPanel; private final JCheckBox classGenerationCheckBox1; @@ -116,6 +123,7 @@ this.statPanel = new TitledPanel("Stats"); this.statSelectionBox = new ComboSelectionBox(); this.statRollButton = new JButton(); + this.statPointsLabel = new StatPointsLabel(); this.statTablePane = new StatTablePane(); this.classPanel = new TitledPanel("Classes"); this.classGenerationCheckBox1 = new JCheckBox(); @@ -290,11 +298,17 @@ if (statGenerator instanceof PurchaseModeGenerator) { - model.setPurchaseMode(true); + PurchaseModeGenerator purchaseMode = (PurchaseModeGenerator) statGenerator; + if (model.setPurchaseMode(purchaseMode)) + { + statPointsLabel.setPoints(purchaseMode.getRandom()); + } + statTablePane.setUpperLeft(statPointsLabel); } else { - model.setPurchaseMode(false); + model.setPurchaseMode(null); + statTablePane.setUpperLeft(statRollButton); } } } @@ -306,7 +320,6 @@ statPanel.add(statSelectionBox, gridBagConstraints); {//Initialize statRollButton statRollButton.setAction(new RollStatsAction()); - //statRollButton.addActionListener(new ActionListener); } {//Initialize statTablePane @@ -731,21 +744,48 @@ } - private class StatTableModel extends AbstractTableModel + private static class StatPointsLabel extends JLabel { - private final String[] columns = new String[]{"Base Score", - "Racial Adj", - "Total", - "Mod", - "Cost" + private int points; + + public int getPoints() + { + return points; + } + + public void setPoints(int points) + { + this.points = points; + repaint(); + } + + @Override + public String getText() + { + return "Points: " + points; + } + + } + + private static class StatTableModel extends AbstractTableModel + { + + private static final String[] columns = new String[]{"Base Score", + "Racial Adj", + "Total", + "Mod", + "Cost" }; - private List<StatFacade> stats; - private boolean purchaseMode; + private final CharacterCreationManager manager; + private final List<StatFacade> stats; + private PurchaseModeGenerator purchaseMode; + private RaceFacade race; public StatTableModel(CharacterCreationManager manager) { - stats = manager.getStats(); + this.manager = manager; + this.stats = manager.getStats(); } @Override @@ -772,18 +812,34 @@ } } - public boolean getPurchaseMode() + public PurchaseModeGenerator getPurchaseMode() { return purchaseMode; } - public void setPurchaseMode(boolean purchaseMode) + public boolean setPurchaseMode(PurchaseModeGenerator purchaseMode) { - //todo + if (this.purchaseMode == purchaseMode) + { + return false; + } + if (purchaseMode != null) + { + for (StatFacade stat : stats) + { + stat.setBaseScore(purchaseMode.getMinScore()); + } + } this.purchaseMode = purchaseMode; fireTableStructureChanged(); + return true; } + public void setRace(RaceFacade race) + { + this.race = race; + } + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { @@ -801,7 +857,7 @@ public int getColumnCount() { - if (purchaseMode) + if (purchaseMode != null) { return 6; } @@ -810,17 +866,112 @@ public Object getValueAt(int rowIndex, int columnIndex) { - throw new UnsupportedOperationException("Not supported yet."); + StatFacade stat = stats.get(rowIndex); + if (columnIndex == 0) + { + return stat; + } + int score = stat.getBaseScore(); + if (columnIndex == 1) + { + return score; + } + if (columnIndex == 5) + { + int cost = purchaseMode.getScoreCost(score + 1); + if (cost != 0) + { + return cost; + } + return null; + } + int adj = 0; + if (race != null) + { + adj = race.getRacialAdj(stat); + } + if (columnIndex == 2) + { + return adj; + } + score += adj; + if (columnIndex == 3) + { + return score; + } + return manager.getModForScore(score); } @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - super.setValueAt(aValue, rowIndex, columnIndex); + } } + private class StatSpinnerModel extends AbstractSpinnerModel + { + + public Object getValue() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public void setValue(Object value) + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Object getNextValue() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + public Object getPreviousValue() + { + throw new UnsupportedOperationException("Not supported yet."); + } + + } + + private static class SpinnerEditor extends AbstractCellEditor + implements TableCellEditor + { + + private JSpinner spinner; + + public SpinnerEditor() + { + SpinnerNumberModel model = new SpinnerNumberModel(); + model.setMinimum(0); + this.spinner = new JSpinner(model); + } + + public Object getCellEditorValue() + { + return spinner.getValue(); + } + + public Component getTableCellEditorComponent(JTable table, + Object value, + boolean isSelected, + int row, + int column) + { + if (value == null) + { + spinner.setValue(0); + } + else + { + spinner.setValue(value); + } + return spinner; + } + + } + private static class StatTablePane extends JScrollPane implements TableModelListener { @@ -933,5 +1084,27 @@ } } + private static class SpinnerRenderer extends JSpinner implements TableCellRenderer + { + + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) + { + if (value == null) + { + setValue(0); + } + else + { + setValue(value); + } + return this; + } + + } } } Modified: branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java 2008-08-10 23:01:25 UTC (rev 7479) +++ branches/cdomui/code/src/java/pcgen/gui/CharacterCreationManager.java 2008-08-10 23:26:25 UTC (rev 7480) @@ -71,6 +71,8 @@ public List<StatFacade> getStats(); + public int getModForScore(int score); + public List<Generator<Integer>> getClassLevelGenerators(); } Modified: branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-08-10 23:01:25 UTC (rev 7479) +++ branches/cdomui/code/src/java/pcgen/gui/tabs/SkillInfoTab.java 2008-08-10 23:26:25 UTC (rev 7480) @@ -20,29 +20,22 @@ */ package pcgen.gui.tabs; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ListSelectionEvent; -import pcgen.gui.tools.ChooserPane; import java.awt.Component; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.util.Arrays; import java.util.Hashtable; import java.util.List; -import javax.swing.AbstractCellEditor; import javax.swing.AbstractSpinnerModel; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JSpinner; import javax.swing.JTable; import javax.swing.ListSelectionModel; -import javax.swing.event.ChangeListener; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; +import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.AbstractTableModel; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; import pcgen.cdom.enumeration.SkillCost; import pcgen.gui.PCGenUIManager; import pcgen.gui.PCGenUIManager.HouseRule; @@ -52,7 +45,10 @@ import pcgen.gui.facade.SkillFacade; import pcgen.gui.filter.FilterableTreeViewModel; import pcgen.gui.filter.FilteredTreeViewPanel; +import pcgen.gui.tools.ChooserPane; import pcgen.gui.util.GenericListModel; +import pcgen.gui.util.table.TableCellUtils.SpinnerEditor; +import pcgen.gui.util.table.TableCellUtils.SpinnerRenderer; import pcgen.gui.util.treeview.DataView; import pcgen.gui.util.treeview.DataViewColumn; import pcgen.gui.util.treeview.DefaultDataViewColumn; @@ -85,8 +81,7 @@ private void initComponents() { - skillPanel.setDefaultRenderer(Float.class, - new SkillRankSpinnerRenderer()); + skillPanel.setDefaultRenderer(Float.class, new SpinnerRenderer()); ListSelectionModel selectionModel = skillPanel.getSelectionModel(); selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); selectionModel.addListSelectionListener( @@ -186,25 +181,23 @@ setSelectedSkill((SkillFacade) state.get("SelectedSkill")); } - private class SkillRankSpinnerEditor extends AbstractCellEditor - implements TableCellEditor, ChangeListener + private class SkillRankSpinnerEditor extends SpinnerEditor { - private final JSpinner spinner; private final SkillRankSpinnerModel model; public SkillRankSpinnerEditor(CharacterFacade character) { - this.model = new SkillRankSpinnerModel(character); - this.spinner = new JSpinner(model); - spinner.addChangeListener(this); + this(new SkillRankSpinnerModel(character)); } - public Object getCellEditorValue() + private SkillRankSpinnerEditor(SkillRankSpinnerModel model) { - return model.getValue(); + super(model); + this.model = model; } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, @@ -215,11 +208,6 @@ return spinner; } - public void stateChanged(ChangeEvent e) - { - stopCellEditing(); - } - } private static final class SkillTreeViewModel implements FilterableTreeViewModel<SkillFacade>, @@ -633,31 +621,4 @@ } } - - private static class SkillRankSpinnerRenderer extends DefaultTableCellRenderer - { - - private JSpinner spinner = new JSpinner(); - - @Override - public Component getTableCellRendererComponent(JTable table, - Object value, - boolean isSelected, - boolean hasFocus, - int row, - int column) - { - super.getTableCellRendererComponent(table, value, isSelected, - hasFocus, row, column); - if (value == null) - { - return this; - } - spinner.setBackground(getBackground()); - spinner.setForeground(getForeground()); - spinner.setValue(value); - return spinner; - } - - } } Modified: branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-08-10 23:01:25 UTC (rev 7479) +++ branches/cdomui/code/src/java/pcgen/gui/util/JTreeViewSelectionPane.java 2008-08-10 23:26:25 UTC (rev 7480) @@ -20,24 +20,20 @@ */ package pcgen.gui.util; -import java.awt.Component; import java.awt.Dimension; import java.awt.ItemSelectable; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.util.HashSet; import java.util.Set; -import javax.swing.AbstractCellEditor; import javax.swing.JCheckBox; import javax.swing.JRadioButton; import javax.swing.JTable; -import javax.swing.JToggleButton; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; +import pcgen.gui.util.table.TableCellUtils.RadioButtonEditor; +import pcgen.gui.util.table.TableCellUtils.ToggleButtonRenderer; import pcgen.gui.util.treeview.DataView; import pcgen.gui.util.treeview.TreeViewModel; import pcgen.gui.util.treeview.TreeViewTableModel; @@ -100,7 +96,7 @@ TableColumn column = new TableColumn(-1); column.setHeaderValue(COLUMN_ID); rowheaderTable.addColumn(column); - rowheaderTable.setPreferredScrollableViewportSize(new Dimension(20, 400)); + rowheaderTable.setPreferredScrollableViewportSize(new Dimension(20, 0)); setRowHeaderView(rowheaderTable); } @@ -261,84 +257,4 @@ } } - - private static class RadioButtonEditor extends AbstractCellEditor - implements ActionListener, - TableCellEditor - { - - private JRadioButton button; - - public RadioButtonEditor() - { - this.button = new JRadioButton(); - button.setHorizontalAlignment(JRadioButton.CENTER); - button.addActionListener(this); - } - - public Object getCellEditorValue() - { - return Boolean.valueOf(button.isSelected()); - } - - public Component getTableCellEditorComponent(JTable table, Object value, - boolean isSelected, - int row, int column) - { - boolean selected = false; - if (value instanceof Boolean) - { - selected = ((Boolean) value).booleanValue(); - } - else if (value instanceof String) - { - selected = value.equals("true"); - } - button.setSelected(selected); - return button; - } - - public void actionPerformed(ActionEvent e) - { - stopCellEditing(); - } - - } - - private static class ToggleButtonRenderer extends DefaultTableCellRenderer - { - - private JToggleButton button; - - public ToggleButtonRenderer(JToggleButton button) - { - this.button = button; - button.setHorizontalAlignment(CENTER); - button.setBorderPainted(true); - } - - @Override - public Component getTableCellRendererComponent(JTable table, - Object value, - boolean isSelected, - boolean hasFocus, - int row, - int column) - { - super.getTableCellRendererComponent(table, value, isSelected, - hasFocus, row, - column); - if (value == null) - { - return this; - } - button.setForeground(getForeground()); - button.setBackground(getBackground()); - button.setBorder(getBorder()); - - button.setSelected(((Boolean) value).booleanValue()); - return button; - } - - } } Added: branches/cdomui/code/src/java/pcgen/gui/util/table/TableCellUtils.java =================================================================== --- branches/cdomui/code/src/java/pcgen/gui/util/table/TableCellUtils.java (rev 0) +++ branches/cdomui/code/src/java/pcgen/gui/util/table/TableCellUtils.java 2008-08-10 23:26:25 UTC (rev 7480) @@ -0,0 +1,208 @@ +/* + * TableCellUtils.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 10, 2008, 3:37:34 PM + */ +package pcgen.gui.util.table; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import javax.swing.AbstractCellEditor; +import javax.swing.JRadioButton; +import javax.swing.JSpinner; +import javax.swing.JTable; +import javax.swing.JToggleButton; +import javax.swing.SpinnerModel; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public final class TableCellUtils +{ + + private TableCellUtils() + { + + } + + public static class RadioButtonEditor extends AbstractCellEditor + implements ActionListener, + TableCellEditor + { + + private JRadioButton button; + + public RadioButtonEditor() + { + this.button = new JRadioButton(); + button.setHorizontalAlignment(JRadioButton.CENTER); + button.addActionListener(this); + } + + public Object getCellEditorValue() + { + return Boolean.valueOf(button.isSelected()); + } + + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, + int row, int column) + { + boolean selected = false; + if (value instanceof Boolean) + { + selected = ((Boolean) value).booleanValue(); + } + else if (value instanceof String) + { + selected = value.equals("true"); + } + button.setSelected(selected); + return button; + } + + public void actionPerformed(ActionEvent e) + { + stopCellEditing(); + } + + } + + public static class SpinnerEditor extends AbstractCellEditor + implements TableCellEditor, ChangeListener + { + + protected final JSpinner spinner; + + public SpinnerEditor() + { + this(new JSpinner()); + } + + public SpinnerEditor(SpinnerModel model) + { + this(new JSpinner(model)); + } + + public SpinnerEditor(JSpinner spinner) + { + this.spinner = spinner; + spinner.addChangeListener(this); + } + + public Object getCellEditorValue() + { + return spinner.getValue(); + } + + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, + int row, + int column) + { + spinner.setValue(value); + return spinner; + } + + public void stateChanged(ChangeEvent e) + { + stopCellEditing(); + } + + } + + public static class ToggleButtonRenderer extends DefaultTableCellRenderer + { + + private JToggleButton button; + + public ToggleButtonRenderer(JToggleButton button) + { + this.button = button; + button.setHorizontalAlignment(CENTER); + button.setBorderPainted(true); + } + + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) + { + super.getTableCellRendererComponent(table, value, isSelected, + hasFocus, row, + column); + if (value == null) + { + return this; + } + button.setForeground(getForeground()); + button.setBackground(getBackground()); + button.setBorder(getBorder()); + + button.setSelected(((Boolean) value).booleanValue()); + return button; + } + + } + + public static class SpinnerRenderer extends DefaultTableCellRenderer + { + + private final JSpinner spinner; + + public SpinnerRenderer() + { + this(new JSpinner()); + } + + public SpinnerRenderer(JSpinner spinner) + { + this.spinner = spinner; + } + + @Override + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) + { + super.getTableCellRendererComponent(table, value, isSelected, + hasFocus, row, column); + if (value == null) + { + return this; + } + spinner.setBackground(getBackground()); + spinner.setForeground(getForeground()); + spinner.setValue(value); + return spinner; + } + + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |