From: <cpm...@us...> - 2010-03-29 21:31:37
|
Revision: 11563 http://pcgen.svn.sourceforge.net/pcgen/?rev=11563&view=rev Author: cpmeister Date: 2010-03-29 21:31:30 +0000 (Mon, 29 Mar 2010) Log Message: ----------- SummaryInfoTab update: added GenderFacade Modified Paths: -------------- sandbox/cdomui/code/src/java/pcgen/core/facade/CharacterFacade.java sandbox/cdomui/code/src/java/pcgen/core/facade/RaceFacade.java sandbox/cdomui/code/src/java/pcgen/gui2/mock/CharacterMock.java sandbox/cdomui/code/src/java/pcgen/gui2/mock/RaceMock.java sandbox/cdomui/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java Added Paths: ----------- sandbox/cdomui/code/src/java/pcgen/core/facade/GenderFacade.java Modified: sandbox/cdomui/code/src/java/pcgen/core/facade/CharacterFacade.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/core/facade/CharacterFacade.java 2010-03-29 21:08:20 UTC (rev 11562) +++ sandbox/cdomui/code/src/java/pcgen/core/facade/CharacterFacade.java 2010-03-29 21:31:30 UTC (rev 11563) @@ -23,7 +23,6 @@ import javax.swing.event.ChangeListener; import javax.swing.undo.UndoManager; -import pcgen.cdom.enumeration.Gender; import pcgen.cdom.enumeration.SkillCost; import pcgen.gui2.util.GenericComboBoxModel; import pcgen.gui2.util.GenericListModel; @@ -37,7 +36,7 @@ public UndoManager getUndoManager(); - public Gender getGender(); + public GenderFacade getGender(); public void setAlignment(AlignmentFacade alignment); @@ -47,7 +46,7 @@ public void removeAlignmentChangeListener(ChangeListener listener); - public void setGender(Gender gender); + public void setGender(GenderFacade gender); public void addGenderChangeListener(ChangeListener listener); Added: sandbox/cdomui/code/src/java/pcgen/core/facade/GenderFacade.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/core/facade/GenderFacade.java (rev 0) +++ sandbox/cdomui/code/src/java/pcgen/core/facade/GenderFacade.java 2010-03-29 21:31:30 UTC (rev 11563) @@ -0,0 +1,30 @@ +/* + * GenderFacade.java + * Copyright 2010 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 Mar 29, 2010, 11:35:09 AM + */ + +package pcgen.core.facade; + +/** + * + * @author Connor Petty <cpm...@us...> + */ +public interface GenderFacade { + +} Modified: sandbox/cdomui/code/src/java/pcgen/core/facade/RaceFacade.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/core/facade/RaceFacade.java 2010-03-29 21:08:20 UTC (rev 11562) +++ sandbox/cdomui/code/src/java/pcgen/core/facade/RaceFacade.java 2010-03-29 21:31:30 UTC (rev 11563) @@ -33,7 +33,7 @@ public int getRacialAdj(StatFacade stat); - public GenericListModel<SimpleFacade> getGenders(); + public GenericListModel<GenderFacade> getGenders(); public GenericListModel<SimpleFacade> getHands(); Modified: sandbox/cdomui/code/src/java/pcgen/gui2/mock/CharacterMock.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/gui2/mock/CharacterMock.java 2010-03-29 21:08:20 UTC (rev 11562) +++ sandbox/cdomui/code/src/java/pcgen/gui2/mock/CharacterMock.java 2010-03-29 21:31:30 UTC (rev 11563) @@ -32,7 +32,6 @@ import javax.swing.event.ChangeListener; import javax.swing.undo.UndoManager; -import pcgen.cdom.enumeration.Gender; import pcgen.cdom.enumeration.SkillCost; import pcgen.core.PlayerCharacter; import pcgen.core.SettingsHandler; @@ -45,6 +44,7 @@ import pcgen.core.facade.DataSetFacade; import pcgen.core.facade.DeityFacade; import pcgen.core.facade.EquipmentSetFacade; +import pcgen.core.facade.GenderFacade; import pcgen.core.facade.RaceFacade; import pcgen.core.facade.SkillFacade; import pcgen.core.facade.StatFacade; @@ -81,7 +81,7 @@ private DefaultGenericListModel<TempBonusFacade> appliedTempBonuses; private AlignmentFacade alignment; private DefaultGenericComboBoxModel<EquipmentSetFacade> equipmentSets; - private Gender gender; + private GenderFacade gender; private DefaultGenericListModel<CharacterLevelFacade> pcClassLevels; private Map<StatFacade, Integer> statScoreMap; private Map<AbilityCategoryFacade, Integer> remainingAbilitySelections; @@ -135,7 +135,7 @@ * @see pcgen.core.facade.CharacterFacade#removeAbility(pcgen.core.facade.AbilityCategoryFacade, pcgen.core.facade.AbilityFacade) */ public void removeAbility(AbilityCategoryFacade category, - AbilityFacade ability) + AbilityFacade ability) { List<AbilityFacade> abList = abilityListMap.get(category); if (abList != null) @@ -148,7 +148,7 @@ * @see pcgen.core.facade.CharacterFacade#getAbilities(pcgen.core.facade.AbilityCategoryFacade) */ public GenericListModel<AbilityFacade> getAbilities( - AbilityCategoryFacade category) + AbilityCategoryFacade category) { DefaultGenericListModel<AbilityFacade> abList = abilityListMap.get(category); if (abList == null) @@ -171,7 +171,7 @@ * @see pcgen.core.facade.CharacterFacade#setRemainingSelection(pcgen.core.facade.AbilityCategoryFacade, int) */ public void setRemainingSelection(AbilityCategoryFacade category, - int remaining) + int remaining) { remainingAbilitySelections.put(category, remaining); } @@ -179,8 +179,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#hasAbility(pcgen.core.facade.AbilityCategoryFacade, pcgen.core.facade.AbilityFacade) */ - public boolean hasAbility(AbilityCategoryFacade category, - AbilityFacade ability) + public boolean hasAbility(AbilityCategoryFacade category, AbilityFacade ability) { List<AbilityFacade> abList = abilityListMap.get(category); if (abList == null) @@ -329,7 +328,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getGender() */ - public Gender getGender() + public GenderFacade getGender() { return gender; } @@ -337,7 +336,7 @@ /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#setGender(pcgen.cdom.enumeration.Gender) */ - public void setGender(Gender gender) + public void setGender(GenderFacade gender) { this.gender = gender; fireChangeEvent(genderListeners); @@ -584,5 +583,4 @@ { deityListeners.remove(listener); } - } Modified: sandbox/cdomui/code/src/java/pcgen/gui2/mock/RaceMock.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/gui2/mock/RaceMock.java 2010-03-29 21:08:20 UTC (rev 11562) +++ sandbox/cdomui/code/src/java/pcgen/gui2/mock/RaceMock.java 2010-03-29 21:31:30 UTC (rev 11563) @@ -25,6 +25,7 @@ import pcgen.cdom.enumeration.Gender; import pcgen.core.Race; import pcgen.core.facade.AlignmentFacade; +import pcgen.core.facade.GenderFacade; import pcgen.core.facade.RaceFacade; import pcgen.core.facade.SimpleFacade; import pcgen.core.facade.StatFacade; @@ -53,35 +54,41 @@ public class RaceMock implements RaceFacade { - private static final DefaultGenericListModel<SimpleFacade> genderList = - new DefaultGenericListModel<SimpleFacade>(); + private static final DefaultGenericListModel<GenderFacade> genderList = + new DefaultGenericListModel<GenderFacade>(); private static final DefaultGenericListModel<SimpleFacade> handList = - new DefaultGenericListModel<SimpleFacade>(); - private static class SimpleFacadeImpl implements - SimpleFacade{ + new DefaultGenericListModel<SimpleFacade>(); + + private static class SimpleFacadeImpl implements SimpleFacade + { + private String name; + public SimpleFacadeImpl(String name) { this.name = name; } + @Override public String toString() { return name; } + } + static { Gender[] genders = Gender.values(); for (final Gender gender : genders) { - genderList.add(new SimpleFacade() + genderList.add(new GenderFacade() { @Override public String toString() { - return gender.toString(); + return gender.name(); } }); @@ -144,7 +151,7 @@ return theRace.getDisplayName(); } - public GenericListModel<SimpleFacade> getGenders() + public GenericListModel<GenderFacade> getGenders() { return genderList; } Modified: sandbox/cdomui/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java =================================================================== --- sandbox/cdomui/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java 2010-03-29 21:08:20 UTC (rev 11562) +++ sandbox/cdomui/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java 2010-03-29 21:31:30 UTC (rev 11563) @@ -62,13 +62,13 @@ import javax.swing.table.TableModel; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.math.NumberUtils; -import pcgen.cdom.enumeration.Gender; import pcgen.core.facade.AlignmentFacade; import pcgen.core.facade.CharacterFacade; import pcgen.core.facade.CharacterLevelFacade; import pcgen.core.facade.ClassFacade; import pcgen.core.facade.DataSetFacade; import pcgen.core.facade.DeityFacade; +import pcgen.core.facade.GenderFacade; import pcgen.core.facade.RaceFacade; import pcgen.core.facade.SimpleFacade; import pcgen.gui2.tools.CharacterStateEditable; @@ -203,10 +203,10 @@ private void setPanelTitle(JPanel panel, String title) { panel.setBorder(BorderFactory.createTitledBorder(null, - title, - TitledBorder.CENTER, - TitledBorder.DEFAULT_POSITION, - titleFont)); + title, + TitledBorder.CENTER, + TitledBorder.DEFAULT_POSITION, + titleFont)); } private void initRightPanel(JPanel springPanel) @@ -246,79 +246,79 @@ * racePanel */ layout.putConstraint(SpringLayout.WEST, racePanel, - 0, - SpringLayout.WEST, springPanel); + 0, + SpringLayout.WEST, springPanel); layout.putConstraint(SpringLayout.NORTH, racePanel, - 0, - SpringLayout.NORTH, springPanel); + 0, + SpringLayout.NORTH, springPanel); layout.putConstraint(SpringLayout.EAST, racePanel, - 0, - SpringLayout.EAST, springPanel); + 0, + SpringLayout.EAST, springPanel); layout.putConstraint(SpringLayout.SOUTH, racePanel, - racePanelInsets.bottom, - SpringLayout.SOUTH, createMonsterButton); + racePanelInsets.bottom, + SpringLayout.SOUTH, createMonsterButton); setSpringLayerConstraints(layout, racePanel, racePanelInsets, comboBoxSpring, - raceLabel, raceComboBox, null); + raceLabel, raceComboBox, null); layout.putConstraint(SpringLayout.NORTH, raceComboBox, - racePanelInsets.top, - SpringLayout.NORTH, racePanel); + racePanelInsets.top, + SpringLayout.NORTH, racePanel); setSpringLayerConstraints(layout, racePanel, racePanelInsets, comboBoxSpring, - ageLabel, ageComboBox, raceComboBox); + ageLabel, ageComboBox, raceComboBox); /* * ageField constraints */ layout.putConstraint(SpringLayout.WEST, ageField, - 0, - SpringLayout.EAST, ageLabel); + 0, + SpringLayout.EAST, ageLabel); layout.putConstraint(SpringLayout.EAST, ageField, - 0, - SpringLayout.WEST, ageComboBox); + 0, + SpringLayout.WEST, ageComboBox); layout.putConstraint(SpringLayout.NORTH, ageField, - 0, - SpringLayout.NORTH, ageComboBox); + 0, + SpringLayout.NORTH, ageComboBox); layout.putConstraint(SpringLayout.SOUTH, ageField, - 0, - SpringLayout.SOUTH, ageComboBox); + 0, + SpringLayout.SOUTH, ageComboBox); setSpringLayerConstraints(layout, racePanel, racePanelInsets, - createMonsterButton, ageComboBox, 0); + createMonsterButton, ageComboBox, 0); /* * classPanel */ layout.putConstraint(SpringLayout.WEST, classPanel, - 0, - SpringLayout.WEST, springPanel); + 0, + SpringLayout.WEST, springPanel); layout.putConstraint(SpringLayout.EAST, classPanel, - 0, - SpringLayout.EAST, springPanel); + 0, + SpringLayout.EAST, springPanel); layout.putConstraint(SpringLayout.NORTH, classPanel, - 0, - SpringLayout.SOUTH, racePanel); + 0, + SpringLayout.SOUTH, racePanel); layout.putConstraint(SpringLayout.SOUTH, springPanel, - 0, - SpringLayout.SOUTH, classPanel); + 0, + SpringLayout.SOUTH, classPanel); setSpringLayerConstraints(layout, classPanel, classPanelInsets, comboBoxSpring, - classLabel, classComboBox, null); + classLabel, classComboBox, null); layout.putConstraint(SpringLayout.NORTH, classComboBox, - classPanelInsets.top, - SpringLayout.NORTH, classPanel); + classPanelInsets.top, + SpringLayout.NORTH, classPanel); setSpringLayerConstraints(layout, classPanel, classPanelInsets, - levelPanel, classComboBox, 10); + levelPanel, classComboBox, 10); setSpringLayerConstraints(layout, classPanel, classPanelInsets, comboBoxSpring, - expLabel, expField, levelPanel); + expLabel, expField, levelPanel); setSpringLayerConstraints(layout, classPanel, classPanelInsets, comboBoxSpring, - nextlevelLabel, nextlevelField, expField); + nextlevelLabel, nextlevelField, expField); setSpringLayerConstraints(layout, classPanel, classPanelInsets, - expmodLabel, nextlevelField, 10); + expmodLabel, nextlevelField, 10); { GridBagConstraints gbc = new GridBagConstraints(); gbc.fill = GridBagConstraints.HORIZONTAL; @@ -327,13 +327,13 @@ expmodPanel.add(expsubtractButton, gbc); } setSpringLayerConstraints(layout, classPanel, classPanelInsets, comboBoxSpring, - expmodPanel, expmodField, expmodLabel); + expmodPanel, expmodField, expmodLabel); layout.putConstraint(SpringLayout.EAST, expmodPanel, - 0, - SpringLayout.WEST, expmodField); + 0, + SpringLayout.WEST, expmodField); layout.putConstraint(SpringLayout.SOUTH, classPanel, - classPanelInsets.bottom, - SpringLayout.SOUTH, expmodField); + classPanelInsets.bottom, + SpringLayout.SOUTH, expmodField); springPanel.add(expmodPanel); springPanel.add(racePanel); springPanel.add(raceLabel); @@ -356,47 +356,47 @@ } private static void setSpringLayerConstraints(SpringLayout layout, JPanel panel, Insets insets, - JComponent comp, JComponent above, int pad) + JComponent comp, JComponent above, int pad) { layout.putConstraint(SpringLayout.NORTH, comp, - pad, - SpringLayout.SOUTH, above); + pad, + SpringLayout.SOUTH, above); layout.putConstraint(SpringLayout.WEST, comp, - insets.left, - SpringLayout.WEST, panel); + insets.left, + SpringLayout.WEST, panel); layout.putConstraint(SpringLayout.EAST, comp, - -insets.right, - SpringLayout.EAST, panel); + -insets.right, + SpringLayout.EAST, panel); } private static void setSpringLayerConstraints(SpringLayout layout, JPanel panel, Insets insets, Spring compSpring, - JComponent label, JComponent comp, JComponent above) + JComponent label, JComponent comp, JComponent above) { layout.putConstraint(SpringLayout.WEST, label, - insets.left, - SpringLayout.WEST, panel); + insets.left, + SpringLayout.WEST, panel); layout.putConstraint(SpringLayout.NORTH, label, - 0, - SpringLayout.NORTH, comp); + 0, + SpringLayout.NORTH, comp); layout.putConstraint(SpringLayout.SOUTH, label, - 0, - SpringLayout.SOUTH, comp); + 0, + SpringLayout.SOUTH, comp); layout.putConstraint(SpringLayout.WEST, comp, - compSpring, - SpringLayout.WEST, panel); + compSpring, + SpringLayout.WEST, panel); layout.putConstraint(SpringLayout.EAST, comp, - -insets.right, - SpringLayout.EAST, panel); + -insets.right, + SpringLayout.EAST, panel); if (above != null) { layout.putConstraint(SpringLayout.NORTH, comp, - 0, - SpringLayout.SOUTH, above); + 0, + SpringLayout.SOUTH, above); } layout.putConstraint(SpringLayout.SOUTH, comp, - new PreferredHeightSpring(comp), - SpringLayout.NORTH, comp); + new PreferredHeightSpring(comp), + SpringLayout.NORTH, comp); } private static class PreferredHeightSpring extends Spring @@ -544,7 +544,7 @@ columnModel.addColumn(createTableColumn(0, "Level", headerRenderer, false)); columnModel.addColumn(createTableColumn(1, "HP", headerRenderer, false)); columnModel.addColumn(createTableColumn(2, "Class (All Levels In Class)", - headerRenderer, true)); + headerRenderer, true)); classLevelTable.setColumnModel(columnModel); classLevelTable.setAutoCreateColumnsFromModel(false); classLevelTable.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN); @@ -554,55 +554,55 @@ } layout.putConstraint(SpringLayout.NORTH, layeredPane, - 0, - SpringLayout.NORTH, classLevelTable); + 0, + SpringLayout.NORTH, classLevelTable); layout.putConstraint(SpringLayout.WEST, layeredPane, - 0, - SpringLayout.WEST, classLevelTable); + 0, + SpringLayout.WEST, classLevelTable); layout.putConstraint(SpringLayout.EAST, layeredPane, - 0, - SpringLayout.EAST, classLevelTable); + 0, + SpringLayout.EAST, classLevelTable); layout.putConstraint(SpringLayout.SOUTH, layeredPane, - 0, - SpringLayout.SOUTH, classLevelTable); + 0, + SpringLayout.SOUTH, classLevelTable); int rowheight = classLevelTable.getRowHeight(); layout.putConstraint(SpringLayout.NORTH, addLevelButton, - -rowheight, - SpringLayout.SOUTH, classLevelTable); + -rowheight, + SpringLayout.SOUTH, classLevelTable); layout.putConstraint(SpringLayout.SOUTH, addLevelButton, - 0, - SpringLayout.SOUTH, classLevelTable); + 0, + SpringLayout.SOUTH, classLevelTable); layout.putConstraint(SpringLayout.EAST, addLevelButton, - 0, - SpringLayout.EAST, classLevelTable); + 0, + SpringLayout.EAST, classLevelTable); layout.putConstraint(SpringLayout.EAST, removeLevelButton, - 0, - SpringLayout.EAST, classLevelTable); + 0, + SpringLayout.EAST, classLevelTable); layout.putConstraint(SpringLayout.NORTH, removeLevelButton, - -rowheight, - SpringLayout.NORTH, addLevelButton); + -rowheight, + SpringLayout.NORTH, addLevelButton); layout.putConstraint(SpringLayout.SOUTH, removeLevelButton, - 0, - SpringLayout.NORTH, addLevelButton); + 0, + SpringLayout.NORTH, addLevelButton); layout.putConstraint(SpringLayout.NORTH, addLevelLabel, - -rowheight, - SpringLayout.SOUTH, classLevelTable); + -rowheight, + SpringLayout.SOUTH, classLevelTable); layout.putConstraint(SpringLayout.SOUTH, addLevelLabel, - 0, - SpringLayout.SOUTH, classLevelTable); + 0, + SpringLayout.SOUTH, classLevelTable); layout.putConstraint(SpringLayout.EAST, addLevelLabel, - 0, - SpringLayout.WEST, addLevelButton); + 0, + SpringLayout.WEST, addLevelButton); pane.setColumnHeaderView(tableHeader); pane.setViewportView(layeredPane); } private static TableColumn createTableColumn(int index, String headerValue, - TableCellRenderer headerRenderer, boolean resizable) + TableCellRenderer headerRenderer, boolean resizable) { TableColumn column = new TableColumn(index); column.setHeaderValue(headerValue); @@ -711,14 +711,14 @@ public Hashtable<Object, Object> createState(final CharacterFacade character) { - final DelegatingGenericComboBoxModel<SimpleFacade> genderModel; + final DelegatingGenericComboBoxModel<GenderFacade> genderModel; final DelegatingGenericComboBoxModel<SimpleFacade> handsModel; final DelegatingGenericComboBoxModel<AlignmentFacade> alignmentModel; final DelegatingGenericComboBoxModel<DeityFacade> deityModel; final DelegatingGenericComboBoxModel<RaceFacade> raceModel; final DelegatingGenericComboBoxModel<ClassFacade> classModel; - genderModel = new DelegatingGenericComboBoxModel<SimpleFacade>(); + genderModel = new DelegatingGenericComboBoxModel<GenderFacade>(); handsModel = new DelegatingGenericComboBoxModel<SimpleFacade>(); alignmentModel = new DelegatingGenericComboBoxModel<AlignmentFacade>(); deityModel = new DelegatingGenericComboBoxModel<DeityFacade>(); @@ -747,7 +747,7 @@ } else { - genderModel.setDelegateModel(new DefaultGenericListModel<SimpleFacade>()); + genderModel.setDelegateModel(new DefaultGenericListModel<GenderFacade>()); handsModel.setDelegateModel(new DefaultGenericListModel<SimpleFacade>()); } } @@ -789,15 +789,7 @@ { if (e.getType() == ListDataEvent.CONTENTS_CHANGED && e.getIndex0() == -1 && e.getIndex1() == -1) { - SimpleFacade gender = (SimpleFacade) genderModel.getSelectedItem(); - if (gender != null) - { - character.setGender(Gender.valueOf(gender.toString())); - } - else - { - character.setGender(null); - } + character.setGender((GenderFacade) genderModel.getSelectedItem()); } } @@ -814,6 +806,19 @@ }; listener.stateChanged(null); character.addAlignmentChangeListener(listener); + alignmentModel.addListDataListener(new ListDataAdapter() + { + + @Override + public void listDataChanged(ListDataEvent e) + { + if (e.getType() == ListDataEvent.CONTENTS_CHANGED && e.getIndex0() == -1 && e.getIndex1() == -1) + { + character.setAlignment((AlignmentFacade) alignmentModel.getSelectedItem()); + } + } + + }); //initialize deity selection listener = new ChangeListener() { @@ -826,7 +831,19 @@ }; listener.stateChanged(null); character.addDeityChangeListener(listener); + deityModel.addListDataListener(new ListDataAdapter() + { + @Override + public void listDataChanged(ListDataEvent e) + { + if (e.getType() == ListDataEvent.CONTENTS_CHANGED && e.getIndex0() == -1 && e.getIndex1() == -1) + { + character.setDeity((DeityFacade) deityModel.getSelectedItem()); + } + } + + }); Hashtable<Object, Object> stateTable = new Hashtable<Object, Object>(); stateTable.put(Models.CharacterNameHandler, new CharacterNameHandler(character)); stateTable.put(Models.PlayerNameHandler, new PlayerNameHandler(character)); @@ -907,9 +924,9 @@ if (c != null) { character.addCharacterLevels(new ClassFacade[] - { - c - }); + { + c + }); } } @@ -1179,4 +1196,5 @@ } } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |