From: <jde...@us...> - 2012-02-05 10:31:57
|
Revision: 16057 http://pcgen.svn.sourceforge.net/pcgen/?rev=16057&view=rev Author: jdempsey Date: 2012-02-05 10:31:50 +0000 (Sun, 05 Feb 2012) Log Message: ----------- Inventory display doesn't indicate weight limit for current category. Issue#: CODE-1115 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-05 07:04:08 UTC (rev 16056) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-05 10:31:50 UTC (rev 16057) @@ -2976,8 +2976,29 @@ { limit = WeightToken.getLoadToken(load.toString(),theCharacter); } - weightLimitRef.setReference(Globals.getGameModeUnitSet() - .displayWeightInUnitSet(limit)); + double lowerLimit = 0.0f; + for (Load testLoad : Load.values()) + { + double testLimit = WeightToken.getLoadToken(testLoad.toString(),theCharacter); + if (testLoad.compareTo(load) < 0 && testLimit > lowerLimit) + { + lowerLimit = testLimit; + } + } + StringBuilder loadLimit = new StringBuilder(Globals.getGameModeUnitSet() + .displayWeightInUnitSet(lowerLimit)); + if (limit > 0) + { + loadLimit.append(" - "); + loadLimit.append(Globals.getGameModeUnitSet() + .displayWeightInUnitSet(limit)); + } + else + { + loadLimit.append("+ "); + } + loadLimit.append(Globals.getGameModeUnitSet().getWeightUnit()); + weightLimitRef.setReference(loadLimit.toString()); } /* (non-Javadoc) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java 2012-02-05 07:04:08 UTC (rev 16056) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java 2012-02-05 10:31:50 UTC (rev 16057) @@ -46,6 +46,7 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.SwingConstants; import javax.swing.TransferHandler; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; @@ -178,13 +179,12 @@ panel.add(new JScrollPane(equipmentTable), BorderLayout.CENTER); Box buttonsBox = Box.createHorizontalBox(); - buttonsBox.add(new JLabel(Icons.Back16.getImageIcon())); buttonsBox.add(unequipButton); buttonsBox.add(Box.createHorizontalStrut(3)); buttonsBox.add(unequipAllButton); buttonsBox.add(Box.createHorizontalGlue()); + equipButton.setHorizontalTextPosition(SwingConstants.LEADING); buttonsBox.add(equipButton); - buttonsBox.add(new JLabel(Icons.Forward16.getImageIcon())); buttonsBox.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0)); panel.add(buttonsBox, BorderLayout.SOUTH); @@ -213,8 +213,8 @@ box.add(new JLabel("Load:")); box.add(Box.createHorizontalStrut(5)); box.add(loadLabel); - box.add(Box.createHorizontalGlue()); - box.add(new JLabel("Limit:")); +// box.add(Box.createHorizontalGlue()); +// box.add(new JLabel("Limit:")); box.add(Box.createHorizontalStrut(5)); box.add(limitLabel); box.add(Box.createHorizontalGlue()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java 2012-02-05 07:04:08 UTC (rev 16056) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java 2012-02-05 10:31:50 UTC (rev 16057) @@ -53,6 +53,7 @@ import pcgen.core.facade.event.ReferenceListener; import pcgen.gui2.filter.DisplayableFilter; import pcgen.gui2.filter.FilterHandler; +import pcgen.gui2.tools.Icons; import pcgen.gui2.util.JTableEx; import pcgen.gui2.util.JTreeTable; import pcgen.gui2.util.table.TableCellUtilities; @@ -226,6 +227,7 @@ public UnequipAction() { super("Unequip Selected"); + this.putValue(SMALL_ICON, Icons.Back16.getImageIcon()); } public void actionPerformed(ActionEvent e) @@ -314,6 +316,7 @@ public EquipAction() { super("Equip Selected"); + this.putValue(SMALL_ICON, Icons.Forward16.getImageIcon()); } public void actionPerformed(ActionEvent e) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2012-02-05 23:42:53
|
Revision: 16075 http://pcgen.svn.sourceforge.net/pcgen/?rev=16075&view=rev Author: thpr Date: 2012-02-05 23:42:47 +0000 (Sun, 05 Feb 2012) Log Message: ----------- Remove unused imports Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenToolBar.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenToolBar.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenToolBar.java 2012-02-05 23:42:14 UTC (rev 16074) +++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenToolBar.java 2012-02-05 23:42:47 UTC (rev 16075) @@ -20,8 +20,6 @@ */ package pcgen.gui2; -import java.awt.Dimension; -import javax.swing.JComboBox; import javax.swing.JToolBar; import pcgen.gui2.util.ToolBarUtilities; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java 2012-02-05 23:42:14 UTC (rev 16074) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java 2012-02-05 23:42:47 UTC (rev 16075) @@ -72,7 +72,6 @@ import static pcgen.gui2.tabs.equip.EquipmentSelection.equipmentArrayFlavor; import pcgen.gui2.tabs.models.CharacterComboBoxModel; import pcgen.gui2.tools.FlippingSplitPane; -import pcgen.gui2.tools.Icons; import pcgen.gui2.tools.InfoPane; import pcgen.gui2.util.JDynamicTable; import pcgen.gui2.util.JTreeTable; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-09 08:36:59
|
Revision: 16117 http://pcgen.svn.sourceforge.net/pcgen/?rev=16117&view=rev Author: jdempsey Date: 2012-02-09 08:36:48 +0000 (Thu, 09 Feb 2012) Log Message: ----------- Choosers - Add support for add/remove on double click Issue#: CODE-1223 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableEx.java Added Paths: ----------- Trunk/pcgen/code/src/java/pcgen/gui2/util/JListEx.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-02-08 22:32:17 UTC (rev 16116) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-02-09 08:36:48 UTC (rev 16117) @@ -39,7 +39,6 @@ import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JLabel; -import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSplitPane; @@ -54,6 +53,7 @@ import pcgen.core.facade.util.ListFacade; import pcgen.gui2.tools.Icons; import pcgen.gui2.util.FacadeListModel; +import pcgen.gui2.util.JListEx; import pcgen.gui2.util.JTreeViewTable; import pcgen.gui2.util.treeview.DataView; import pcgen.gui2.util.treeview.DataViewColumn; @@ -86,7 +86,7 @@ private final JLabel remainingLabel; private final GeneralTreeViewModel treeViewModel; private final FacadeListModel<InfoFacade> listModel; - private final JList list; + private final JListEx list; private boolean committed; /** @@ -101,7 +101,7 @@ this.availTable = new JTreeViewTable<InfoFacade>(); this.remainingLabel = new JLabel(); this.treeViewModel = new GeneralTreeViewModel(); - this.list = new JList(); + this.list = new JListEx(); this.listModel = new FacadeListModel<InfoFacade>(); treeViewModel.setDelegate(chooser.getAvailableList()); @@ -134,6 +134,7 @@ JPanel leftPane = new JPanel(new BorderLayout()); //leftPane.add(new JLabel("Available Languages"), BorderLayout.NORTH); availTable.setTreeViewModel(treeViewModel); + availTable.addActionListener(this); leftPane.add(new JScrollPane(availTable), BorderLayout.CENTER); JPanel buttonPane1 = new JPanel(new FlowLayout()); @@ -159,6 +160,7 @@ list.setModel(listModel); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + list.addActionListener(this); rightPane.add(new JScrollPane(list), BorderLayout.CENTER); JPanel buttonPane2 = new JPanel(new FlowLayout()); @@ -190,7 +192,7 @@ public void actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("ADD")) + if (e.getActionCommand().equals("ADD") || e.getSource() == availTable) { List<Object> data = availTable.getSelectedData(); if (!data.isEmpty() && data.get(0) instanceof InfoFacade) @@ -199,7 +201,7 @@ } return; } - if (e.getActionCommand().equals("REMOVE")) + if (e.getActionCommand().equals("REMOVE") || e.getSource() == list) { Object value = list.getSelectedValue(); if (value != null && value instanceof InfoFacade) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-02-08 22:32:17 UTC (rev 16116) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-02-09 08:36:48 UTC (rev 16117) @@ -33,14 +33,15 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; + import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JLabel; -import javax.swing.JList; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.ListSelectionModel; + import pcgen.core.facade.LanguageChooserFacade; import pcgen.core.facade.LanguageFacade; import pcgen.core.facade.event.ReferenceEvent; @@ -50,6 +51,7 @@ import pcgen.core.facade.util.ListFacade; import pcgen.gui2.tools.Icons; import pcgen.gui2.util.FacadeListModel; +import pcgen.gui2.util.JListEx; import pcgen.gui2.util.JTreeViewTable; import pcgen.gui2.util.treeview.DataView; import pcgen.gui2.util.treeview.DataViewColumn; @@ -69,7 +71,7 @@ private final JLabel remainingLabel; private final LangTreeViewModel treeViewModel; private final FacadeListModel<LanguageFacade> listModel; - private final JList list; + private final JListEx list; public LanguageChooserDialog(Frame frame, LanguageChooserFacade chooser) { @@ -78,7 +80,7 @@ this.availTable = new JTreeViewTable(); this.remainingLabel = new JLabel(); this.treeViewModel = new LangTreeViewModel(); - this.list = new JList(); + this.list = new JListEx(); this.listModel = new FacadeListModel<LanguageFacade>(); treeViewModel.setDelegate(chooser.getAvailableList()); @@ -111,6 +113,7 @@ JPanel leftPane = new JPanel(new BorderLayout()); //leftPane.add(new JLabel("Available Languages"), BorderLayout.NORTH); availTable.setTreeViewModel(treeViewModel); + availTable.addActionListener(this); leftPane.add(new JScrollPane(availTable), BorderLayout.CENTER); JPanel buttonPane1 = new JPanel(new FlowLayout()); @@ -136,6 +139,7 @@ list.setModel(listModel); list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + list.addActionListener(this); rightPane.add(new JScrollPane(list), BorderLayout.CENTER); JPanel buttonPane2 = new JPanel(new FlowLayout()); @@ -167,7 +171,7 @@ public void actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("ADD")) + if (e.getActionCommand().equals("ADD") || e.getSource() == availTable) { List<Object> data = availTable.getSelectedData(); if (!data.isEmpty()) @@ -176,7 +180,7 @@ } return; } - if (e.getActionCommand().equals("REMOVE")) + if (e.getActionCommand().equals("REMOVE") || e.getSource() == list) { Object value = list.getSelectedValue(); if (value != null) Added: Trunk/pcgen/code/src/java/pcgen/gui2/util/JListEx.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JListEx.java (rev 0) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JListEx.java 2012-02-09 08:36:48 UTC (rev 16117) @@ -0,0 +1,116 @@ +/* + * JListEx.java + * Copyright James Dempsey, 2012 + * + * 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 09/02/2012 7:06:02 PM + * + * $Id$ + */ +package pcgen.gui2.util; + +import java.awt.Point; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + +import javax.swing.JList; + +/** + * The Class <code>JListEx</code> extends JList to provide double click events. + * + * <br/> + * Last Editor: $Author$ + * Last Edited: $Date$ + * + * @author James Dempsey <jde...@us...> + * @version $Revision$ + */ + +public class JListEx extends JList +{ + /** Constant for a double click action event. */ + public static final int ACTION_DOUBLECLICK = 2051; + + + /** + * Create a new instance of JListEx + */ + public JListEx() + { + installDoubleCLickListener(); + } + + private void installDoubleCLickListener() + { + addMouseListener(new MouseAdapter() + { + public void mouseClicked(MouseEvent e) + { + if (e.getComponent().isEnabled() && e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 2) + { + Point p = e.getPoint(); + int row = locationToIndex(p); + Object value = getModel().getElementAt(row); + fireActionEvent(JListEx.this, ACTION_DOUBLECLICK, String.valueOf(value)); + } + } + }); + } + + + private void fireActionEvent(Object value, int id, String command) + { + ActionEvent e = null; + // 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] == ActionListener.class) + { + // Lazily create the event: + if (e == null) + { + e = new ActionEvent(value, id, command); + } + + ((ActionListener) listeners[i + 1]).actionPerformed(e); + } + } + } + + /** + * Add a new listener to be informed of double click actions. + * @param listener The new listening class + */ + public void addActionListener(ActionListener listener) + { + listenerList.add(ActionListener.class, listener); + } + + /** + * Remove a listener to no longer be informed of double click actions. + * @param listener The existing listening class + */ + public void removeActionListener(ActionListener listener) + { + listenerList.remove(ActionListener.class, listener); + } + +} Property changes on: Trunk/pcgen/code/src/java/pcgen/gui2/util/JListEx.java ___________________________________________________________________ Added: svn:keywords + Date Author Revision Id Added: svn:eol-style + native Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableEx.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableEx.java 2012-02-08 22:32:17 UTC (rev 16116) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableEx.java 2012-02-09 08:36:48 UTC (rev 16117) @@ -56,7 +56,9 @@ { private static final long serialVersionUID = 514835142307946415L; - protected static final int ACTION_DOUBLECLICK = 2042; + + /** Constant for a double click action event. */ + public static final int ACTION_DOUBLECLICK = 2042; private final RowComparator rowComparator = new RowComparator(); private List<SortingPriority> columnkeys; private boolean isSorting = false; @@ -120,7 +122,7 @@ int row = convertRowIndexToModel(rowAtPoint(p)); int column = convertColumnIndexToModel(columnAtPoint(p)); Object value = getModel().getValueAt(row, column); - fireActionEvent(this, ACTION_DOUBLECLICK, String.valueOf(value)); + fireActionEvent(JTableEx.this, ACTION_DOUBLECLICK, String.valueOf(value)); } } }); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-13 11:22:48
|
Revision: 16187 http://pcgen.svn.sourceforge.net/pcgen/?rev=16187&view=rev Author: jdempsey Date: 2012-02-13 11:22:38 +0000 (Mon, 13 Feb 2012) Log Message: ----------- Preferences specific to old UI should be removed Issue#: CODE-1255 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DisplayOptionsPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LevelUpPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/MonsterPanel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-02-13 10:04:25 UTC (rev 16186) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-02-13 11:22:38 UTC (rev 16187) @@ -88,7 +88,6 @@ import pcgen.gui2.prefs.OutputPanel; import pcgen.gui2.prefs.PCGenPrefsPanel; import pcgen.gui2.prefs.SourcesPanel; -import pcgen.gui2.prefs.TabsPanel; import pcgen.gui2.tools.FlippingSplitPane; import pcgen.gui2.tools.Utility; import pcgen.system.LanguageBundle; @@ -137,7 +136,7 @@ private PCGenPrefsPanel displayOptionsPanel; private PCGenPrefsPanel levelUpPanel; private PCGenPrefsPanel lookAndFeelPanel; - private PCGenPrefsPanel tabsPanel; +// private PCGenPrefsPanel tabsPanel; // PCGen panels private PCGenPrefsPanel equipmentPanel; @@ -304,8 +303,8 @@ addPanelToTree(appearanceNode, levelUpPanel); lookAndFeelPanel = new LookAndFeelPanel(this); addPanelToTree(appearanceNode, lookAndFeelPanel); - tabsPanel = new TabsPanel(); - addPanelToTree(appearanceNode, tabsPanel); +// tabsPanel = new TabsPanel(); +// addPanelToTree(appearanceNode, tabsPanel); rootNode.add(appearanceNode); pcGenNode = new DefaultMutableTreeNode(in_pcgen); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DisplayOptionsPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DisplayOptionsPanel.java 2012-02-13 10:04:25 UTC (rev 16186) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DisplayOptionsPanel.java 2012-02-13 11:22:38 UTC (rev 16187) @@ -61,24 +61,24 @@ private static String in_displayOpts = LanguageBundle.getString("in_Prefs_displayOpts"); - private static String in_useAutoWaitCursor = - LanguageBundle.getString("in_Prefs_useAutoWaitCursor"); +// private static String in_useAutoWaitCursor = +// LanguageBundle.getString("in_Prefs_useAutoWaitCursor"); private static String in_useOutputNamesEquipment = LanguageBundle.getString("in_Prefs_useOutputNamesEquipment"); private static String in_useOutputNamesSpells = LanguageBundle.getString("in_Prefs_useOutputNamesSpells"); - private static String in_showMemory = - LanguageBundle.getString("in_Prefs_showMemory"); - private static String in_showImagePreview = - LanguageBundle.getString("in_Prefs_showImagePreview"); - private static String in_showSkillModifierBreakdown = - LanguageBundle.getString("in_Prefs_showSkillModifierBreakdown"); - private static String in_showSkillRanksBreakdown = - LanguageBundle.getString("in_Prefs_showSkillRanksBreakdown"); +// private static String in_showMemory = +// LanguageBundle.getString("in_Prefs_showMemory"); +// private static String in_showImagePreview = +// LanguageBundle.getString("in_Prefs_showImagePreview"); +// private static String in_showSkillModifierBreakdown = +// LanguageBundle.getString("in_Prefs_showSkillModifierBreakdown"); +// private static String in_showSkillRanksBreakdown = +// LanguageBundle.getString("in_Prefs_showSkillRanksBreakdown"); private static String in_showToolTips = LanguageBundle.getString("in_Prefs_showToolTips"); - private static String in_showToolBar = - LanguageBundle.getString("in_Prefs_showToolBar"); +// private static String in_showToolBar = +// LanguageBundle.getString("in_Prefs_showToolBar"); private static String in_showFeatDescription = LanguageBundle.getString("in_Prefs_showFeatDesciption"); private static String in_singleChoiceOption = @@ -93,16 +93,16 @@ {in_cmNone, in_cmSelect, in_cmSelectExit}; private JCheckBox featDescriptionShown = new JCheckBox(); - private JCheckBox showToolbar = new JCheckBox(); - private JCheckBox showSkillModifier = new JCheckBox(); - private JCheckBox showSkillRanks = new JCheckBox(); +// private JCheckBox showToolbar = new JCheckBox(); +// private JCheckBox showSkillModifier = new JCheckBox(); +// private JCheckBox showSkillRanks = new JCheckBox(); private JCheckBox toolTipTextShown = new JCheckBox(); - private JCheckBox showMemory = new JCheckBox(); - private JCheckBox showImagePreview = new JCheckBox(); +// private JCheckBox showMemory = new JCheckBox(); +// private JCheckBox showImagePreview = new JCheckBox(); private JCheckBox useOutputNamesEquipment = new JCheckBox(); private JCheckBox useOutputNamesSpells = new JCheckBox(); - private JCheckBox waitCursor = new JCheckBox(); +// private JCheckBox waitCursor = new JCheckBox(); private JComboBoxEx cmbChoiceMethods = new JComboBoxEx(singleChoiceMethods); /** @@ -132,14 +132,14 @@ new TreeMap<String, JComponent>(); options.put(in_showFeatDescription, featDescriptionShown); - options.put(in_showMemory, showMemory); - options.put(in_showImagePreview, showImagePreview); - options.put(in_showSkillModifierBreakdown, showSkillModifier); - options.put(in_showSkillRanksBreakdown, showSkillRanks); - options.put(in_showToolBar, showToolbar); +// options.put(in_showMemory, showMemory); +// options.put(in_showImagePreview, showImagePreview); +// options.put(in_showSkillModifierBreakdown, showSkillModifier); +// options.put(in_showSkillRanksBreakdown, showSkillRanks); +// options.put(in_showToolBar, showToolbar); options.put(in_showToolTips, toolTipTextShown); options.put(in_singleChoiceOption, cmbChoiceMethods); - options.put(in_useAutoWaitCursor, waitCursor); +// options.put(in_useAutoWaitCursor, waitCursor); options.put(in_useOutputNamesEquipment, useOutputNamesEquipment); options.put(in_useOutputNamesSpells, useOutputNamesSpells); @@ -205,10 +205,10 @@ public void setOptionsBasedOnControls() { SettingsHandler.setToolTipTextShown(toolTipTextShown.isSelected()); - SettingsHandler.setShowMemoryArea(showMemory.isSelected()); - SettingsHandler.setShowImagePreview(showImagePreview.isSelected()); - SettingsHandler.setToolBarShown(showToolbar.isSelected()); - SettingsHandler.setUseWaitCursor(waitCursor.isSelected()); +// SettingsHandler.setShowMemoryArea(showMemory.isSelected()); +// SettingsHandler.setShowImagePreview(showImagePreview.isSelected()); +// SettingsHandler.setToolBarShown(showToolbar.isSelected()); +// SettingsHandler.setUseWaitCursor(waitCursor.isSelected()); SettingsHandler.setGUIUsesOutputNameEquipment(useOutputNamesEquipment .isSelected()); SettingsHandler.setGUIUsesOutputNameSpells(useOutputNamesSpells @@ -216,8 +216,8 @@ SettingsHandler.setSingleChoicePreference(cmbChoiceMethods .getSelectedIndex()); SettingsHandler.setUseFeatBenefits(!featDescriptionShown.isSelected()); - SettingsHandler.setShowSkillModifier(showSkillModifier.isSelected()); - SettingsHandler.setShowSkillRanks(showSkillRanks.isSelected()); +// SettingsHandler.setShowSkillModifier(showSkillModifier.isSelected()); +// SettingsHandler.setShowSkillRanks(showSkillRanks.isSelected()); } /* (non-Javadoc) @@ -229,17 +229,17 @@ cmbChoiceMethods.setSelectedIndex(SettingsHandler .getSingleChoicePreference()); featDescriptionShown.setSelected(!SettingsHandler.useFeatBenefits()); - showMemory.setSelected(SettingsHandler.isShowMemoryArea()); - showImagePreview.setSelected(SettingsHandler.isShowImagePreview()); - showSkillModifier.setSelected(SettingsHandler.getShowSkillModifier()); - showSkillRanks.setSelected(SettingsHandler.getShowSkillRanks()); - showToolbar.setSelected(SettingsHandler.isToolBarShown()); +// showMemory.setSelected(SettingsHandler.isShowMemoryArea()); +// showImagePreview.setSelected(SettingsHandler.isShowImagePreview()); +// showSkillModifier.setSelected(SettingsHandler.getShowSkillModifier()); +// showSkillRanks.setSelected(SettingsHandler.getShowSkillRanks()); +// showToolbar.setSelected(SettingsHandler.isToolBarShown()); toolTipTextShown.setSelected(SettingsHandler.isToolTipTextShown()); useOutputNamesEquipment.setSelected(SettingsHandler .guiUsesOutputNameEquipment()); useOutputNamesSpells.setSelected(SettingsHandler .guiUsesOutputNameSpells()); - waitCursor.setSelected(SettingsHandler.getUseWaitCursor()); +// waitCursor.setSelected(SettingsHandler.getUseWaitCursor()); } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LevelUpPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LevelUpPanel.java 2012-02-13 10:04:25 UTC (rev 16186) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LevelUpPanel.java 2012-02-13 11:22:38 UTC (rev 16187) @@ -35,6 +35,7 @@ import pcgen.core.SettingsHandler; import pcgen.gui2.tools.Utility; import pcgen.system.LanguageBundle; +import pcgen.system.PCGenSettings; /** * The Class <code>LevelUpPanel</code> is responsible for @@ -53,19 +54,19 @@ private static String in_levelUp = LanguageBundle.getString("in_Prefs_levelUp"); - private static String in_enforceSpending = - LanguageBundle.getString("in_Prefs_enforceSpending"); - private static String in_hpWindow = - LanguageBundle.getString("in_Prefs_hpWindow"); +// private static String in_enforceSpending = +// LanguageBundle.getString("in_Prefs_enforceSpending"); +// private static String in_hpWindow = +// LanguageBundle.getString("in_Prefs_hpWindow"); private static String in_statWindow = LanguageBundle.getString("in_Prefs_statWindow"); private static String in_warnFirstLevelUp = LanguageBundle.getString("in_Prefs_warnFirstLevelUp"); - private JCheckBox hpDialogShownAtLevelUp = new JCheckBox(); +// private JCheckBox hpDialogShownAtLevelUp = new JCheckBox(); private JCheckBox showWarningAtFirstLevelUp = new JCheckBox(); private JCheckBox statDialogShownAtLevelUp = new JCheckBox(); - private JCheckBox enforceSpendingBeforeLevelUp = new JCheckBox(); +// private JCheckBox enforceSpendingBeforeLevelUp = new JCheckBox(); // private JCheckBox featDialogShownAtLevelUp = new JCheckBox(); /** @@ -89,13 +90,13 @@ c.anchor = GridBagConstraints.WEST; c.insets = new Insets(2, 2, 2, 2); - Utility.buildConstraints(c, 0, 0, 2, 1, 0, 0); - label = new JLabel(in_hpWindow + ": "); - gridbag.setConstraints(label, c); - this.add(label); - Utility.buildConstraints(c, 2, 0, 1, 1, 0, 0); - gridbag.setConstraints(hpDialogShownAtLevelUp, c); - this.add(hpDialogShownAtLevelUp); +// Utility.buildConstraints(c, 0, 0, 2, 1, 0, 0); +// label = new JLabel(in_hpWindow + ": "); +// gridbag.setConstraints(label, c); +// this.add(label); +// Utility.buildConstraints(c, 2, 0, 1, 1, 0, 0); +// gridbag.setConstraints(hpDialogShownAtLevelUp, c); +// this.add(hpDialogShownAtLevelUp); // Utility.buildConstraints(c, 0, 1, 2, 1, 0, 0); // label = new JLabel(in_featWindow + ": "); @@ -121,13 +122,13 @@ gridbag.setConstraints(showWarningAtFirstLevelUp, c); this.add(showWarningAtFirstLevelUp); - Utility.buildConstraints(c, 0, 4, 2, 1, 0, 0); - label = new JLabel(in_enforceSpending + ": "); - gridbag.setConstraints(label, c); - this.add(label); - Utility.buildConstraints(c, 2, 4, 1, 1, 0, 0); - gridbag.setConstraints(enforceSpendingBeforeLevelUp, c); - this.add(enforceSpendingBeforeLevelUp); +// Utility.buildConstraints(c, 0, 4, 2, 1, 0, 0); +// label = new JLabel(in_enforceSpending + ": "); +// gridbag.setConstraints(label, c); +// this.add(label); +// Utility.buildConstraints(c, 2, 4, 1, 1, 0, 0); +// gridbag.setConstraints(enforceSpendingBeforeLevelUp, c); +// this.add(enforceSpendingBeforeLevelUp); Utility.buildConstraints(c, 5, 20, 1, 1, 1, 1); c.fill = GridBagConstraints.BOTH; @@ -151,16 +152,19 @@ @Override public void setOptionsBasedOnControls() { - SettingsHandler.setShowHPDialogAtLevelUp(hpDialogShownAtLevelUp - .isSelected()); +// SettingsHandler.setShowHPDialogAtLevelUp(hpDialogShownAtLevelUp +// .isSelected()); //SettingsHandler.setShowFeatDialogAtLevelUp(featDialogShownAtLevelUp.isSelected()); SettingsHandler.setShowStatDialogAtLevelUp(statDialogShownAtLevelUp .isSelected()); - SettingsHandler.setShowWarningAtFirstLevelUp(showWarningAtFirstLevelUp - .isSelected()); - SettingsHandler - .setEnforceSpendingBeforeLevelUp(enforceSpendingBeforeLevelUp - .isSelected()); + PCGenSettings.OPTIONS_CONTEXT.setBoolean( + PCGenSettings.OPTION_SHOW_WARNING_AT_FIRST_LEVEL_UP, + showWarningAtFirstLevelUp.isSelected()); +// SettingsHandler.setShowWarningAtFirstLevelUp(showWarningAtFirstLevelUp +// .isSelected()); +// SettingsHandler +// .setEnforceSpendingBeforeLevelUp(enforceSpendingBeforeLevelUp +// .isSelected()); } /* (non-Javadoc) @@ -169,15 +173,16 @@ @Override public void applyOptionValuesToControls() { - hpDialogShownAtLevelUp.setSelected(SettingsHandler - .getShowHPDialogAtLevelUp()); +// hpDialogShownAtLevelUp.setSelected(SettingsHandler +// .getShowHPDialogAtLevelUp()); //featDialogShownAtLevelUp.setSelected(SettingsHandler.getShowFeatDialogAtLevelUp()); statDialogShownAtLevelUp.setSelected(SettingsHandler .getShowStatDialogAtLevelUp()); - showWarningAtFirstLevelUp.setSelected(SettingsHandler - .isShowWarningAtFirstLevelUp()); - enforceSpendingBeforeLevelUp.setSelected(SettingsHandler - .getEnforceSpendingBeforeLevelUp()); + showWarningAtFirstLevelUp.setSelected(PCGenSettings.OPTIONS_CONTEXT + .getBoolean(PCGenSettings.OPTION_SHOW_WARNING_AT_FIRST_LEVEL_UP, + true)); + // enforceSpendingBeforeLevelUp.setSelected(SettingsHandler +// .getEnforceSpendingBeforeLevelUp()); } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/MonsterPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/MonsterPanel.java 2012-02-13 10:04:25 UTC (rev 16186) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/MonsterPanel.java 2012-02-13 11:22:38 UTC (rev 16187) @@ -52,7 +52,7 @@ { private static String in_monsters = LanguageBundle.getString("in_Prefs_monsters"); - private JCheckBox hideMonsterClasses = new JCheckBox(); +// private JCheckBox hideMonsterClasses = new JCheckBox(); private JCheckBox ignoreMonsterHDCap = new JCheckBox(); /** @@ -85,16 +85,16 @@ // this.add(label); // Utility.buildConstraints(c, 2, 0, 1, 1, 0, 0); - Utility.buildConstraints(c, 0, 1, 2, 1, 0, 0); - label = - new JLabel(LanguageBundle - .getString("in_Prefs_hideMonsterClasses") - + ": "); - gridbag.setConstraints(label, c); - this.add(label); - Utility.buildConstraints(c, 2, 1, 1, 1, 0, 0); - gridbag.setConstraints(hideMonsterClasses, c); - this.add(hideMonsterClasses); +// Utility.buildConstraints(c, 0, 1, 2, 1, 0, 0); +// label = +// new JLabel(LanguageBundle +// .getString("in_Prefs_hideMonsterClasses") +// + ": "); +// gridbag.setConstraints(label, c); +// this.add(label); +// Utility.buildConstraints(c, 2, 1, 1, 1, 0, 0); +// gridbag.setConstraints(hideMonsterClasses, c); +// this.add(hideMonsterClasses); Utility.buildConstraints(c, 0, 2, 2, 1, 0, 0); label = @@ -129,7 +129,7 @@ @Override public void setOptionsBasedOnControls() { - SettingsHandler.setHideMonsterClasses(hideMonsterClasses.isSelected()); +// SettingsHandler.setHideMonsterClasses(hideMonsterClasses.isSelected()); SettingsHandler.setIgnoreMonsterHDCap(ignoreMonsterHDCap.isSelected()); } @@ -139,7 +139,7 @@ @Override public void applyOptionValuesToControls() { - hideMonsterClasses.setSelected(SettingsHandler.hideMonsterClasses()); +// hideMonsterClasses.setSelected(SettingsHandler.hideMonsterClasses()); ignoreMonsterHDCap.setSelected(SettingsHandler.isIgnoreMonsterHDCap()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-15 01:43:59
|
Revision: 16210 http://pcgen.svn.sourceforge.net/pcgen/?rev=16210&view=rev Author: jdempsey Date: 2012-02-15 01:43:52 +0000 (Wed, 15 Feb 2012) Log Message: ----------- Character Sheet Tab - Refresh on display Issue#: CODE-1265 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/InfoTabbedPane.java Added Paths: ----------- Trunk/pcgen/code/src/java/pcgen/gui2/util/DisplayAwareTab.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java 2012-02-15 01:03:42 UTC (rev 16209) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java 2012-02-15 01:43:52 UTC (rev 16210) @@ -52,6 +52,7 @@ import pcgen.gui2.filter.Filter; import pcgen.gui2.filter.FilteredListFacadeTableModel; import pcgen.gui2.tools.FlippingSplitPane; +import pcgen.gui2.util.DisplayAwareTab; import pcgen.gui2.util.event.ListDataAdapter; import pcgen.gui2.util.table.TableUtils; import pcgen.system.ConfigurationSettings; @@ -70,7 +71,7 @@ * @author James Dempsey <jde...@us...> * @version $Revision: 14593 $ */ -public class CharacterSheetInfoTab extends FlippingSplitPane implements CharacterInfoTab +public class CharacterSheetInfoTab extends FlippingSplitPane implements CharacterInfoTab, DisplayAwareTab { private final TabTitle tabTitle = new TabTitle("Character Sheet"); @@ -157,6 +158,16 @@ return tabTitle; } + /** + * {@inheritDoc} + */ + @Override + public void tabSelected() + { + // Refresh the character sheet as we have been displayed. + csheet.refresh(); + } + private class BoxHandler extends ListDataAdapter { @@ -237,48 +248,48 @@ { csheet.setCharacter(character); - character.getAgeCategoryRef().addReferenceListener(this); - character.getAgeRef().addReferenceListener(this); - character.getAlignmentRef().addReferenceListener(this); - character.getCarriedWeightRef().addReferenceListener(this); - character.getDeityRef().addReferenceListener(this); - character.getGenderRef().addReferenceListener(this); - character.getHandedRef().addReferenceListener(this); - character.getLoadRef().addReferenceListener(this); - character.getNameRef().addReferenceListener(this); - character.getPlayersNameRef().addReferenceListener(this); - character.getRaceRef().addReferenceListener(this); - character.getStatTotalTextRef().addReferenceListener(this); - character.getTotalHPRef().addReferenceListener(this); - character.getXPRef().addReferenceListener(this); - - character.getDomains().addListListener(this); - character.getLanguages().addListListener(this); - character.getTempBonuses().addListListener(this); - character.getTemplates().addListListener(this); +// character.getAgeCategoryRef().addReferenceListener(this); +// character.getAgeRef().addReferenceListener(this); +// character.getAlignmentRef().addReferenceListener(this); +// character.getCarriedWeightRef().addReferenceListener(this); +// character.getDeityRef().addReferenceListener(this); +// character.getGenderRef().addReferenceListener(this); +// character.getHandedRef().addReferenceListener(this); +// character.getLoadRef().addReferenceListener(this); +// character.getNameRef().addReferenceListener(this); +// character.getPlayersNameRef().addReferenceListener(this); +// character.getRaceRef().addReferenceListener(this); +// character.getStatTotalTextRef().addReferenceListener(this); +// character.getTotalHPRef().addReferenceListener(this); +// character.getXPRef().addReferenceListener(this); +// +// character.getDomains().addListListener(this); +// character.getLanguages().addListListener(this); +// character.getTempBonuses().addListListener(this); +// character.getTemplates().addListListener(this); } public void uninstall() { - character.getAgeCategoryRef().removeReferenceListener(this); - character.getAgeRef().removeReferenceListener(this); - character.getAlignmentRef().removeReferenceListener(this); - character.getCarriedWeightRef().removeReferenceListener(this); - character.getDeityRef().removeReferenceListener(this); - character.getGenderRef().removeReferenceListener(this); - character.getHandedRef().removeReferenceListener(this); - character.getLoadRef().removeReferenceListener(this); - character.getNameRef().removeReferenceListener(this); - character.getPlayersNameRef().removeReferenceListener(this); - character.getRaceRef().removeReferenceListener(this); - character.getStatTotalTextRef().removeReferenceListener(this); - character.getTotalHPRef().removeReferenceListener(this); - character.getXPRef().removeReferenceListener(this); - - character.getDomains().removeListListener(this); - character.getLanguages().removeListListener(this); - character.getTempBonuses().removeListListener(this); - character.getTemplates().removeListListener(this); +// character.getAgeCategoryRef().removeReferenceListener(this); +// character.getAgeRef().removeReferenceListener(this); +// character.getAlignmentRef().removeReferenceListener(this); +// character.getCarriedWeightRef().removeReferenceListener(this); +// character.getDeityRef().removeReferenceListener(this); +// character.getGenderRef().removeReferenceListener(this); +// character.getHandedRef().removeReferenceListener(this); +// character.getLoadRef().removeReferenceListener(this); +// character.getNameRef().removeReferenceListener(this); +// character.getPlayersNameRef().removeReferenceListener(this); +// character.getRaceRef().removeReferenceListener(this); +// character.getStatTotalTextRef().removeReferenceListener(this); +// character.getTotalHPRef().removeReferenceListener(this); +// character.getXPRef().removeReferenceListener(this); +// +// character.getDomains().removeListListener(this); +// character.getLanguages().removeListListener(this); +// character.getTempBonuses().removeListListener(this); +// character.getTemplates().removeListListener(this); } public void elementAdded(ListEvent<Object> e) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/InfoTabbedPane.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/InfoTabbedPane.java 2012-02-15 01:03:42 UTC (rev 16209) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/InfoTabbedPane.java 2012-02-15 01:43:52 UTC (rev 16210) @@ -42,6 +42,8 @@ import javax.swing.JOptionPane; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; import pcgen.base.util.DoubleKeyMap; import pcgen.core.facade.CharacterFacade; @@ -49,6 +51,7 @@ import pcgen.core.facade.TodoFacade.CharacterTab; import pcgen.gui2.UIPropertyContext; import pcgen.gui2.tools.CharacterSelectionListener; +import pcgen.gui2.util.DisplayAwareTab; import pcgen.util.Logging; /** @@ -57,7 +60,7 @@ * @author Connor Petty <cpm...@us...> */ public final class InfoTabbedPane extends JTabbedPane - implements CharacterSelectionListener + implements CharacterSelectionListener, ChangeListener { public static final int SUMMARY_TAB = 0; @@ -117,6 +120,8 @@ addTab(new InventoryInfoTab()); addTab(new DescriptionInfoTab()); addTab(new CharacterSheetInfoTab()); + + addChangeListener(this); } private <T extends Component & CharacterInfoTab> void addTab(T tab) @@ -214,6 +219,19 @@ } /** + * {@inheritDoc} + */ + public void stateChanged(ChangeEvent e) + { + // The currently displayed tab has changed so if the new one wants to know about it, let it know + Component comp = getSelectedComponent(); + if (comp instanceof DisplayAwareTab) + { + ((DisplayAwareTab) comp).tabSelected(); + } + } + + /** * This class handles the concurrent processing of storing and restoring tab models. * Conceptually this process consists of two separate processing queues. * One queue is the orderly execution of restoring tab models which takes place in a Added: Trunk/pcgen/code/src/java/pcgen/gui2/util/DisplayAwareTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/DisplayAwareTab.java (rev 0) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/DisplayAwareTab.java 2012-02-15 01:43:52 UTC (rev 16210) @@ -0,0 +1,41 @@ +/* + * DisplayAwareTab.java + * Copyright James Dempsey, 2012 + * + * 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 15/02/2012 12:20:44 PM + * + * $Id$ + */ +package pcgen.gui2.util; + +/** + * <code>DisplayAwareTab</code> identifies a tab that wants to be advised when it is displayed. + * + * <br/> + * Last Editor: $Author$ + * Last Edited: $Date$ + * + * @author James Dempsey <jde...@us...> + * @version $Revision$ + */ +public interface DisplayAwareTab +{ + /** + * Notify the tab that it has been displayed. + */ + public void tabSelected(); +} Property changes on: Trunk/pcgen/code/src/java/pcgen/gui2/util/DisplayAwareTab.java ___________________________________________________________________ Added: svn:keywords + Date Author Revision Id Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-18 05:12:17
|
Revision: 16229 http://pcgen.svn.sourceforge.net/pcgen/?rev=16229&view=rev Author: jdempsey Date: 2012-02-18 05:12:11 +0000 (Sat, 18 Feb 2012) Log Message: ----------- Rweak to reduce ConcurrentModificationException Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java 2012-02-17 22:27:41 UTC (rev 16228) +++ Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java 2012-02-18 05:12:11 UTC (rev 16229) @@ -140,7 +140,6 @@ public void setCharacterSheet(File sheet) { handler = new ExportHandler(sheet); - refresh(); } public void refresh() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java 2012-02-17 22:27:41 UTC (rev 16228) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java 2012-02-18 05:12:11 UTC (rev 16229) @@ -228,6 +228,7 @@ if (e.getIndex0() == -1 && e.getIndex1() == -1) { csheet.setCharacterSheet((File) sheetBox.getSelectedItem()); + csheet.refresh(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-19 01:52:22
|
Revision: 16237 http://pcgen.svn.sourceforge.net/pcgen/?rev=16237&view=rev Author: jdempsey Date: 2012-02-19 01:52:15 +0000 (Sun, 19 Feb 2012) Log Message: ----------- Fix bug: Skills - level not selected if all ranks spent Issue#: CODE-1269 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelFacadeImpl.java 2012-02-19 00:37:25 UTC (rev 16236) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelFacadeImpl.java 2012-02-19 01:52:15 UTC (rev 16237) @@ -69,4 +69,14 @@ return classFacade; } + /** + * {@inheritDoc} + */ + @Override + public String toString() + { + return characterLevel + " - " + String.valueOf(classFacade); + } + + } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2012-02-19 00:37:25 UTC (rev 16236) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2012-02-19 01:52:15 UTC (rev 16237) @@ -26,7 +26,6 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.text.DecimalFormat; -import java.util.Collections; import java.util.EventObject; import java.util.Hashtable; @@ -73,8 +72,6 @@ import pcgen.gui2.tabs.skill.SkillTreeViewModel; import pcgen.gui2.tools.FlippingSplitPane; import pcgen.gui2.tools.InfoPane; -import pcgen.gui2.util.SortMode; -import pcgen.gui2.util.SortingPriority; import pcgen.gui2.util.table.TableCellUtilities.SpinnerEditor; import pcgen.gui2.util.table.TableCellUtilities.SpinnerRenderer; import pcgen.system.LanguageBundle; @@ -115,8 +112,6 @@ JSpinner spinner = new JSpinner(); spinner.setEditor(new JSpinner.NumberEditor(spinner, "#0.#")); - skillTable.setSortingPriority(Collections.singletonList(new SortingPriority(0, SortMode.ASCENDING))); - skillTable.sortModel(); skillTable.setDefaultRenderer(Float.class, new SpinnerRenderer(spinner)); skillTable.setRowHeight(26); FilterBar filterBar = new FilterBar(); @@ -250,7 +245,8 @@ } - private class LevelSelectionHandler implements ListListener, SkillPointListener, Runnable + private class LevelSelectionHandler implements ListListener, + SkillPointListener, Runnable, ListSelectionListener { private final CharacterLevelsFacade levels; @@ -266,6 +262,7 @@ { levels.addSkillPointListener(this); levels.addListListener(this); + model.addListSelectionListener(this); updateSelectedIndex(); } @@ -273,6 +270,7 @@ { levels.removeSkillPointListener(this); levels.removeListListener(this); + model.removeListSelectionListener(this); } public void run() @@ -289,6 +287,12 @@ return; } } + // Fall back for a non empty list of levels is to select the highest one. + if (levels.getSize() > 0) + { + model.setSelectionInterval(levels.getSize() - 1, + levels.getSize() - 1); + } } private void updateSelectedIndex() @@ -334,6 +338,15 @@ updateSelectedIndex(); } + /** + * {@inheritDoc} + */ + @Override + public void valueChanged(ListSelectionEvent e) + { + skillTable.refreshModelData(); + } + } private class FilterHandler implements ListSelectionListener This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <za...@us...> - 2012-02-22 12:34:54
|
Revision: 16270 http://pcgen.svn.sourceforge.net/pcgen/?rev=16270&view=rev Author: zaister Date: 2012-02-22 12:34:47 +0000 (Wed, 22 Feb 2012) Log Message: ----------- Use UIPropertyContext instead of SettingsHandler to persist export dialog settings Issue#: CODE-1282 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/UIPropertyContext.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/UIPropertyContext.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/UIPropertyContext.java 2012-02-22 08:45:43 UTC (rev 16269) +++ Trunk/pcgen/code/src/java/pcgen/gui2/UIPropertyContext.java 2012-02-22 12:34:47 UTC (rev 16270) @@ -38,6 +38,7 @@ public static final String VIRTUAL_COLOR = "virtualColor"; public static final String QUALIFIED_COLOR = "qualifiedColor"; public static final String ALWAYS_OPEN_EXPORT_FILE = "alwaysOpenExportFile"; + public static final String DEFAULT_OS_TYPE = "defaultOSType"; /** * The character property for the initial tab to open * this property corresponds to an integer value Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2012-02-22 08:45:43 UTC (rev 16269) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2012-02-22 12:34:47 UTC (rev 16270) @@ -175,12 +175,16 @@ setTitle("Export a PC or Party"); setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - String defaultOSType = SettingsHandler.getDefaultOSType(); - for (SheetFilter filter : SheetFilter.values()) + UIPropertyContext context = UIPropertyContext.createContext("ExportDialog"); + String defaultOSType = context.getProperty(UIPropertyContext.DEFAULT_OS_TYPE); + if (defaultOSType != null) { - if (defaultOSType.equals(filter.toString())) + for (SheetFilter filter : SheetFilter.values()) { - exportBox.setSelectedItem(filter); + if (defaultOSType.equals(filter.toString())) + { + exportBox.setSelectedItem(filter); + } } } } @@ -236,7 +240,9 @@ } else if (EXPORT_TO_COMMAND.equals(e.getActionCommand())) { - SettingsHandler.setDefaultOSType(exportBox.getSelectedItem().toString()); + UIPropertyContext context = UIPropertyContext.createContext("ExportDialog"); + context.setProperty(UIPropertyContext.DEFAULT_OS_TYPE, + exportBox.getSelectedItem().toString()); refreshFiles(); } else if (EXPORT_COMMAND.equals(e.getActionCommand())) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2012-02-23 01:17:44
|
Revision: 16274 http://pcgen.svn.sourceforge.net/pcgen/?rev=16274&view=rev Author: cpmeister Date: 2012-02-23 01:17:36 +0000 (Thu, 23 Feb 2012) Log Message: ----------- - fixed remaining tree collapsing issues - fixed resizing on purchase tab Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewTable.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableEx.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableSortingHeader.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeTable.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewTable.java 2012-02-22 14:16:30 UTC (rev 16273) +++ Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewTable.java 2012-02-23 01:17:36 UTC (rev 16274) @@ -22,8 +22,13 @@ import java.awt.event.MouseEvent; import java.util.Collections; +import java.util.Enumeration; import java.util.List; +import javax.swing.JTree; +import javax.swing.SwingUtilities; +import javax.swing.tree.TreePath; import pcgen.gui2.util.JTreeViewTable; +import pcgen.gui2.util.treetable.TreeTableModel; import pcgen.gui2.util.treeview.TreeView; import pcgen.gui2.util.treeview.TreeViewModel; import pcgen.gui2.util.treeview.TreeViewPath; @@ -63,8 +68,30 @@ public void refilter() { +// JTree tree = getTree(); +// TreeTableModel treeTableModel = getTreeTableModel(); +// Enumeration<TreePath> paths = tree.getExpandedDescendants(new TreePath( +// treeTableModel.getRoot())); +// TreePath[] selectionPaths = tree.getSelectionPaths(); filteredModel.refilter(); - sortModel(); +// if (paths != null) +// { +// while (paths.hasMoreElements()) +// { +// tree.expandPath(paths.nextElement()); +// } +// } +// tree.setSelectionPaths(selectionPaths); +// SwingUtilities.invokeLater(new Runnable(){ +// +// @Override +// public void run() +// { +// throw new UnsupportedOperationException("Not supported yet."); +// } +// +// }); +// sortModel(); } public void setContext(C context) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-02-22 14:16:30 UTC (rev 16273) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-02-23 01:17:36 UTC (rev 16274) @@ -275,6 +275,7 @@ splitPane.setRightComponent(infoPane); } splitPane.setResizeWeight(.25); + setResizeWeight(1); setBottomComponent(splitPane); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableEx.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableEx.java 2012-02-22 14:16:30 UTC (rev 16273) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableEx.java 2012-02-23 01:17:36 UTC (rev 16274) @@ -61,7 +61,6 @@ public static final int ACTION_DOUBLECLICK = 2042; private final RowComparator rowComparator = new RowComparator(); private List<SortingPriority> columnkeys; - private boolean isSorting = false; /** * Constructor @@ -186,6 +185,7 @@ model = new DefaultSortableTableModel(model); } super.setModel(model); + sortModel(); } @Override @@ -210,12 +210,12 @@ public void tableChanged(TableModelEvent e) { super.tableChanged(e); - if(!isSorting) - { - isSorting = true; - sortModel(); - isSorting = false; - } +// if(!isSorting) +// { +// isSorting = true; +// sortModel(); +// isSorting = false; +// } } public void toggleSort(int column) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableSortingHeader.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableSortingHeader.java 2012-02-22 14:16:30 UTC (rev 16273) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableSortingHeader.java 2012-02-23 01:17:36 UTC (rev 16274) @@ -46,129 +46,129 @@ public class JTableSortingHeader extends JTableHeader implements MouseListener { - private static final long serialVersionUID = -2459707147524421794L; - private static final Icon ASCENDING_ICON = Icons.Down16.getImageIcon(); - private static final Icon DESCENDING_ICON = Icons.Up16.getImageIcon(); - private static final ButtonModel defaultModel = new DefaultButtonModel(); - private final ButtonModel usedModel = new DefaultButtonModel(); + private static final long serialVersionUID = -2459707147524421794L; + private static final Icon ASCENDING_ICON = Icons.Down16.getImageIcon(); + private static final Icon DESCENDING_ICON = Icons.Up16.getImageIcon(); + private static final ButtonModel defaultModel = new DefaultButtonModel(); + private final ButtonModel usedModel = new DefaultButtonModel(); - public JTableSortingHeader(JTableEx table) - { - super(table.getColumnModel()); - this.table = table; - addMouseListener(this); - } + public JTableSortingHeader(JTableEx table) + { + super(table.getColumnModel()); + this.table = table; + addMouseListener(this); + } - @Override - protected TableCellRenderer createDefaultRenderer() - { - return new SortingHeaderRenderer(); - } + @Override + protected TableCellRenderer createDefaultRenderer() + { + return new SortingHeaderRenderer(); + } - @Override - public JTableEx getTable() - { - return (JTableEx) super.getTable(); - } + @Override + public JTableEx getTable() + { + return (JTableEx) super.getTable(); + } - public TableColumn getTrackedColumn() - { - TableColumnModel model = getColumnModel(); - Point mousepos = getMousePosition(); - if (mousepos != null) - { - return model.getColumn(model.getColumnIndexAtX(mousepos.x)); - } - return null; - } + public TableColumn getTrackedColumn() + { + TableColumnModel model = getColumnModel(); + Point mousepos = getMousePosition(); + if (mousepos != null) + { + return model.getColumn(model.getColumnIndexAtX(mousepos.x)); + } + return null; + } - public class SortingHeaderRenderer extends JButton implements TableCellRenderer - { + public class SortingHeaderRenderer extends JButton implements TableCellRenderer + { - public SortingHeaderRenderer() - { - setHorizontalTextPosition(LEADING); - this.setMargin(new Insets(0, 0, 0, 0)); - } + public SortingHeaderRenderer() + { + setHorizontalTextPosition(LEADING); + this.setMargin(new Insets(0, 0, 0, 0)); + } - public Component getTableCellRendererComponent(JTable table, - Object value, - boolean isSelected, - boolean hasFocus, - int row, - int column) - { - TableColumn draggedColumn = getDraggedColumn(); - if (draggedColumn != null && draggedColumn.getHeaderValue() == value) - { - setModel(usedModel); - } - else - { - setModel(defaultModel); - } - Icon icon = null; - TableColumn currentColumn = table.getColumn(value); - List<? extends SortingPriority> list = getTable().getSortingPriority(); - if (!list.isEmpty()) - { - SortingPriority order = list.get(0); - if (order.getColumn() == currentColumn.getModelIndex()) - { - switch (order.getMode()) - { - case ASCENDING: - icon = ASCENDING_ICON; - break; - case DESCENDING: - icon = DESCENDING_ICON; - break; - } - } - } - setIcon(icon); - setText(value.toString()); - return this; - } + public Component getTableCellRendererComponent(JTable table, + Object value, + boolean isSelected, + boolean hasFocus, + int row, + int column) + { + TableColumn draggedColumn = getDraggedColumn(); + if (draggedColumn != null && draggedColumn.getHeaderValue() == value) + { + setModel(usedModel); + } + else + { + setModel(defaultModel); + } + Icon icon = null; + TableColumn currentColumn = table.getColumn(value); + List<? extends SortingPriority> list = getTable().getSortingPriority(); + if (!list.isEmpty()) + { + SortingPriority order = list.get(0); + if (order.getColumn() == currentColumn.getModelIndex()) + { + switch (order.getMode()) + { + case ASCENDING: + icon = ASCENDING_ICON; + break; + case DESCENDING: + icon = DESCENDING_ICON; + break; + } + } + } + setIcon(icon); + setText(value.toString()); + return this; + } - } + } - public void mouseClicked(MouseEvent e) - { - if (SwingUtilities.isLeftMouseButton(e) && getCursor() == - Cursor.getDefaultCursor()) - { - getTable().toggleSort(getTrackedColumn().getModelIndex()); - usedModel.setPressed(false); - repaint(); - } - } + public void mouseClicked(MouseEvent e) + { + if (SwingUtilities.isLeftMouseButton(e) && getCursor() == Cursor.getDefaultCursor() + && getTrackedColumn() != null) + { + getTable().toggleSort(getTrackedColumn().getModelIndex()); + usedModel.setPressed(false); + repaint(); + } + } - public void mousePressed(MouseEvent e) - { - if (SwingUtilities.isLeftMouseButton(e)) - { - usedModel.setPressed(true); - repaint(); - } - } + public void mousePressed(MouseEvent e) + { + if (SwingUtilities.isLeftMouseButton(e)) + { + usedModel.setPressed(true); + repaint(); + } + } - public void mouseReleased(MouseEvent e) - { - if (SwingUtilities.isLeftMouseButton(e)) - { - usedModel.setPressed(false); - } - } + public void mouseReleased(MouseEvent e) + { + if (SwingUtilities.isLeftMouseButton(e)) + { + usedModel.setPressed(false); + } + } - public void mouseEntered(MouseEvent e) - { - usedModel.setRollover(true); - } + public void mouseEntered(MouseEvent e) + { + usedModel.setRollover(true); + } - public void mouseExited(MouseEvent e) - { - usedModel.setRollover(false); - } + public void mouseExited(MouseEvent e) + { + usedModel.setRollover(false); + } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeTable.java 2012-02-22 14:16:30 UTC (rev 16273) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeTable.java 2012-02-23 01:17:36 UTC (rev 16274) @@ -59,6 +59,7 @@ import pcgen.gui2.util.treetable.DefaultSortableTreeTableModel; import pcgen.gui2.util.treetable.SortableTreeTableModel; import pcgen.gui2.util.treetable.TreeTableNode; +import pcgen.util.Logging; /** * This example shows how to create a simple JTreeTable component, @@ -484,7 +485,8 @@ public void treeStructureChanged(TreeModelEvent e) { - fireTableStructureChanged(); +// fireTableStructureChanged(); + fireDelayedTableDataChanged(); } // Don't use fireTableRowsInserted() here; // the selection model would get updated twice. Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-02-22 14:16:30 UTC (rev 16273) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-02-23 01:17:36 UTC (rev 16274) @@ -43,6 +43,7 @@ import javax.swing.JTable; import javax.swing.JViewport; import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; import javax.swing.event.TableColumnModelEvent; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; @@ -357,7 +358,16 @@ model.setSelectedTreeView(startingView); setTreeTableModel(model); setColumnModel(createTableColumnModel(startingView, dataView)); - sortModel(); + SwingUtilities.invokeLater(new Runnable() + { + + @Override + public void run() + { + sortModel(); + } + + }); } private class TreeViewsPopupMenu extends JPopupMenu implements ListListener<TreeView<T>> @@ -392,9 +402,10 @@ if (child instanceof JMenuItem) { JMenuItem menu = (JMenuItem) child; - if (menu.isSelected() && menu.getAction() instanceof JTreeViewTable.ChangeViewAction) + if (menu.isSelected() + && menu.getAction() instanceof JTreeViewTable.ChangeViewAction) { - ChangeViewAction changeViewAction = (JTreeViewTable.ChangeViewAction)menu.getAction(); + ChangeViewAction changeViewAction = (JTreeViewTable.ChangeViewAction) menu.getAction(); startingView = changeViewAction.view; } } @@ -509,8 +520,8 @@ protected void maybeShowPopup(MouseEvent e) { - if (e.isPopupTrigger() && getTrackedColumn().getHeaderValue() == - treetableModel.getSelectedTreeView().getViewName()) + if (e.isPopupTrigger() && getTrackedColumn().getHeaderValue() + == treetableModel.getSelectedTreeView().getViewName()) { TableColumnModel columnmodel = getColumnModel(); Rectangle rect = getHeaderRect(columnmodel.getColumnIndexAtX(e.getX())); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java 2012-02-22 14:16:30 UTC (rev 16273) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java 2012-02-23 01:17:36 UTC (rev 16274) @@ -24,8 +24,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.Vector; import javax.swing.JTree; @@ -40,7 +42,6 @@ import pcgen.gui2.util.treetable.TreeTableNode; import pcgen.util.CollectionMaps; import pcgen.util.ListMap; -import pcgen.util.Logging; /** * @@ -67,7 +68,7 @@ public void elementsChanged(ListEvent<E> e) { //Todo: optimize - setData(ListFacades.wrap(model)); + setElements(ListFacades.wrap(model)); } }; @@ -136,9 +137,29 @@ setSelectedTreeView(selectedView); } + private void setElements(Collection<E> data) + { + Set<E> newData = new HashSet<E>(data); + for (E newKey : newData) + { + if (!dataMap.containsKey(newKey)) + { + addElement(newKey); + } + } + Set<E> oldData = new HashSet<E>(dataMap.keySet()); + for (E oldKey : oldData) + { + if (!newData.contains(oldKey)) + { + removeElement(oldKey); + } + } + } + private void removeElement(E elem) { - if (dataMap.containsKey(elem)) + if (dataMap.containsKey(elem) && selectedView != null) { TreeViewNode root = viewMap.get(selectedView); for (TreeViewPath<? super E> path : selectedView.getPaths(elem)) @@ -151,7 +172,7 @@ private void addElement(E elem) { - if (!dataMap.containsKey(elem)) + if (!dataMap.containsKey(elem) && selectedView != null) { dataMap.put(elem, dataview.getData(elem)); TreeViewNode root = viewMap.get(selectedView); @@ -223,19 +244,19 @@ { this.selectedView = view; TreeViewNode node = viewMap.get(view); - if (node == null) +// if (node == null) +// { + Vector<TreeViewPath<? super E>> paths = new Vector<TreeViewPath<? super E>>(); + for (E element : dataMap.keySet()) { - Vector<TreeViewPath<? super E>> paths = new Vector<TreeViewPath<? super E>>(); - for (E element : dataMap.keySet()) + for (TreeViewPath<? super E> path : view.getPaths(element)) { - for (TreeViewPath<? super E> path : view.getPaths(element)) - { - paths.add(path); - } + paths.add(path); } - node = new TreeViewNode(paths); - viewMap.put(view, node); } + node = new TreeViewNode(paths); + viewMap.put(view, node); +// } setRoot(node); } } @@ -300,6 +321,7 @@ { super(name, paths); this.level = level; + setAllowsChildren(true); } @Override @@ -340,6 +362,7 @@ { child = new TreeViewNode(level + 1, key, vector); } + child.setComparator(mostRecentComparator); if (mostRecentComparator == null || children == null) { add(child); @@ -389,6 +412,7 @@ public void insertTreeViewPath(TreeViewPath<? super E> path) { +// Logging.errorPrint("adding: "+path); if (!loadedChildren) { Vector<TreeViewPath<? super E>> vector = (Vector<TreeViewPath<? super E>>) childValue; @@ -419,6 +443,7 @@ vector.add(path); newchild = new TreeViewNode(level + 1, levelObject, vector); } + newchild.setComparator(mostRecentComparator); if (mostRecentComparator == null || children == null) { insertNodeInto(newchild, this, getChildCount()); @@ -436,12 +461,34 @@ } } + @Override + public boolean isLeaf() + { + if (level == 0) + { + return false; + } + if (!loadedChildren) + { + return childValue == null; + } + else + { + return getChildCount() == 0; + } + } + private Comparator<TreeTableNode> mostRecentComparator = null; + public void setComparator(Comparator<TreeTableNode> comparator) + { + this.mostRecentComparator = comparator; + } + @SuppressWarnings("unchecked") public void sortChildren(Comparator<TreeTableNode> comparator) { - mostRecentComparator = comparator; + setComparator(comparator); if (!loadedChildren) { loadChildren(); @@ -452,6 +499,7 @@ for (Object obj : children) { TreeViewNode child = (TreeViewNode) obj; + child.setComparator(mostRecentComparator); if (child.loadedChildren) { child.sortChildren(comparator); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cpm...@us...> - 2012-02-23 02:07:02
|
Revision: 16275 http://pcgen.svn.sourceforge.net/pcgen/?rev=16275&view=rev Author: cpmeister Date: 2012-02-23 02:06:55 +0000 (Thu, 23 Feb 2012) Log Message: ----------- code cleanup Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewModel.java Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewTable.java Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewModel.java 2012-02-23 01:17:36 UTC (rev 16274) +++ Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewModel.java 2012-02-23 02:06:55 UTC (rev 16275) @@ -130,83 +130,4 @@ refilter(); } -// public void refilter() -// { -// ListFacade<E> base = model.getDataModel(); -// -// //List<E> list = new ArrayList<E>(base.getSize()); -// int size = 0; -// for (E element : base) -// { -// if (filter.accept(context, element)) -// { -// size++; -// } -// } -// final int _size = size; -// data.setContents(new AbstractCollection<E>(){ -// -// @Override -// public Iterator<E> iterator() -// { -// return new FilteredIterator(); -// } -// -// @Override -// public int size() -// { -// return _size; -// } -// -// }); -// } -// -// public void elementAdded(ListEvent<E> e) -// { -// if (filter.accept(context, e.getElement())) -// { -// data.addElement(e.getElement()); -// } -// } -// -// public void elementRemoved(ListEvent<E> e) -// { -// data.removeElement(e.getElement()); -// } -// -// public void elementsChanged(ListEvent<E> e) -// { -// refilter(); -// } -// -// private class FilteredIterator implements Iterator<E> -// { -// -// ListFacade<E> base = model.getDataModel(); -// private int index = 0; -// -// public boolean hasNext() -// { -// while (index < base.getSize()) -// { -// if (filter.accept(context, base.getElementAt(index))) -// { -// return true; -// } -// index++; -// } -// return false; -// } -// -// public E next() -// { -// return base.getElementAt(index++); -// } -// -// public void remove() -// { -// throw new UnsupportedOperationException("Not supported yet."); -// } -// -// } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewTable.java 2012-02-23 01:17:36 UTC (rev 16274) +++ Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredTreeViewTable.java 2012-02-23 02:06:55 UTC (rev 16275) @@ -22,13 +22,8 @@ import java.awt.event.MouseEvent; import java.util.Collections; -import java.util.Enumeration; import java.util.List; -import javax.swing.JTree; -import javax.swing.SwingUtilities; -import javax.swing.tree.TreePath; import pcgen.gui2.util.JTreeViewTable; -import pcgen.gui2.util.treetable.TreeTableModel; import pcgen.gui2.util.treeview.TreeView; import pcgen.gui2.util.treeview.TreeViewModel; import pcgen.gui2.util.treeview.TreeViewPath; @@ -68,30 +63,7 @@ public void refilter() { -// JTree tree = getTree(); -// TreeTableModel treeTableModel = getTreeTableModel(); -// Enumeration<TreePath> paths = tree.getExpandedDescendants(new TreePath( -// treeTableModel.getRoot())); -// TreePath[] selectionPaths = tree.getSelectionPaths(); filteredModel.refilter(); -// if (paths != null) -// { -// while (paths.hasMoreElements()) -// { -// tree.expandPath(paths.nextElement()); -// } -// } -// tree.setSelectionPaths(selectionPaths); -// SwingUtilities.invokeLater(new Runnable(){ -// -// @Override -// public void run() -// { -// throw new UnsupportedOperationException("Not supported yet."); -// } -// -// }); -// sortModel(); } public void setContext(C context) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java 2012-02-23 01:17:36 UTC (rev 16274) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java 2012-02-23 02:06:55 UTC (rev 16275) @@ -51,7 +51,7 @@ implements SortableTreeTableModel { - protected final Map<TreeView<? super E>, TreeViewNode> viewMap = new HashMap<TreeView<? super E>, TreeViewNode>(); +// protected final Map<TreeView<? super E>, TreeViewNode> viewMap = new HashMap<TreeView<? super E>, TreeViewNode>(); private final ListListener<E> listListener = new ListListener<E>() { @@ -133,7 +133,6 @@ { dataMap.keySet().retainAll(data); populateDataMap(data); - viewMap.clear(); setSelectedTreeView(selectedView); } @@ -161,7 +160,7 @@ { if (dataMap.containsKey(elem) && selectedView != null) { - TreeViewNode root = viewMap.get(selectedView); + TreeViewNode root = (TreeViewNode) getRoot(); for (TreeViewPath<? super E> path : selectedView.getPaths(elem)) { root.removeTreeViewPath(path); @@ -175,50 +174,11 @@ if (!dataMap.containsKey(elem) && selectedView != null) { dataMap.put(elem, dataview.getData(elem)); - TreeViewNode root = viewMap.get(selectedView); + TreeViewNode root = (TreeViewNode) getRoot(); for (TreeViewPath<? super E> path : selectedView.getPaths(elem)) { root.insertTreeViewPath(path); } - //TODO If we change the root (and possibly the expanded path nodes) we lose the currently expanded path. - // So here we need to insert the new node wihtout disturbing the exisint nodes. - // We'll probably need to do the same for remove as well, both for efficiency and for keeping things expanded. - - // TreeViewNode parent = viewMap.get(selectedView); - // for (TreeViewPath<? super E> path : selectedView.getPaths(elem)) - // { - // Logging.errorPrint("Have path " + path); - // Vector<TreeViewPath<? super E>> paths = new Vector<TreeViewPath<? super E>>(); - // paths.add(path); - // for (int i = 0; i < path.getPathCount(); i++) - // { - // Object pathComp =path.getPathComponent(i); - // boolean found = false; - // for (int j = 0; j < parent.getChildCount(); j++) - // { - // TreeViewNode child = (TreeViewNode) parent.getChildAt(j); - // if (child.getUserObject().equals(pathComp)) - // { - // parent = child; - // found = true; - // break; - // } - // } - // if (!found && i < path.getPathCount() -1) - // { - // TreeViewNode node = new TreeViewNode(i, pathComp, null); - // Logging.errorPrint("Adding " + node + " to " + parent); - // insertNodeInto(node, parent, 0); - // parent = node; - // } - // } - // TreeViewNode node = new TreeViewNode(path.getPathCount(), elem, null); - // Logging.errorPrint("Adding " + node + " to " + parent + " numChildren " + parent.getChildCount()); - // insertNodeInto(node, parent, 0); - // Logging.errorPrint("After numChildren " + parent.getChildCount()); - // } -// viewMap.clear(); -// setSelectedTreeView(selectedView); } } @@ -243,9 +203,6 @@ if (view != null) { this.selectedView = view; - TreeViewNode node = viewMap.get(view); -// if (node == null) -// { Vector<TreeViewPath<? super E>> paths = new Vector<TreeViewPath<? super E>>(); for (E element : dataMap.keySet()) { @@ -254,10 +211,7 @@ paths.add(path); } } - node = new TreeViewNode(paths); - viewMap.put(view, node); -// } - setRoot(node); + setRoot(new TreeViewNode(paths)); } } @@ -301,7 +255,8 @@ public final void sortModel(Comparator<List<?>> comparator) { - viewMap.get(selectedView).sortChildren(new TreeNodeComparator(comparator)); + TreeViewNode root = (TreeViewNode) getRoot(); + root.sortChildren(new TreeNodeComparator(comparator)); reload(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-26 00:09:56
|
Revision: 16309 http://pcgen.svn.sourceforge.net/pcgen/?rev=16309&view=rev Author: jdempsey Date: 2012-02-26 00:09:49 +0000 (Sun, 26 Feb 2012) Log Message: ----------- Fix bug: Preferences Dialog Too Large Issue#: CODE-1293 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/HouseRulesPanel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-02-25 22:23:53 UTC (rev 16308) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-02-26 00:09:49 UTC (rev 16309) @@ -30,6 +30,7 @@ import java.awt.BorderLayout; import java.awt.CardLayout; +import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.GridBagConstraints; @@ -273,6 +274,7 @@ // Build the settings panel settingsPanel = new JPanel(); settingsPanel.setLayout(new CardLayout()); + settingsPanel.setPreferredSize(new Dimension(780, 420)); // Build the selection tree characterNode = new DefaultMutableTreeNode(in_character); @@ -451,7 +453,8 @@ panelList.add(prefsPanel); parent.add(new DefaultMutableTreeNode(prefsPanel .getTitle())); - settingsPanel.add(prefsPanel, prefsPanel.getTitle()); + JScrollPane rightScroll = new JScrollPane(prefsPanel); + settingsPanel.add(rightScroll, prefsPanel.getTitle()); } private void cancelButtonActionPerformed() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/HouseRulesPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/HouseRulesPanel.java 2012-02-25 22:23:53 UTC (rev 16308) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/HouseRulesPanel.java 2012-02-26 00:09:49 UTC (rev 16309) @@ -91,13 +91,13 @@ c.anchor = GridBagConstraints.WEST; c.insets = new Insets(2, 2, 2, 2); - Utility.buildConstraints(c, 0, 0, 2, 1, 0, 0); - label = - new JLabel(LanguageBundle - .getString("in_Prefs_hrCrossSkillCost") - + ": "); - gridbag.setConstraints(label, c); - mainPanel.add(label); +// Utility.buildConstraints(c, 0, 0, 3, 1, 0, 0); +// label = +// new JLabel(LanguageBundle +// .getString("in_Prefs_hrCrossSkillCost") +// + ": "); +// gridbag.setConstraints(label, c); +// mainPanel.add(label); // Utility.buildConstraints(c, 2, 0, 1, 1, 0, 0); // gridbag.setConstraints(crossClassSkillCostCombo, c); // this.add(crossClassSkillCostCombo); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-29 08:34:44
|
Revision: 16349 http://pcgen.svn.sourceforge.net/pcgen/?rev=16349&view=rev Author: jdempsey Date: 2012-02-29 08:34:32 +0000 (Wed, 29 Feb 2012) Log Message: ----------- Advanced Sources Tab - Reimplement as Available/Selected tables * Wire up use advanced sources preference * Recall sources selected in advanced tab for each game mode. * If using advanced tab, recall gamemode and sources used last time. Issue#: CODE-1290 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java 2012-02-29 02:35:40 UTC (rev 16348) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java 2012-02-29 08:34:32 UTC (rev 16349) @@ -40,6 +40,7 @@ import pcgen.core.SettingsHandler; import pcgen.core.utils.MessageType; import pcgen.core.utils.ShowMessageDelegate; +import pcgen.gui2.UIPropertyContext; import pcgen.gui2.tools.Utility; import pcgen.gui2.util.JComboBoxEx; import pcgen.system.LanguageBundle; @@ -59,8 +60,10 @@ @SuppressWarnings("serial") public class SourcesPanel extends PCGenPrefsPanel { + /** Settings key for basic/advanced sources. */ + private static final String SOURCE_USE_BASIC_KEY = "SourceSelectionDialog.useBasic"; //$NON-NLS-1$ private static String in_sources = - LanguageBundle.getString("in_Prefs_sources"); + LanguageBundle.getString("in_Prefs_sources"); //$NON-NLS-1$ private JCheckBox campLoad = new JCheckBox(); private JCheckBox charCampLoad = new JCheckBox(); private JCheckBox allowOptsInSource = new JCheckBox(); @@ -240,7 +243,7 @@ SettingsHandler.setShowSponsors(showSponsors.isSelected()); SettingsHandler.setLoadURLs(loadURL.isSelected()); SettingsHandler.setAllowOverride(allowOverride.isSelected()); - SettingsHandler.setUseAdvancedSourceSelect(useAdvancedSourceSelect.isSelected()); + UIPropertyContext.getInstance().setBoolean(SOURCE_USE_BASIC_KEY, !useAdvancedSourceSelect.isSelected()); switch (sourceOptions.getSelectedIndex()) { @@ -290,7 +293,7 @@ showSponsors.setSelected(SettingsHandler.showSponsors()); loadURL.setSelected(SettingsHandler.isLoadURLs()); allowOverride.setSelected(SettingsHandler.isAllowOverride()); - useAdvancedSourceSelect.setSelected(SettingsHandler.useAdvancedSourceSelect()); + useAdvancedSourceSelect.setSelected(!UIPropertyContext.getInstance().getBoolean(SOURCE_USE_BASIC_KEY)); switch (Globals.getSourceDisplay()) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-02-29 02:35:40 UTC (rev 16348) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-02-29 08:34:32 UTC (rev 16349) @@ -45,6 +45,8 @@ import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; +import org.apache.commons.lang.StringUtils; + import pcgen.core.facade.CampaignFacade; import pcgen.core.facade.GameModeFacade; import pcgen.core.facade.SourceSelectionFacade; @@ -81,6 +83,11 @@ implements ListSelectionListener, ListListener<CampaignFacade>, ActionListener { + private static final UIPropertyContext context = UIPropertyContext + .createContext("advancedSourceSelectionPanel"); //$NON-NLS-1$ + private static final String PROP_SELECTED_GAME = "selectedGame"; //$NON-NLS-1$ + private static final String PROP_SELECTED_SOURCES = "selectedSources."; //$NON-NLS-1$ + private final FilteredTreeViewTable availableTable; private final FilteredTreeViewTable selectedTable; private SourceTreeViewModel availTreeViewModel; @@ -194,11 +201,61 @@ private void initDefaults() { - if (gameModeList.getModel().getSize() > 0) + String defaultGame = + context.initProperty(PROP_SELECTED_GAME, ""); + GameModeFacade gameMode = null; + if (StringUtils.isNotEmpty(defaultGame)) { + for (int i = 0; i < gameModeList.getModel().getSize(); i++) + { + GameModeFacade game = + (GameModeFacade) gameModeList.getModel() + .getElementAt(i); + if (defaultGame.equals(game.toString())) + { + gameModeList.setSelectedIndex(i); + gameMode = game; + } + } + } + if (gameMode == null && gameModeList.getModel().getSize() > 0) + { gameModeList.setSelectedIndex(0); + gameMode = (GameModeFacade) gameModeList.getSelectedItem(); } + if (gameMode != null) + { + selectDefaultSources(gameMode); + } } + + /** + * Add the user's previously selected sources for this gamemode + * to the selected list. + * @param gameMode The game mode being selected + */ + private void selectDefaultSources(GameModeFacade gameMode) + { + if (gameMode == null) + { + return; + } + String defaultSelectedSources = + context.initProperty( + PROP_SELECTED_SOURCES + gameMode.toString(), ""); //$NON-NLS-1$ + String[] sourceNames = defaultSelectedSources.split("\\|"); //$NON-NLS-1$ + for (String name : sourceNames) + { + for (CampaignFacade camp : FacadeFactory + .getSupportedCampaigns(gameMode)) + { + if (name.equals(camp.toString())) + { + selectedCampaigns.addElement(camp); + } + } + } + } public GameModeFacade getSelectedGameMode() { @@ -219,8 +276,10 @@ private void setSelectedGameMode(GameModeFacade elementAt) { this.gameMode = elementAt; + context.setProperty(PROP_SELECTED_GAME, gameMode.toString()); selectedCampaigns.clearContents(); availTreeViewModel.setGameModel(elementAt); + selectDefaultSources(gameMode); } private void setSelectedCampaign(CampaignFacade source) @@ -306,6 +365,16 @@ availableTable.updateDisplay(); } + /** + * Save the selected sources for the current game mode so they can be + * restored next time we start. + */ + void rememberSelectedSources() + { + String sources = StringUtils.join(getSelectedCampaigns(), "|"); //$NON-NLS-1$ + context.setProperty(PROP_SELECTED_SOURCES+gameMode.toString(), sources); + } + private class AddAction extends AbstractAction { @@ -333,6 +402,7 @@ selectedCampaigns.removeElement(camp); } } + rememberSelectedSources(); } } } @@ -356,6 +426,7 @@ { selectedCampaigns.removeElement(camp); } + rememberSelectedSources(); } } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-02-29 02:35:40 UTC (rev 16348) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-02-29 08:34:32 UTC (rev 16349) @@ -163,8 +163,9 @@ private void initDefaults() { + boolean useBasic = context.initBoolean("useBasic", true); //$NON-NLS-1$ SourceSelectionFacade selection = basicPanel.getSourceSelection(); - if (selection != null) + if (selection != null && useBasic) { deleteButton.setEnabled(selection.isModifiable()); advancedPanel.setSourceSelection(selection); @@ -174,7 +175,6 @@ deleteButton.setEnabled(false); } buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS)); - boolean useBasic = context.initBoolean("useBasic", true); if (useBasic) { setBasicButtons(); @@ -183,6 +183,7 @@ else { setAdvancedButtons(); + tabs.setSelectedIndex(1); } } @@ -456,6 +457,7 @@ private class QuickSourceSelectionPanel extends JPanel implements ListSelectionListener { + private static final String DEFAULT_SOURCE = "Pathfinder RPG for Players"; //$NON-NLS-1$ private JList sourceList; public QuickSourceSelectionPanel() @@ -503,7 +505,7 @@ { final ListModel sortedModel = sourceList.getModel(); String defaultSelectedSource = - context.initProperty(PROP_SELECTED_SOURCE, sortedModel.getSize() == 0 ? null : sortedModel.getElementAt(0).toString()); + context.initProperty(PROP_SELECTED_SOURCE, DEFAULT_SOURCE); int index = Collections.binarySearch(new AbstractList<Object>() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-29 20:58:53
|
Revision: 16361 http://pcgen.svn.sourceforge.net/pcgen/?rev=16361&view=rev Author: jdempsey Date: 2012-02-29 20:58:46 +0000 (Wed, 29 Feb 2012) Log Message: ----------- Allow ESC to close most dialogs Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -58,6 +58,7 @@ import pcgen.gui2.PCGenFrame; import pcgen.gui2.tools.BrowserLauncher; import pcgen.gui2.tools.Icons; +import pcgen.gui2.tools.Utility; import pcgen.gui2.util.GridBoxLayout; import pcgen.gui2.util.JLabelPane; import pcgen.system.LanguageBundle; @@ -79,6 +80,8 @@ pack(); setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); setLocationRelativeTo(frame); + + Utility.installEscapeCloseOperation(this); } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -52,6 +52,7 @@ import pcgen.core.facade.ReferenceFacade; import pcgen.core.facade.event.ReferenceEvent; import pcgen.core.facade.event.ReferenceListener; +import pcgen.gui2.tools.Utility; import pcgen.gui2.util.table.IntegerEditor; /** @@ -163,6 +164,8 @@ } }); + + Utility.installEscapeCloseOperation(this); } public void actionPerformed(ActionEvent e) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -44,6 +44,7 @@ import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; import pcgen.gui2.PCGenFrame; +import pcgen.gui2.tools.Utility; import pcgen.system.LoggingRecorder; import pcgen.util.Logging; @@ -67,6 +68,8 @@ initComponents(); pack(); setSize(700, 500); + + Utility.installEscapeCloseOperation(this); } private void initComponents() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -71,6 +71,7 @@ import pcgen.core.facade.PartyFacade; import pcgen.gui2.PCGenFrame; import pcgen.gui2.UIPropertyContext; +import pcgen.gui2.tools.Utility; import pcgen.gui2.util.FacadeComboBoxModel; import pcgen.system.BatchExporter; import pcgen.system.CharacterManager; @@ -130,6 +131,8 @@ initComponents(); initLayout(); fileSearcher.execute(); + + Utility.installEscapeCloseOperation(this); } @Override Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -166,6 +166,8 @@ settingsTree.setSelectionRow(1); pack(); + + Utility.installEscapeCloseOperation(this); } public static void show(JFrame frame) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -80,6 +80,7 @@ import pcgen.core.facade.CharacterFacade; import pcgen.gui2.PCGenFrame; import pcgen.gui2.tools.Icons; +import pcgen.gui2.tools.Utility; import pcgen.io.ExportHandler; import pcgen.system.ConfigurationSettings; import pcgen.util.FOPHandler; @@ -203,6 +204,8 @@ cancelButton.addActionListener(this); enableEditGroup(false); + + Utility.installEscapeCloseOperation(this); } private void enableEditGroup(boolean enable) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -30,6 +30,7 @@ import pcgen.core.SettingsHandler; import pcgen.gui2.doomsdaybook.NameGenPanel; +import pcgen.gui2.tools.Utility; /** * The Class <code>RandomNameDialog</code> is a dialog in which the user can @@ -61,6 +62,8 @@ pack(); setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); setLocationRelativeTo(frame); + + Utility.installEscapeCloseOperation(this); } /** Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -34,6 +34,7 @@ import pcgen.core.SettingsHandler; import pcgen.gui2.prefs.PCGenPrefsPanel; +import pcgen.gui2.tools.Utility; import pcgen.system.LanguageBundle; /** @@ -73,6 +74,8 @@ prefsPanel.applyOptionValuesToControls(); pack(); + + Utility.installEscapeCloseOperation(this); } private void initComponents() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -57,6 +57,7 @@ import pcgen.gui2.UIPropertyContext; import pcgen.gui2.tools.Hyperactive; import pcgen.gui2.tools.Icons; +import pcgen.gui2.tools.Utility; import pcgen.gui2.util.JLabelPane; import pcgen.system.ConfigurationSettings; import pcgen.system.LanguageBundle; @@ -97,6 +98,8 @@ loadTips(); pack(); + + Utility.installEscapeCloseOperation(this); lastNumber = propertyContext.initInt("lastTip", -1); showNextTip(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -25,7 +25,6 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -66,6 +66,7 @@ import pcgen.gui2.PCGenFrame; import pcgen.gui2.UIPropertyContext; import pcgen.gui2.filter.FilteredListFacadeTableModel; +import pcgen.gui2.tools.Utility; import pcgen.gui2.util.JTableEx; import pcgen.gui2.util.SortedListModel; import pcgen.gui2.util.table.TableUtils; @@ -159,6 +160,8 @@ buttons.add(cancelButton); buttons.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); pane.add(buttons, BorderLayout.SOUTH); + + Utility.installEscapeCloseOperation(this); } private void initDefaults() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java 2012-02-29 20:56:13 UTC (rev 16360) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java 2012-02-29 20:58:46 UTC (rev 16361) @@ -27,12 +27,21 @@ import java.awt.GraphicsEnvironment; import java.awt.GridBagConstraints; import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; + +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JFrame; +import javax.swing.JRootPane; +import javax.swing.KeyStroke; import pcgen.system.PCGenSettings; @@ -45,6 +54,13 @@ public final class Utility { + private static final KeyStroke escapeStroke = KeyStroke.getKeyStroke( + KeyEvent.VK_ESCAPE, 0); + + /** An action map key for the user requesting a dialog close via the ESC key. */ + public static final String dispatchWindowClosingActionMapKey = + "pcgen:WINDOW_CLOSING"; //$NON-NLS-1$ + /** * Set up GridBag Constraints. * @param gbc The gridbagconstraints to set up @@ -251,4 +267,25 @@ } + /** + * Add a keyboard shortcut to allow ESC to close the dialog. + * @param dialog The dialog to be updated. + */ + public static void installEscapeCloseOperation(final JDialog dialog) + { + Action dispatchClosing = new AbstractAction() + { + public void actionPerformed(ActionEvent event) + { + dialog.dispatchEvent(new WindowEvent(dialog, + WindowEvent.WINDOW_CLOSING)); + } + }; + JRootPane root = dialog.getRootPane(); + root.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(escapeStroke, + dispatchWindowClosingActionMapKey); + root.getActionMap().put(dispatchWindowClosingActionMapKey, + dispatchClosing); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2012-03-01 22:29:02
|
Revision: 16400 http://pcgen.svn.sourceforge.net/pcgen/?rev=16400&view=rev Author: thpr Date: 2012-03-01 22:28:55 +0000 (Thu, 01 Mar 2012) Log Message: ----------- Add @Override as appropriate Cleans up warnings by adding appropriate Generics items Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/Main.java Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/NameGenPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/XMLFilter.java Trunk/pcgen/code/src/java/pcgen/gui2/plaf/FakeWindowsLookAndFeel.java Trunk/pcgen/code/src/java/pcgen/gui2/plaf/LookAndFeelManager.java Trunk/pcgen/code/src/java/pcgen/gui2/plaf/MacGUIHandler.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/FlippingSplitPane.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/Hyperactive.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/PCGenAction.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/SpinningTabbedPane.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/Main.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/Main.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/Main.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -58,6 +58,7 @@ setTitle("The Doomsday Book Name Generator"); addWindowListener(new java.awt.event.WindowAdapter() { + @Override public void windowClosing(java.awt.event.WindowEvent evt) { exitForm(evt); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/NameGenPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/NameGenPanel.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/NameGenPanel.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -370,6 +370,7 @@ NameButton nb = new NameButton(ele); nb.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { NameButtonActionPerformed(evt); @@ -464,6 +465,7 @@ cbCatalog.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { cbCatalogActionPerformed(evt); @@ -481,6 +483,7 @@ cbCategory.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { cbCategoryActionPerformed(evt); @@ -500,6 +503,7 @@ generateButton.setText("Generate"); generateButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { generateButtonActionPerformed(evt); @@ -517,6 +521,7 @@ cbSex.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { cbSexActionPerformed(evt); @@ -543,6 +548,7 @@ cbStructure.setEnabled(false); cbStructure.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { cbStructureActionPerformed(evt); @@ -554,6 +560,7 @@ chkStructure.setText("Random"); chkStructure.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { chkStructureActionPerformed(evt); @@ -638,6 +645,7 @@ } jButton1.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { jButton1ActionPerformed(evt); @@ -1118,6 +1126,7 @@ /** * {@inheritDoc} */ + @Override public InputSource resolveEntity(String publicId, String systemId) { if (systemId.endsWith("generator.dtd")) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/XMLFilter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/XMLFilter.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/XMLFilter.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -24,6 +24,7 @@ * @param str * @return true if filter matches *.xml */ + @Override public boolean accept(java.io.File file, String str) { return str.matches(".*\\.xml$"); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/plaf/FakeWindowsLookAndFeel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/plaf/FakeWindowsLookAndFeel.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/plaf/FakeWindowsLookAndFeel.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -44,11 +44,13 @@ * * @return boolean <code>true</code> always */ + @Override public boolean isSupportedLookAndFeel() { return true; } + @Override public void initialize() { // This hack convinces JDK 1.4 to use the Win2K UI @@ -60,6 +62,7 @@ System.setProperty("os.version", osVersion); } + @Override protected void initComponentDefaults(UIDefaults table) { super.initComponentDefaults(table); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/plaf/LookAndFeelManager.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/plaf/LookAndFeelManager.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/plaf/LookAndFeelManager.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -72,6 +72,7 @@ Comparator<LookAndFeelInfo> lafcomp = new Comparator<LookAndFeelInfo>() { + @Override public int compare(LookAndFeelInfo o1, LookAndFeelInfo o2) { //System laf goes first @@ -338,6 +339,7 @@ return className; } + @Override public void actionPerformed(ActionEvent e) { //This is the default operation Modified: Trunk/pcgen/code/src/java/pcgen/gui2/plaf/MacGUIHandler.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/plaf/MacGUIHandler.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/plaf/MacGUIHandler.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -61,6 +61,7 @@ /** * Called when user select "About" from the application menu. */ + @Override public void handleAbout(ApplicationEvent ae) { PCGenUIManager.displayAboutDialog(); @@ -70,6 +71,7 @@ /** * Called when user select "Preferences" from the application menu. */ + @Override public void handlePreferences(ApplicationEvent ae) { PCGenUIManager.displayPreferencesDialog(); @@ -79,6 +81,7 @@ /** * Called when user select "Quit" from the application menu. */ + @Override public void handleQuit(ApplicationEvent ae) { ae.setHandled(false); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -293,6 +293,7 @@ source, selectedCampaigns.getContents())); } + @Override public void valueChanged(ListSelectionEvent e) { if (!e.getValueIsAdjusting()) @@ -390,6 +391,7 @@ availableTable.addActionListener(this); } + @Override public void actionPerformed(ActionEvent e) { List<CampaignFacade> list = availableTable.getSelectedData(); @@ -422,6 +424,7 @@ selectedTable.addActionListener(this); } + @Override public void actionPerformed(ActionEvent e) { List<CampaignFacade> list = selectedTable.getSelectedData(); @@ -444,6 +447,7 @@ super(LanguageBundle.getString("in_src_unloadAll")); //$NON-NLS-1$ } + @Override public void actionPerformed(ActionEvent e) { frame.unloadSources(); @@ -483,26 +487,31 @@ new DefaultDataViewColumn("in_src_loaded", String.class, false)); } + @Override public ListFacade<? extends TreeView<CampaignFacade>> getTreeViews() { return views; } + @Override public int getDefaultTreeViewIndex() { return isAvailModel ? 2 : 0; } + @Override public DataView<CampaignFacade> getDataView() { return this; } + @Override public ListFacade<CampaignFacade> getDataModel() { return model; } + @Override public List<?> getData(CampaignFacade obj) { SourceSelectionFacade sourceFacade = @@ -517,6 +526,7 @@ .getString("in_no")); } + @Override public List<? extends DataViewColumn> getDataColumns() { return columns; @@ -533,16 +543,19 @@ baseModel.addListListener(this); } + @Override public void elementAdded(ListEvent<CampaignFacade> e) { model.addElement(e.getIndex(), e.getElement()); } + @Override public void elementRemoved(ListEvent<CampaignFacade> e) { model.removeElement(e.getIndex()); } + @Override public void elementsChanged(ListEvent<CampaignFacade> e) { model.setContents(ListFacades.wrap(baseModel)); @@ -564,11 +577,13 @@ this.name = LanguageBundle.getString(name); } + @Override public String getViewName() { return name; } + @Override public List<TreeViewPath<CampaignFacade>> getPaths(CampaignFacade pobj) { String publisher = pobj.getPublisher(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -200,6 +200,7 @@ loadButton.setEnabled(enable); } + @Override public void valueChanged(ListSelectionEvent e) { if (!e.getValueIsAdjusting()) @@ -226,6 +227,7 @@ buttonPanel.revalidate(); } + @Override public void stateChanged(ChangeEvent e) { if (tabs.getSelectedComponent() == basicPanel) @@ -238,6 +240,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { String command = e.getActionCommand(); @@ -251,6 +254,7 @@ sourcesList.addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { nameField.setText(sourcesList.getSelectedValue().toString()); @@ -410,6 +414,7 @@ } } + @Override public int getColumnCount() { return 1; @@ -541,6 +546,7 @@ return (SourceSelectionFacade) sourceList.getSelectedValue(); } + @Override public void valueChanged(ListSelectionEvent e) { SourceSelectionFacade selection = getSourceSelection(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/FlippingSplitPane.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/FlippingSplitPane.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/FlippingSplitPane.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -489,6 +489,7 @@ /** * Action for Lock/Unlock item in popup menu. */ + @Override public void actionPerformed(ActionEvent e) { setLocked(!locked); @@ -553,6 +554,7 @@ /** * Action for Center item in popup menu. */ + @Override public void actionPerformed(ActionEvent e) { centerDividerLocations(); @@ -578,6 +580,7 @@ /** * Action for Continuous layout item in options menu. */ + @Override public void actionPerformed(ActionEvent e) { setContinuousLayout(!isContinuousLayout()); @@ -604,6 +607,7 @@ /** * Action for Flip item in popup menu. */ + @Override public void actionPerformed(ActionEvent e) { flipOrientation(); @@ -630,6 +634,7 @@ /** * Action for One touch expandable item in options menu. */ + @Override public void actionPerformed(ActionEvent e) { setOneTouchExpandable(!isOneTouchExpandable()); @@ -723,6 +728,7 @@ /** * Action for Reset item in popup menu. */ + @Override public void actionPerformed(ActionEvent e) { resetToPreferredSizes(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/Hyperactive.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/Hyperactive.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/Hyperactive.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -39,6 +39,7 @@ public final class Hyperactive implements HyperlinkListener { + @Override public void hyperlinkUpdate(HyperlinkEvent e) { if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/PCGenAction.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/PCGenAction.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/PCGenAction.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -122,6 +122,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/SpinningTabbedPane.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/SpinningTabbedPane.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/SpinningTabbedPane.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -540,46 +540,55 @@ private final class DefaultPopupMenuPolicy implements PopupMenuPolicy { + @Override public boolean canClose(int index) { return true; } + @Override public boolean canGroup(int index) { return true; } + @Override public boolean canLock(int index) { return true; } + @Override public boolean canMove(int index) { return true; } + @Override public boolean canNew(int index) { return true; } + @Override public boolean canRename(int index) { return true; } + @Override public boolean hasGroupMenu(int index, MouseEvent e) { return true; } + @Override public boolean hasMoveMenu(int index, MouseEvent e) { return true; } + @Override public boolean hasPlaceMenu(int index, MouseEvent e) { return true; @@ -597,6 +606,7 @@ LanguageBundle.getMnemonic("in_mn_close")); } + @Override public void actionPerformed(ActionEvent e) { removeTabAt(getIndex()); @@ -681,6 +691,7 @@ this.placement = placement; } + @Override public void actionPerformed(ActionEvent e) { spinTabsAt(getIndex(), placement); @@ -698,6 +709,7 @@ Utilities.LOCK_ICON, LanguageBundle.getMnemonic("in_mn_lock")); } + @Override public void actionPerformed(ActionEvent e) { lockTabAt(getIndex()); @@ -717,6 +729,7 @@ this.placement = placement; } + @Override public void actionPerformed(ActionEvent e) { final int[] indices = getMovableTabIndices(); @@ -901,6 +914,7 @@ LanguageBundle.getMnemonic("in_mn_new")); } + @Override public void actionPerformed(ActionEvent e) { addNewTab(); @@ -940,6 +954,7 @@ this.placement = placement; } + @Override public void actionPerformed(ActionEvent e) { pane.setTabPlacement(placement); @@ -1108,6 +1123,7 @@ this.evt = e; } + @Override public void actionPerformed(ActionEvent e) { int x = evt.getX(); @@ -1179,6 +1195,7 @@ this.popupMenu = popupMenu; } + @Override public void actionPerformed(ActionEvent e) { SpinningTabbedPane.this.setTitleAt(anIndex, textField.getText()); @@ -1196,6 +1213,7 @@ UNGROUP_CHILD_OFFSET); } + @Override public void actionPerformed(ActionEvent e) { SpinningTabbedPane pane = (SpinningTabbedPane) getComponentAt(getIndex()); @@ -1218,6 +1236,7 @@ } + @Override public void actionPerformed(ActionEvent e) { final int index = parent.indexOfComponent(SpinningTabbedPane.this); @@ -1239,6 +1258,7 @@ UNGROUP_SINGLE_OFFSET); } + @Override public void actionPerformed(ActionEvent e) { unspinTabAt(getIndex()); @@ -1258,6 +1278,7 @@ LanguageBundle.getMnemonic("in_mn_unlock")); } + @Override public void actionPerformed(ActionEvent e) { unlockTabAt(getIndex()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java 2012-03-01 22:28:38 UTC (rev 16399) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java 2012-03-01 22:28:55 UTC (rev 16400) @@ -275,6 +275,7 @@ { Action dispatchClosing = new AbstractAction() { + @Override public void actionPerformed(ActionEvent event) { dialog.dispatchEvent(new WindowEvent(dialog, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2012-03-01 22:29:59
|
Revision: 16402 http://pcgen.svn.sourceforge.net/pcgen/?rev=16402&view=rev Author: thpr Date: 2012-03-01 22:29:52 +0000 (Thu, 01 Mar 2012) Log Message: ----------- Add @Override as appropriate Cleans up warnings by adding appropriate Generics items Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetFrame.java Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/OptionsPathDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetFrame.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetFrame.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetFrame.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -139,6 +139,7 @@ character.getEquipmentSetRef().removeReferenceListener(this); } + @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) @@ -147,6 +148,7 @@ } } + @Override public void referenceChanged(ReferenceEvent<EquipmentSetFacade> e) { setSelectedItem(e.getNewReference()); @@ -175,6 +177,7 @@ this); } + @Override public void itemStateChanged(ItemEvent e) { TempBonusFacade bonus = (TempBonusFacade) e.getItemSelectable().getSelectedObjects()[0]; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/csheet/CharacterSheetPanel.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -109,7 +109,7 @@ private ExportHandler handler = null; private CharacterFacade character = null; private ExecutorService refreshService = null; - private FutureTask refreshTask = null; + private FutureTask<Document> refreshTask = null; private CssColor cssColor = CssColor.BLUE; public CharacterSheetPanel() @@ -120,6 +120,7 @@ refreshService = Executors.newSingleThreadExecutor(new ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread thread = new Thread(r, "Charater-Sheet-Refresher-Thread"); @@ -131,6 +132,7 @@ }); } + @Override public void setCharacter(CharacterFacade character) { this.character = character; @@ -173,6 +175,7 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { Document doc = null; @@ -210,6 +213,7 @@ private class DocumentConstructor implements Callable<Document> { + @Override public Document call() throws Exception { StringWriter out = new StringWriter(); @@ -236,6 +240,7 @@ private boolean interupted = false; private PipedReader reader = new PipedReader(); + @Override public void run() { BufferedWriter bufWriter = null; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -251,6 +251,7 @@ wwwSite.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try @@ -272,6 +273,7 @@ mailingList.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/CharacterHPDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -128,6 +128,7 @@ final ReferenceListener<Integer> hpListener = new ReferenceListener<Integer>() { + @Override public void referenceChanged(ReferenceEvent<Integer> e) { totalHp.setText(e.getNewReference().toString()); @@ -168,6 +169,7 @@ Utility.installEscapeCloseOperation(this); } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("Reroll")) @@ -192,11 +194,13 @@ levels.addHitPointListener(this); } + @Override public int getRowCount() { return levels.getSize(); } + @Override public int getColumnCount() { return 7; @@ -254,6 +258,7 @@ } } + @Override public Object getValueAt(int rowIndex, int columnIndex) { CharacterLevelFacade level = levels.getElementAt(rowIndex); @@ -284,6 +289,7 @@ levels.setHPRolled(level, (Integer) aValue); } + @Override public void hitPointsChanged(CharacterLevelEvent e) { fireTableRowsUpdated(e.getBaseLevelIndex(), e.getBaseLevelIndex()); @@ -302,6 +308,7 @@ button.setText("Reroll"); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { return button; @@ -322,17 +329,20 @@ button.addActionListener(this); } + @Override public Object getCellEditorValue() { return null; } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { editingRow = row; return button; } + @Override public void actionPerformed(ActionEvent e) { CharacterLevelFacade level = levels.getElementAt(editingRow); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -118,6 +118,7 @@ addWindowListener(new WindowAdapter() { + @Override public void windowClosed(WindowEvent e) { //detach listeners from the chooser @@ -185,11 +186,13 @@ pane.add(bottomPane, BorderLayout.SOUTH); } + @Override public void referenceChanged(ReferenceEvent<Integer> e) { remainingLabel.setText(e.getNewReference().toString()); } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("ADD") || e.getSource() == availTable) @@ -235,41 +238,49 @@ DataView<InfoFacade>, TreeView<InfoFacade> { + @Override public ListFacade<? extends TreeView<InfoFacade>> getTreeViews() { return new DefaultListFacade<TreeView<InfoFacade>>(Collections.singletonList(this)); } + @Override public int getDefaultTreeViewIndex() { return 0; } + @Override public DataView<InfoFacade> getDataView() { return this; } + @Override public ListFacade<InfoFacade> getDataModel() { return this; } + @Override public List<?> getData(InfoFacade obj) { return Collections.emptyList(); } + @Override public List<? extends DataViewColumn> getDataColumns() { return Collections.emptyList(); } + @Override public String getViewName() { return chooser.getAvailableTableTitle(); } + @Override public List<TreeViewPath<InfoFacade>> getPaths(InfoFacade pobj) { List<TreeViewPath<InfoFacade>> paths = new ArrayList<TreeViewPath<InfoFacade>>(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -121,6 +121,7 @@ { } + @Override public void run() { debuggingText.setText(LoggingRecorder.getLogs()); @@ -170,7 +171,7 @@ protected void setValue(Object value) { setHorizontalAlignment(JLabel.RIGHT); - setText(format.format((Long) value)); + setText(format.format(value)); } }); @@ -185,6 +186,7 @@ timer.stop(); } + @Override public void actionPerformed(ActionEvent e) { if ("COLLECT".equals(e.getActionCommand())) @@ -204,11 +206,13 @@ private static long megaByte = 1024 * 1024; + @Override public int getRowCount() { return 2; } + @Override public int getColumnCount() { return 5; @@ -247,6 +251,7 @@ } } + @Override public Object getValueAt(int rowIndex, int columnIndex) { MemoryUsage usage; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -230,11 +230,13 @@ pack(); } + @Override public void valueChanged(ListSelectionEvent e) { exportButton.setEnabled(fileList.getSelectedIndex() != -1); } + @Override public void actionPerformed(ActionEvent e) { if (PARTY_COMMAND.equals(e.getActionCommand())) @@ -494,7 +496,7 @@ if (allTemplates != null) { SheetFilter sheetFilter = (SheetFilter) exportBox.getSelectedItem(); - IOFileFilter ioFilter = FileFilterUtils.asFileFilter((FilenameFilter) sheetFilter); + IOFileFilter ioFilter = FileFilterUtils.asFileFilter(sheetFilter); IOFileFilter prefixFilter; String defaultSheet = null; if (partyBox.isSelected()) @@ -650,11 +652,13 @@ this.description = description; } + @Override public String toString() { return description; } + @Override public boolean accept(File dir, String name) { return dir.getName().equalsIgnoreCase(dirFilter) && ! name.endsWith("~"); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -67,7 +67,7 @@ { private final LanguageChooserFacade chooser; - private final JTreeViewTable availTable; + private final JTreeViewTable<LanguageFacade> availTable; private final JLabel remainingLabel; private final LangTreeViewModel treeViewModel; private final FacadeListModel<LanguageFacade> listModel; @@ -77,7 +77,7 @@ { super(frame, true); this.chooser = chooser; - this.availTable = new JTreeViewTable(); + this.availTable = new JTreeViewTable<LanguageFacade>(); this.remainingLabel = new JLabel(); this.treeViewModel = new LangTreeViewModel(); this.list = new JListEx(); @@ -97,6 +97,7 @@ addWindowListener(new WindowAdapter() { + @Override public void windowClosed(WindowEvent e) { //detach listeners from the chooser @@ -164,11 +165,13 @@ pane.add(bottomPane, BorderLayout.SOUTH); } + @Override public void referenceChanged(ReferenceEvent<Integer> e) { remainingLabel.setText(e.getNewReference().toString()); } + @Override public void actionPerformed(ActionEvent e) { if (e.getActionCommand().equals("ADD") || e.getSource() == availTable) @@ -204,47 +207,55 @@ DataView<LanguageFacade>, TreeView<LanguageFacade> { + @Override public ListFacade<? extends TreeView<LanguageFacade>> getTreeViews() { return new DefaultListFacade<TreeView<LanguageFacade>>(Collections.singletonList(this)); } + @Override public int getDefaultTreeViewIndex() { return 0; } + @Override public DataView<LanguageFacade> getDataView() { return this; } + @Override public ListFacade<LanguageFacade> getDataModel() { return this; } + @Override public List<?> getData(LanguageFacade obj) { return Collections.emptyList(); } + @Override public List<? extends DataViewColumn> getDataColumns() { return Collections.emptyList(); } + @Override public String getViewName() { return "Available Languages"; } + @Override public List<TreeViewPath<LanguageFacade>> getPaths(LanguageFacade pobj) { List<TreeViewPath<LanguageFacade>> paths = new ArrayList<TreeViewPath<LanguageFacade>>(); for(String type : pobj.getTypes()) { - paths.add(new TreeViewPath(pobj, type)); + paths.add(new TreeViewPath<LanguageFacade>(pobj, type)); } return paths; } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/OptionsPathDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/OptionsPathDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/OptionsPathDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -163,6 +163,7 @@ private class ActionHandler implements ActionListener { + @Override public void actionPerformed(ActionEvent e) { String command = e.getActionCommand(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PreferencesDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -391,6 +391,7 @@ // Add the listener which switches panels when a node of the tree is selected settingsTree.addTreeSelectionListener(new TreeSelectionListener() { + @Override public void valueChanged(TreeSelectionEvent e) { DefaultMutableTreeNode node = @@ -423,6 +424,7 @@ controlPanel.add(okButton); okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { okButtonActionPerformed(); @@ -435,6 +437,7 @@ controlPanel.add(cancelButton); cancelButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { cancelButtonActionPerformed(); @@ -508,6 +511,7 @@ initPreferences(); } + @Override public void applyPreferences() { for ( String key : pluginMap.keySet() ) { @@ -515,6 +519,7 @@ } } + @Override public void initPreferences() { for ( String key : pluginMap.keySet() ) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/PrintPreviewDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -179,7 +179,7 @@ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { NumberFormat format = NumberFormat.getPercentInstance(); - value = format.format((Double) value); + value = format.format(value); return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); } @@ -217,6 +217,7 @@ printButton.setEnabled(enable); } + @Override public void actionPerformed(ActionEvent e) { if (SHEET_COMMAND.equals(e.getActionCommand())) @@ -328,21 +329,25 @@ setBorder(oldEditor.getBorder()); } + @Override public Component getEditorComponent() { return this; } + @Override public void setItem(Object anObject) { setValue(anObject); } + @Override public Object getItem() { return getValue(); } + @Override public void propertyChange(PropertyChangeEvent evt) { fireActionPerformed(); @@ -586,6 +591,7 @@ private class SheetLoader extends SwingWorker<Object[], Object> implements FilenameFilter { + @Override public boolean accept(File dir, String name) { return dir.getName().equalsIgnoreCase("pdf"); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/SinglePrefDialog.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -88,6 +88,7 @@ controlPanel.add(okButton); okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { okButtonActionPerformed(); @@ -100,6 +101,7 @@ controlPanel.add(cancelButton); cancelButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { cancelButtonActionPerformed(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java 2012-03-01 22:29:39 UTC (rev 16401) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/TipOfTheDay.java 2012-03-01 22:29:52 UTC (rev 16402) @@ -110,6 +110,7 @@ return propertyContext.getBoolean("showTipOfTheDay", true); } + @Override public void actionPerformed(ActionEvent e) { if (NEXT.equals(e.getActionCommand())) @@ -197,6 +198,7 @@ addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { quit(); @@ -206,6 +208,7 @@ addKeyListener(new KeyAdapter() { + @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ESCAPE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2012-03-01 22:30:19
|
Revision: 16403 http://pcgen.svn.sourceforge.net/pcgen/?rev=16403&view=rev Author: thpr Date: 2012-03-01 22:30:12 +0000 (Thu, 01 Mar 2012) Log Message: ----------- Add @Override as appropriate Cleans up warnings by adding appropriate Generics items Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/CharacterTabs.java Trunk/pcgen/code/src/java/pcgen/gui2/InfoGuidePane.java Trunk/pcgen/code/src/java/pcgen/gui2/PCGenActionMap.java Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java Trunk/pcgen/code/src/java/pcgen/gui2/PCGenMenuBar.java Trunk/pcgen/code/src/java/pcgen/gui2/PCGenStatusBar.java Trunk/pcgen/code/src/java/pcgen/gui2/PCGenUIManager.java Trunk/pcgen/code/src/java/pcgen/gui2/PcgFileFilter.java Trunk/pcgen/code/src/java/pcgen/gui2/PcpFileFilter.java Trunk/pcgen/code/src/java/pcgen/gui2/SplashScreen.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/CharacterTabs.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/CharacterTabs.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/CharacterTabs.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -111,11 +111,13 @@ listenerMap.remove(character).removeListeners(); } + @Override public void referenceChanged(ReferenceEvent<CharacterFacade> e) { setSelectedIndex(characters.indexOf(e.getNewReference())); } + @Override public void stateChanged(ChangeEvent e) { int index = getSelectedIndex(); @@ -131,16 +133,19 @@ } } + @Override public void elementAdded(ListEvent<CharacterFacade> e) { addCharacter(e.getElement()); } + @Override public void elementRemoved(ListEvent<CharacterFacade> e) { removeCharacter(e.getElement()); } + @Override public void elementsChanged(ListEvent<CharacterFacade> e) { removeAll(); @@ -222,6 +227,7 @@ nameRef.removeReferenceListener(this); } + @Override public void referenceChanged(ReferenceEvent<String> e) { if (e.getSource() == nameRef) @@ -244,6 +250,7 @@ } } + @Override public void actionPerformed(ActionEvent e) { frame.closeCharacter(character); @@ -254,11 +261,13 @@ private class PopupListener extends MouseAdapter { + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/InfoGuidePane.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/InfoGuidePane.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/InfoGuidePane.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -30,6 +30,7 @@ import javax.swing.plaf.UIResource; import pcgen.cdom.base.Constants; import pcgen.core.facade.CampaignFacade; +import pcgen.core.facade.CharacterFacade; import pcgen.core.facade.SourceSelectionFacade; import pcgen.core.facade.event.ReferenceEvent; import pcgen.core.facade.event.ReferenceListener; @@ -104,10 +105,11 @@ private void initListeners() { - frame.getSelectedCharacterRef().addReferenceListener(new ReferenceListener() + frame.getSelectedCharacterRef().addReferenceListener(new ReferenceListener<CharacterFacade>() { - public void referenceChanged(ReferenceEvent e) + @Override + public void referenceChanged(ReferenceEvent<CharacterFacade> e) { setVisible(e.getNewReference() == null); } @@ -117,6 +119,7 @@ new ReferenceListener<SourceSelectionFacade>() { + @Override public void referenceChanged(ReferenceEvent<SourceSelectionFacade> e) { refreshDisplayedSources(e.getNewReference()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenActionMap.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenActionMap.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenActionMap.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -439,6 +439,7 @@ private class SourceListener implements ReferenceListener<Object> { + @Override public void referenceChanged(ReferenceEvent<Object> e) { setEnabled(e.getNewReference() != null); @@ -530,6 +531,7 @@ frame.saveCharacter(pc); } + @Override public void referenceChanged(ReferenceEvent<CharacterFacade> e) { CharacterFacade oldRef = e.getOldReference(); @@ -557,6 +559,7 @@ private class FileRefListener implements ReferenceListener<File> { + @Override public void referenceChanged(ReferenceEvent<File> e) { setEnabled(e.getNewReference() != null); @@ -1048,6 +1051,7 @@ private class CharacterListener implements ReferenceListener<Object> { + @Override public void referenceChanged(ReferenceEvent<Object> e) { setEnabled(e.getNewReference() != null); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenFrame.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -305,6 +305,7 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if (TipOfTheDay.showTipOfTheDay()) @@ -387,6 +388,7 @@ SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (!file.exists()) @@ -908,6 +910,7 @@ new Thread() { + @Override public void run() { try @@ -916,6 +919,7 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { CharacterManager.openCharacter(pcgFile, PCGenFrame.this, currentDataSetRef.getReference()); @@ -980,6 +984,7 @@ new Thread() { + @Override public void run() { try @@ -988,6 +993,7 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { CharacterManager.openParty(pcpFile, PCGenFrame.this, currentDataSetRef.getReference()); @@ -1145,6 +1151,7 @@ return panel; } + @Override public Boolean maybeShowWarningConfirm(String title, String message, String checkBoxText, final PropertyContext context, final String contextProp) { if (!context.getBoolean(contextProp, true)) @@ -1155,6 +1162,7 @@ checkBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { context.setBoolean(contextProp, checkBox.isSelected()); @@ -1167,33 +1175,39 @@ return ret == JOptionPane.YES_OPTION; } + @Override public boolean showWarningConfirm(String title, String message) { int ret = JOptionPane.showConfirmDialog(this, message, title, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); return ret == JOptionPane.YES_OPTION; } + @Override public void showErrorMessage(String title, String message) { JOptionPane.showMessageDialog(this, message, title, JOptionPane.ERROR_MESSAGE); } + @Override public void showInfoMessage(String title, String message) { JOptionPane.showMessageDialog(this, message, title, JOptionPane.INFORMATION_MESSAGE); } + @Override public void showWarningMessage(String title, String message) { JOptionPane.showMessageDialog(this, message, title, JOptionPane.WARNING_MESSAGE); } + @Override public boolean showWarningPrompt(String title, String message) { int ret = JOptionPane.showConfirmDialog(this, message, title, JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); return ret == JOptionPane.OK_OPTION; } + @Override public void showLevelUpInfo(CharacterFacade character, int oldLevel) { CharacterLevelsFacade levels = character.getCharacterLevelsFacade(); @@ -1403,6 +1417,7 @@ jCheckBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { context.setBoolean(PCGenSettings.OPTION_SHOW_LICENSE, jCheckBox.isSelected()); @@ -1413,6 +1428,7 @@ jClose.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { aFrame.dispose(); @@ -1464,6 +1480,7 @@ jClose.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { aFrame.dispose(); @@ -1474,6 +1491,7 @@ jCheckBox1.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { context.setBoolean(PCGenSettings.OPTION_SHOW_MATURE_ON_LOAD, jCheckBox1.isSelected()); @@ -1512,6 +1530,7 @@ jCheckBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { context.setBoolean(PCGenSettings.OPTION_SHOW_SPONSORS_ON_LOAD, jCheckBox.isSelected()); @@ -1522,6 +1541,7 @@ jClose.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { aFrame.dispose(); @@ -1618,6 +1638,7 @@ * @see pcgen.core.facade.event.ReferenceListener#referenceChanged(pcgen.core.facade.event.ReferenceEvent) */ + @Override public void referenceChanged(ReferenceEvent<File> e) { PCGenFrame.this.updateTitle(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenMenuBar.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenMenuBar.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenMenuBar.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -153,6 +153,7 @@ return menu; } + @Override public void setCharacter(CharacterFacade character) { this.character = character; @@ -206,6 +207,7 @@ return menuItem; } + @Override public void actionPerformed(ActionEvent e) { frame.loadCharacterFromFile(new File(e.getActionCommand())); @@ -243,6 +245,7 @@ return menuItem; } + @Override public void actionPerformed(ActionEvent e) { frame.loadPartyFromFile(new File(e.getActionCommand())); @@ -264,6 +267,7 @@ ref.addReferenceListener(this); } + @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) @@ -276,6 +280,7 @@ } } + @Override public void referenceChanged(ReferenceEvent<SourceSelectionFacade> e) { setSelectedItem(e.getNewReference()); @@ -291,6 +296,7 @@ super(actionMap.get(PCGenActionMap.EQUIPMENTSET_COMMAND)); } + @Override public void itemStateChanged(ItemEvent e) { throw new UnsupportedOperationException("Not supported yet."); @@ -314,6 +320,7 @@ this); } + @Override public void itemStateChanged(ItemEvent e) { TempBonusFacade bonus = (TempBonusFacade) e.getItemSelectable().getSelectedObjects()[0]; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenStatusBar.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenStatusBar.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenStatusBar.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -138,6 +138,7 @@ SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { progressBar.setVisible(true); @@ -164,6 +165,7 @@ progressBar.setVisible(false); } + @Override public void progressChanged(final PCGenTaskEvent event) { if (!dirty) @@ -172,6 +174,7 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { progressBar.getModel().setRangeProperties(task.getProgress(), 1, 0, task.getMaximum(), true); @@ -184,6 +187,7 @@ } + @Override public void errorOccurred(PCGenTaskEvent event) { errors.add(event.getErrorRecord()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PCGenUIManager.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/PCGenUIManager.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/PCGenUIManager.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -71,6 +71,7 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { pcgenFrame.startPCGenFrame(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PcgFileFilter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/PcgFileFilter.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/PcgFileFilter.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -39,6 +39,7 @@ * @return The Description * @since */ + @Override public String getDescription() { return "Pcg files only"; @@ -51,6 +52,7 @@ * @return Whether the file is accepted * @since */ + @Override public boolean accept(File f) { if (f.isDirectory()) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/PcpFileFilter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/PcpFileFilter.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/PcpFileFilter.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -38,6 +38,7 @@ * @return The Description * @since */ + @Override public String getDescription() { return "Pcp files only"; @@ -50,6 +51,7 @@ * @return Whether the file is accepted * @since */ + @Override public boolean accept(File f) { if (f.isDirectory()) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/SplashScreen.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/SplashScreen.java 2012-03-01 22:29:52 UTC (rev 16402) +++ Trunk/pcgen/code/src/java/pcgen/gui2/SplashScreen.java 2012-03-01 22:30:12 UTC (rev 16403) @@ -78,6 +78,7 @@ private boolean dirty = false; + @Override public void progressChanged(final PCGenTaskEvent event) { if (!dirty) @@ -86,6 +87,7 @@ SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { PCGenTask task = event.getSource(); @@ -99,6 +101,7 @@ } + @Override public void errorOccurred(PCGenTaskEvent event) { throw new UnsupportedOperationException("Not supported yet."); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2012-03-01 23:40:37
|
Revision: 16405 http://pcgen.svn.sourceforge.net/pcgen/?rev=16405&view=rev Author: thpr Date: 2012-03-01 23:40:29 +0000 (Thu, 01 Mar 2012) Log Message: ----------- Change constant access to Direct access per Code standards Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/CharacterTabs.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/OptionsPathDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/InfoTabbedPane.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/bio/CampaignHistoryInfoPane.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/InfoPane.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/PCGenAction.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JDynamicTable.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java Trunk/pcgen/code/src/java/pcgen/gui2/util/table/IntegerEditor.java Trunk/pcgen/code/src/java/pcgen/gui2/util/table/TableCellUtilities.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/CharacterTabs.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/CharacterTabs.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/CharacterTabs.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -37,7 +37,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JPopupMenu; -import javax.swing.JTabbedPane; +import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import org.apache.commons.lang.StringUtils; @@ -83,7 +83,7 @@ CharacterManager.getCharacters().addListListener(this); frame.getSelectedCharacterRef().addReferenceListener(this); - setTabPlacement(JTabbedPane.BOTTOM); + setTabPlacement(SwingConstants.BOTTOM); addChangeListener(this); setSharedComponent(infoTabbedPane); //Initialize popup menu Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/AboutDialog.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -48,6 +48,7 @@ import javax.swing.JTabbedPane; import javax.swing.JTextArea; import javax.swing.JTextField; +import javax.swing.WindowConstants; import javax.swing.border.BevelBorder; import javax.swing.border.Border; import javax.swing.border.EmptyBorder; @@ -78,7 +79,7 @@ getContentPane().setLayout(new BorderLayout()); getContentPane().add(new MainAbout(), BorderLayout.CENTER); pack(); - setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); setLocationRelativeTo(frame); Utility.installEscapeCloseOperation(this); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -43,6 +43,7 @@ import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.ListSelectionModel; +import javax.swing.WindowConstants; import pcgen.core.facade.ChooserFacade; import pcgen.core.facade.InfoFacade; @@ -114,7 +115,7 @@ private void initComponents() { setTitle(chooser.getName()); - setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); addWindowListener(new WindowAdapter() { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -34,11 +34,11 @@ import javax.swing.BorderFactory; import javax.swing.JButton; import javax.swing.JDialog; -import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JTextArea; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.Timer; import javax.swing.table.AbstractTableModel; @@ -170,7 +170,7 @@ @Override protected void setValue(Object value) { - setHorizontalAlignment(JLabel.RIGHT); + setHorizontalAlignment(SwingConstants.RIGHT); setText(format.format(value)); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ExportDialog.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -50,6 +50,7 @@ import javax.swing.JScrollPane; import javax.swing.ListSelectionModel; import javax.swing.SwingWorker; +import javax.swing.WindowConstants; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.filechooser.FileNameExtensionFilter; @@ -177,7 +178,7 @@ progressBar.setIndeterminate(true); setTitle("Export a PC or Party"); - setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); UIPropertyContext context = UIPropertyContext.createContext("ExportDialog"); String defaultOSType = context.getProperty(UIPropertyContext.DEFAULT_OS_TYPE); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -41,6 +41,7 @@ import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.ListSelectionModel; +import javax.swing.WindowConstants; import pcgen.core.facade.LanguageChooserFacade; import pcgen.core.facade.LanguageFacade; @@ -93,7 +94,7 @@ private void initComponents() { setTitle(chooser.getName()); - setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); addWindowListener(new WindowAdapter() { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/OptionsPathDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/OptionsPathDialog.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/OptionsPathDialog.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -34,6 +34,8 @@ import javax.swing.JRadioButton; import javax.swing.JSeparator; import javax.swing.JTextField; +import javax.swing.WindowConstants; + import org.apache.commons.lang.SystemUtils; import pcgen.system.ConfigurationSettings; import pcgen.system.ConfigurationSettings.SettingsFilesPath; @@ -75,7 +77,7 @@ { setResizable(false); setTitle("Directory for options.ini location"); - setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); getContentPane().setLayout(new java.awt.GridBagLayout()); GridBagConstraints gridBagConstraints = new GridBagConstraints(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/RandomNameDialog.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -27,6 +27,7 @@ import javax.swing.JDialog; import javax.swing.JFrame; +import javax.swing.WindowConstants; import pcgen.core.SettingsHandler; import pcgen.gui2.doomsdaybook.NameGenPanel; @@ -60,7 +61,7 @@ nameGenPanel.setGender(gender); getContentPane().add(nameGenPanel, BorderLayout.CENTER); pack(); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); setLocationRelativeTo(frame); Utility.installEscapeCloseOperation(this); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -37,6 +37,7 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JScrollPane; +import javax.swing.JSplitPane; import javax.swing.JTree; import javax.swing.SwingConstants; import javax.swing.border.EmptyBorder; @@ -121,7 +122,7 @@ private void initComponents() { - FlippingSplitPane mainPane = new FlippingSplitPane(FlippingSplitPane.VERTICAL_SPLIT); + FlippingSplitPane mainPane = new FlippingSplitPane(JSplitPane.VERTICAL_SPLIT); FlippingSplitPane topPane = new FlippingSplitPane(); topPane.setResizeWeight(0.6); JPanel panel = new JPanel(new BorderLayout()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -51,6 +51,7 @@ import javax.swing.JTextField; import javax.swing.ListModel; import javax.swing.ListSelectionModel; +import javax.swing.WindowConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; @@ -117,7 +118,7 @@ this.deleteButton = new JButton(LanguageBundle.getString("in_delete")); //$NON-NLS-1$ this.installDataButton = new JButton(LanguageBundle.getString("in_mnuSourcesInstallData")); //$NON-NLS-1$ this.saveButton = new JButton(LanguageBundle.getString("in_saveSelection")); //$NON-NLS-1$ - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); initComponents(); initDefaults(); pack(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/InfoTabbedPane.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/InfoTabbedPane.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/InfoTabbedPane.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -41,6 +41,7 @@ import javax.swing.Icon; import javax.swing.JOptionPane; import javax.swing.JTabbedPane; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -105,7 +106,7 @@ private void initComponent() { - setTabPlacement(JTabbedPane.TOP); + setTabPlacement(SwingConstants.TOP); SummaryInfoTab tab = new SummaryInfoTab(); addTab(tab); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -54,7 +54,6 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTextField; import javax.swing.JTree; import javax.swing.SwingConstants; import javax.swing.TransferHandler; @@ -321,14 +320,14 @@ wealthLabel.setEditable(false); wealthLabel.setFont(TEXT_FONT); wealthLabel.setColumns(10); - wealthLabel.setHorizontalAlignment(JTextField.RIGHT); + wealthLabel.setHorizontalAlignment(SwingConstants.RIGHT); panel.add(wealthLabel, middleGbc); panel.add(createCurrencyLabel(), rightGbc); label = new JLabel(LanguageBundle.getString("in_igFundsLabel")); label.setFont(LABEL_FONT); panel.add(label, leftGbc); - goldField.setHorizontalAlignment(JTextField.RIGHT); + goldField.setHorizontalAlignment(SwingConstants.RIGHT); goldField.setFont(TEXT_FONT); goldField.setColumns(10); goldField.setMinimumSize(new Dimension(50, goldField.getPreferredSize().height)); @@ -349,7 +348,7 @@ expmodPanel.add(fundsSubtractButton, gbc2); } panel.add(expmodPanel, leftGbc); - goldModField.setHorizontalAlignment(JTextField.RIGHT); + goldModField.setHorizontalAlignment(SwingConstants.RIGHT); goldModField.setFont(TEXT_FONT); panel.add(goldModField, middleGbc); panel.add(createCurrencyLabel(), rightGbc); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -42,7 +42,6 @@ import javax.swing.JSpinner.DefaultEditor; import javax.swing.JSplitPane; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.ListSelectionModel; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; @@ -460,7 +459,7 @@ JFormattedTextField ftf = editor.getTextField(); ftf.setEditable(true); ftf.setFormatterFactory(factory); - ftf.setHorizontalAlignment(JTextField.RIGHT); + ftf.setHorizontalAlignment(SwingConstants.RIGHT); spinner.setEditor(editor); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -60,6 +60,7 @@ import javax.swing.JTextField; import javax.swing.LayoutFocusTraversalPolicy; import javax.swing.ListCellRenderer; +import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.border.Border; @@ -297,8 +298,8 @@ StatTableModel.initializeTable(statsTable); JScrollPane pane = new JScrollPane(statsTable, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER) + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER) { @Override Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/bio/CampaignHistoryInfoPane.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/bio/CampaignHistoryInfoPane.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/bio/CampaignHistoryInfoPane.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -46,6 +46,7 @@ import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; +import javax.swing.ScrollPaneConstants; import javax.swing.Scrollable; import javax.swing.SwingUtilities; @@ -128,7 +129,7 @@ } }; - pane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + pane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); add(pane); add(Box.createVerticalStrut(10)); addButton.setAlignmentX((float) 0.5); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/InfoPane.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/InfoPane.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/InfoPane.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -26,6 +26,7 @@ import javax.swing.BorderFactory; import javax.swing.JScrollPane; import javax.swing.JTextPane; +import javax.swing.ScrollPaneConstants; import javax.swing.border.TitledBorder; import javax.swing.text.BadLocationException; import javax.swing.text.Document; @@ -49,8 +50,8 @@ public InfoPane(String title) { - super(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + super(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); this.titledBorder = BorderFactory.createTitledBorder(null, title, TitledBorder.CENTER, TitledBorder.DEFAULT_POSITION); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/PCGenAction.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/PCGenAction.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/PCGenAction.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -22,7 +22,7 @@ import java.awt.Toolkit; import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; +import java.awt.event.InputEvent; import java.util.StringTokenizer; import javax.swing.AbstractAction; import javax.swing.KeyStroke; @@ -74,7 +74,7 @@ // 2) shortcut-alt + // 3) F1 // (error checking is for the weak!) - int iShortCut = KeyEvent.CTRL_MASK; + int iShortCut = InputEvent.CTRL_MASK; int menuShortcutKeyMask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); StringTokenizer aTok = new StringTokenizer(accelerator); @@ -89,16 +89,16 @@ { if (System.getProperty("mrj.version") != null) { - iShortCut = menuShortcutKeyMask | KeyEvent.ALT_MASK; + iShortCut = menuShortcutKeyMask | InputEvent.ALT_MASK; } else { - iShortCut = KeyEvent.ALT_MASK; + iShortCut = InputEvent.ALT_MASK; } } else if (aString.equalsIgnoreCase("shift-shortcut")) { - iShortCut = menuShortcutKeyMask | KeyEvent.SHIFT_MASK; + iShortCut = menuShortcutKeyMask | InputEvent.SHIFT_MASK; } if (aTok.hasMoreTokens()) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JDynamicTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JDynamicTable.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JDynamicTable.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -29,6 +29,7 @@ import javax.swing.JPopupMenu; import javax.swing.JScrollPane; import javax.swing.JViewport; +import javax.swing.ScrollPaneConstants; import javax.swing.event.TableColumnModelEvent; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; @@ -90,8 +91,8 @@ { return; } - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); - scrollPane.setCorner(JScrollPane.UPPER_RIGHT_CORNER, cornerButton); + scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); + scrollPane.setCorner(ScrollPaneConstants.UPPER_RIGHT_CORNER, cornerButton); } } } @@ -115,7 +116,7 @@ { return; } - scrollPane.setCorner(JScrollPane.UPPER_RIGHT_CORNER, null); + scrollPane.setCorner(ScrollPaneConstants.UPPER_RIGHT_CORNER, null); } } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -42,6 +42,7 @@ import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JViewport; +import javax.swing.ScrollPaneConstants; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.TableColumnModelEvent; @@ -203,8 +204,8 @@ { return; } - scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS); - scrollPane.setCorner(JScrollPane.UPPER_RIGHT_CORNER, cornerButton); + scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS); + scrollPane.setCorner(ScrollPaneConstants.UPPER_RIGHT_CORNER, cornerButton); } } } @@ -228,7 +229,7 @@ { return; } - scrollPane.setCorner(JScrollPane.UPPER_RIGHT_CORNER, null); + scrollPane.setCorner(ScrollPaneConstants.UPPER_RIGHT_CORNER, null); } } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/table/IntegerEditor.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/table/IntegerEditor.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/table/IntegerEditor.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -38,8 +38,8 @@ import javax.swing.JFormattedTextField; import javax.swing.JOptionPane; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; +import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -79,7 +79,7 @@ ftf.setFormatterFactory( new DefaultFormatterFactory(intFormatter)); ftf.setValue(minimum); - ftf.setHorizontalAlignment(JTextField.TRAILING); + ftf.setHorizontalAlignment(SwingConstants.TRAILING); ftf.setFocusLostBehavior(JFormattedTextField.PERSIST); //React when the user presses Enter while the editor is Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/table/TableCellUtilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/table/TableCellUtilities.java 2012-03-01 22:39:12 UTC (rev 16404) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/table/TableCellUtilities.java 2012-03-01 23:40:29 UTC (rev 16405) @@ -70,7 +70,7 @@ public RadioButtonEditor() { this.button = new JRadioButton(); - button.setHorizontalAlignment(JRadioButton.CENTER); + button.setHorizontalAlignment(SwingConstants.CENTER); button.addActionListener(this); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2012-03-01 23:54:13
|
Revision: 16406 http://pcgen.svn.sourceforge.net/pcgen/?rev=16406&view=rev Author: thpr Date: 2012-03-01 23:54:05 +0000 (Thu, 01 Mar 2012) Log Message: ----------- Eliminate Variable Masking in method parameters and local variables (GUI2) Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/UIPropertyContext.java Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/NameGenPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModel.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/models/QualifiedTreeCellRenderer.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/ClassLevelTableModel.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/LanguageTableModel.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/StatTableModel.java Trunk/pcgen/code/src/java/pcgen/gui2/util/ArrowIcon.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableSortingHeader.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java Trunk/pcgen/code/src/java/pcgen/gui2/util/SharedTabPane.java Trunk/pcgen/code/src/java/pcgen/gui2/util/table/IntegerEditor.java Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/UIPropertyContext.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/UIPropertyContext.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/UIPropertyContext.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -63,9 +63,9 @@ } @Override - public UIPropertyContext createChildContext(String name) + public UIPropertyContext createChildContext(String childName) { - return new UIPropertyContext(name, this); + return new UIPropertyContext(childName, this); } public static UIPropertyContext createContext(String name) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/NameGenPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/NameGenPanel.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/doomsdaybook/NameGenPanel.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -775,10 +775,10 @@ // loop through the available genders for (int i = 0; i < genders.size(); ++i) { - String gender = genders.get(i); + String genderString = genders.get(i); // Get the list of rules for the current gender - List<RuleSet> genderRules = categories.get("Sex: " + gender); + List<RuleSet> genderRules = categories.get("Sex: " + genderString); // now loop through all the rules from the selected category for (int j = 0; j < categoryRules.size(); ++j) @@ -788,7 +788,7 @@ // we can stop processing the list once we find a match if (genderRules.contains(categoryRules.get(j))) { - selectable.add(gender); + selectable.add(genderString); break; } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -517,17 +517,17 @@ /** * Identify if the supplied name is a default one generated by the system * e.g. Unnamed 1 or Unnamed 2 - * @param name The name to be checked. + * @param charName The name to be checked. * @return True if the name is a default. */ - private boolean isNewCharName(String name) + private boolean isNewCharName(String charName) { - if (name == null) + if (charName == null) { return true; } - return name.startsWith("Unnamed"); //$NON-NLS-1$ + return charName.startsWith("Unnamed"); //$NON-NLS-1$ } /* (non-Javadoc) @@ -2075,14 +2075,14 @@ if (pcDeity != null) { - for (CDOMReference<Domain> domains : pcDeity + for (CDOMReference<Domain> domainRef : pcDeity .getSafeListMods(Deity.DOMAINLIST)) { Collection<AssociatedPrereqObject> assoc = - pcDeity.getListAssociations(Deity.DOMAINLIST, domains); + pcDeity.getListAssociations(Deity.DOMAINLIST, domainRef); for (AssociatedPrereqObject apo : assoc) { - for (Domain d : domains.getContainedObjects()) + for (Domain d : domainRef.getContainedObjects()) { if (!isDomainInList(availDomainList, d)) { @@ -2171,10 +2171,10 @@ private void processAddDomains(CDOMObject cdo, final List<DomainFacadeImpl> availDomainList) { - Collection<CDOMReference<Domain>> domains = cdo.getListMods(PCClass.ALLOWED_DOMAINS); - if (domains != null) + Collection<CDOMReference<Domain>> domainRefs = cdo.getListMods(PCClass.ALLOWED_DOMAINS); + if (domainRefs != null) { - for (CDOMReference<Domain> ref : domains) + for (CDOMReference<Domain> ref : domainRefs) { Collection<AssociatedPrereqObject> assoc = cdo.getListAssociations(PCClass.ALLOWED_DOMAINS, ref); @@ -3397,10 +3397,10 @@ * @see pcgen.core.facade.CharacterFacade#createEquipmentSet(java.lang.String) */ @Override - public EquipmentSetFacade createEquipmentSet(String name) + public EquipmentSetFacade createEquipmentSet(String setName) { String id = EquipmentSetFacadeImpl.getNewIdPath(theCharacter, null); - EquipSet eSet = new EquipSet(id, name); + EquipSet eSet = new EquipSet(id, setName); theCharacter.addEquipSet(eSet); final EquipmentSetFacadeImpl facade = new EquipmentSetFacadeImpl(delegate, theCharacter, eSet, dataSet); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/EquipmentSetFacadeImpl.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -118,24 +118,24 @@ } - private void initForEquipSet(EquipSet eqSet) + private void initForEquipSet(EquipSet equipSet) { - this.eqSet = eqSet; - name = new DefaultReferenceFacade<String>(eqSet.getName()); + this.eqSet = equipSet; + name = new DefaultReferenceFacade<String>(equipSet.getName()); bodyStructMap = new HashMap<String, BodyStructure>(); equipmentList = new EquipmentListFacadeImpl(); for (BodyStructureFacade bodyStruct : dataSet.getEquipmentLocations()) { bodyStructMap.put(bodyStruct.toString(), (BodyStructure) bodyStruct); - // Add a 'base' equippath entry for each body strcuture + // Add a 'base' equippath entry for each body structure } buildNodeList(); List<EquipSet> equipList = new ArrayList<EquipSet>(theCharacter.getEquipSet()); Collections.sort(equipList); - addChildrenToPath(eqSet.getIdPath(), equipList, (EquipNodeImpl) null); + addChildrenToPath(equipSet.getIdPath(), equipList, (EquipNodeImpl) null); } private void buildNodeList() @@ -145,14 +145,14 @@ int index = 0; for (BodyStructureFacade bodyStruct : dataSet.getEquipmentLocations()) { - String name = bodyStruct.toString(); + String structString = bodyStruct.toString(); EquipNodeImpl node = new EquipNodeImpl((BodyStructure) bodyStruct, index++); nodeList.addElement(node); // Add locations for this body structure for (EquipSlot slot : SystemCollections.getUnmodifiableEquipSlotList()) { - if (slot.getBodyStructureName().equalsIgnoreCase(name)) + if (slot.getBodyStructureName().equalsIgnoreCase(structString)) { if (slot.canContainType("WEAPON")) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -205,7 +205,7 @@ { String defaultGame = context.initProperty(PROP_SELECTED_GAME, ""); - GameModeFacade gameMode = null; + GameModeFacade mode = null; if (StringUtils.isNotEmpty(defaultGame)) { for (int i = 0; i < gameModeList.getModel().getSize(); i++) @@ -216,33 +216,33 @@ if (defaultGame.equals(game.toString())) { gameModeList.setSelectedIndex(i); - gameMode = game; + mode = game; } } } - if (gameMode == null && gameModeList.getModel().getSize() > 0) + if (mode == null && gameModeList.getModel().getSize() > 0) { gameModeList.setSelectedIndex(0); - gameMode = (GameModeFacade) gameModeList.getSelectedItem(); + mode = (GameModeFacade) gameModeList.getSelectedItem(); } } /** * Add the user's previously selected sources for this gamemode * to the selected list. - * @param gameMode The game mode being selected + * @param mode The game mode being selected */ - private void selectDefaultSources(GameModeFacade gameMode) + private void selectDefaultSources(GameModeFacade mode) { - if (gameMode != null) + if (mode != null) { List<String> sourceNames; String defaultSelectedSources = context.initProperty( - PROP_SELECTED_SOURCES + gameMode.toString(), ""); //$NON-NLS-1$ + PROP_SELECTED_SOURCES + mode.toString(), ""); //$NON-NLS-1$ if (defaultSelectedSources == null || "".equals(defaultSelectedSources)) { - sourceNames = gameMode.getDefaultDataSetList(); + sourceNames = mode.getDefaultDataSetList(); } else { @@ -252,7 +252,7 @@ for (String name : sourceNames) { for (CampaignFacade camp : FacadeFactory - .getSupportedCampaigns(gameMode)) + .getSupportedCampaigns(mode)) { if (name.equals(camp.toString())) { @@ -651,12 +651,11 @@ @Override public Component getTreeCellRendererComponent(JTree tree, Object value, - boolean sel, boolean expanded, boolean leaf, int row, - boolean hasFocus) + boolean sel, boolean expanded, boolean leaf, int row, boolean focus) { super.getTreeCellRendererComponent(tree, value, sel, expanded, - leaf, row, hasFocus); + leaf, row, focus); Object campaignObj = ((DefaultMutableTreeNode) value).getUserObject(); if (campaignObj instanceof CampaignFacade) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -256,7 +256,7 @@ { @Override - public void valueChanged(ListSelectionEvent e) + public void valueChanged(ListSelectionEvent lse) { nameField.setText(sourcesList.getSelectedValue().toString()); } @@ -519,9 +519,9 @@ { @Override - public Object get(int index) + public Object get(int idx) { - return sortedModel.getElementAt(index); + return sortedModel.getElementAt(idx); } @Override Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -73,7 +73,6 @@ } @Override - @SuppressWarnings("unchecked") public void restoreModels(Hashtable<?, ?> state) { AbilityTabsModel tabsModel = (AbilityTabsModel) state.get("TabsModel"); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -795,11 +795,11 @@ @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, - boolean hasFocus) + boolean focus) { super.getTreeCellRendererComponent(tree, value, sel, expanded, - leaf, row, hasFocus); + leaf, row, focus); Object abilityObj = ((DefaultMutableTreeNode) value).getUserObject(); if (abilityObj instanceof AbilityFacade) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CharacterSheetInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -199,10 +199,10 @@ model = new DefaultComboBoxModel(files); File file = null; - String csheet = Main.getStartupCharacterSheet(); - if (csheet != null) + String charSheet = Main.getStartupCharacterSheet(); + if (charSheet != null) { - file = new File(sheetDir, csheet); + file = new File(sheetDir, charSheet); if(!file.isFile()) { Logging.errorPrint("Invalid Character Sheet: "+file.getAbsolutePath()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -192,9 +192,9 @@ @Override public void valueChanged(ListSelectionEvent e) { - ListSelectionModel selectionModel = + ListSelectionModel selModel = (ListSelectionModel) e.getSource(); - int index = selectionModel.getMinSelectionIndex(); + int index = selModel.getMinSelectionIndex(); if (index != -1) { if (!e.getValueIsAdjusting()) @@ -217,9 +217,9 @@ @Override public void valueChanged(ListSelectionEvent e) { - ListSelectionModel selectionModel = + ListSelectionModel selModel = (ListSelectionModel) e.getSource(); - if (!selectionModel.isSelectionEmpty()) + if (!selModel.isSelectionEmpty()) { if (!e.getValueIsAdjusting()) { @@ -400,7 +400,7 @@ return null; } - final ClassFacade selectedClass = (ClassFacade) obj; + final ClassFacade selClass = (ClassFacade) obj; return new Transferable() { @@ -427,7 +427,7 @@ { throw new UnsupportedFlavorException(flavor); } - return selectedClass; + return selClass; } }; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -997,12 +997,11 @@ @Override public Component getTreeCellRendererComponent(JTree tree, Object value, - boolean sel, boolean expanded, boolean leaf, int row, - boolean hasFocus) + boolean sel, boolean expanded, boolean leaf, int row, boolean focus) { super.getTreeCellRendererComponent(tree, value, sel, expanded, - leaf, row, hasFocus); + leaf, row, focus); Object equipObj = ((DefaultMutableTreeNode) value).getUserObject(); if (equipObj instanceof EquipmentFacade && !character.isQualifiedFor((EquipmentFacade) equipObj)) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -489,11 +489,11 @@ super.stateChanged(e); } - private void releaseMouse(JSpinner spinner) + private void releaseMouse(JSpinner jSpinner) { - for (int i = 0; i < spinner.getComponentCount(); i++) + for (int i = 0; i < jSpinner.getComponentCount(); i++) { - Component comp = spinner.getComponent(i); + Component comp = jSpinner.getComponent(i); if (comp instanceof JButton) { releaseMouse(comp); @@ -533,10 +533,10 @@ return character.getCharacterLevelsFacade().getSkillRanks(level, skill); } - public void configureModel(SkillFacade skill, CharacterLevelFacade level) + public void configureModel(SkillFacade sk, CharacterLevelFacade charLevel) { - this.skill = skill; - this.level = level; + this.skill = sk; + this.level = charLevel; fireStateChanged(); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModel.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModel.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -148,13 +148,13 @@ } - public void install(JTreeTable treeTable) + public void install(JTreeTable table) { - this.treeTable = treeTable; - treeTable.setTreeCellRenderer(treeRenderer); + this.treeTable = table; + table.setTreeCellRenderer(treeRenderer); selectedModel = equipsetMap.get(character.getEquipmentSetRef().getReference()); - treeTable.setTreeTableModel(selectedModel); - treeTable.getModel().addTableModelListener(this); + table.setTreeTableModel(selectedModel); + table.getModel().addTableModelListener(this); realignRowHeights(); character.getEquipmentSetRef().addReferenceListener(this); @@ -232,7 +232,9 @@ private Map<String, ImageIcon> iconCache = new HashMap<String, ImageIcon>(); @Override - public Component getTreeCellRendererComponent(final JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, final int row, boolean hasFocus) + public Component getTreeCellRendererComponent(final JTree tree, + Object value, boolean sel, boolean expanded, boolean leaf, + final int row, boolean focus) { String text = String.valueOf(value); boolean isEquipNode = value instanceof EquipNode; @@ -242,7 +244,7 @@ { text = "Empty slot"; } - super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus); + super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, focus); if (isEquipNode && ((EquipNode) value).getParent() == null) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -129,13 +129,13 @@ this.filterHandler = new EquipFilterHandler(); } - public void install(JComboBox equipViewBox, JTableEx equipmentTable, + public void install(JComboBox equipBox, JTableEx eqTable, DisplayableFilter<CharacterFacade, EquipmentFacade> filter, - JTreeTable equipmentSetTable, JButton equipButton, JButton unequipButton) + JTreeTable eqSetTable, JButton equipButton, JButton unequipButton) { - this.equipViewBox = equipViewBox; - this.equipmentTable = equipmentTable; - this.equipmentSetTable = equipmentSetTable; + this.equipViewBox = equipBox; + this.equipmentTable = eqTable; + this.equipmentSetTable = eqSetTable; viewHandler.install(); equipButton.setAction(equipAction); unequipButton.setAction(unequipAction); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/models/QualifiedTreeCellRenderer.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/models/QualifiedTreeCellRenderer.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/models/QualifiedTreeCellRenderer.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -49,14 +49,15 @@ } @Override - public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) + public Component getTreeCellRendererComponent(JTree tree, Object value, + boolean sel, boolean expanded, boolean leaf, int row, boolean focus) { Object obj = ((DefaultMutableTreeNode) value).getUserObject(); if ("".equals(obj)) { obj = "None"; } - super.getTreeCellRendererComponent(tree, obj, sel, expanded, leaf, row, hasFocus); + super.getTreeCellRendererComponent(tree, obj, sel, expanded, leaf, row, focus); if (obj instanceof InfoFacade && !character.isQualifiedFor((InfoFacade) obj)) { setForeground(UIPropertyContext.getNotQualifiedColor()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -81,10 +81,10 @@ treeviews = new DefaultListFacade<TreeView<SkillFacade>>(views); } - public void install(FilteredTreeViewTable table) + public void install(FilteredTreeViewTable ftvt) { - this.table = table; - table.setTreeViewModel(this); + this.table = ftvt; + ftvt.setTreeViewModel(this); } public void uninstall() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/ClassLevelTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/ClassLevelTableModel.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/ClassLevelTableModel.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -98,15 +98,15 @@ classLevelTable.setRowHeight(20); } - public void install(JTable table, JComboBox classComboBox) + public void install(JTable table, JComboBox comboBox) { - this.classComboBox = classComboBox; + this.classComboBox = comboBox; table.setModel(this); table.setDefaultRenderer(Object.class, renderer); table.setDefaultRenderer(Integer.class, new TableCellUtilities.AlignRenderer(SwingConstants.CENTER)); table.setDefaultEditor(Object.class, editor); - classComboBox.addItemListener(this); - classComboBox.addPropertyChangeListener("model", this); + comboBox.addItemListener(this); + comboBox.addPropertyChangeListener("model", this); } public void uninstall() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/LanguageTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/LanguageTableModel.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/LanguageTableModel.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -83,14 +83,14 @@ table.getTableHeader().setReorderingAllowed(false); } - public void install(JTable table) + public void install(JTable jTable) { - this.table = table; - table.addMouseMotionListener(this); - table.setModel(this); + this.table = jTable; + jTable.addMouseMotionListener(this); + jTable.setModel(this); - table.setDefaultRenderer(Object.class, renderer); - table.setDefaultEditor(Object.class, editor); + jTable.setDefaultRenderer(Object.class, renderer); + jTable.setDefaultEditor(Object.class, editor); } public void uninstall() @@ -222,20 +222,20 @@ } @Override - public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) + public Component getTableCellEditorComponent(JTable jTable, Object value, boolean isSelected, int row, int column) { - TableCellUtilities.setToRowBackground(cellPanel, table, row); + TableCellUtilities.setToRowBackground(cellPanel, jTable, row); if (row >= languages.getSize()) { - addLabel.setForeground(table.getForeground()); - addLabel.setFont(table.getFont()); + addLabel.setForeground(jTable.getForeground()); + addLabel.setFont(jTable.getFont()); addLabel.setText("Add " + ((LanguageChooserFacade) value).getName()); cardLayout.show(cellPanel, ADD_ID); } else { - cellLabel.setForeground(table.getForeground()); - cellLabel.setFont(table.getFont()); + cellLabel.setForeground(jTable.getForeground()); + cellLabel.setFont(jTable.getFont()); cellLabel.setText(value.toString()); cardLayout.show(cellPanel, REMOVE_ID); } @@ -303,14 +303,14 @@ } @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) + public Component getTableCellRendererComponent(JTable jTable, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - TableCellUtilities.setToRowBackground(this, table, row); + TableCellUtilities.setToRowBackground(this, jTable, row); if (row < languages.getSize()) { boolean automatic = value instanceof LanguageFacade && character.isAutomatic((LanguageFacade) value); - Point mouse = table.getMousePosition(); + Point mouse = jTable.getMousePosition(); if (automatic) { @@ -318,19 +318,19 @@ } else { - cellLabel.setForeground(table.getForeground()); + cellLabel.setForeground(jTable.getForeground()); } cellLabel.setText(value.toString()); - cellLabel.setFont(table.getFont()); - removeButton.setVisible(mouse != null && table.rowAtPoint(mouse) == row + cellLabel.setFont(jTable.getFont()); + removeButton.setVisible(mouse != null && jTable.rowAtPoint(mouse) == row && !automatic); cardLayout.show(this, REMOVE_ID); } else { addLabel.setText("Add " + ((LanguageChooserFacade) value).getName()); - addLabel.setFont(table.getFont()); - addLabel.setForeground(table.getForeground()); + addLabel.setFont(jTable.getFont()); + addLabel.setForeground(jTable.getForeground()); cardLayout.show(this, ADD_ID); } return this; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/StatTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/StatTableModel.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/summary/StatTableModel.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -434,11 +434,13 @@ } @Override - public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) + public Component getTableCellRendererComponent(JTable jTable, + Object value, boolean isSelected, boolean hasFocus, int row, + int column) { - setBackground(table.getBackground()); - setForeground(table.getForeground()); - Font font = table.getFont().deriveFont(Font.BOLD); + setBackground(jTable.getBackground()); + setForeground(jTable.getForeground()); + Font font = jTable.getFont().deriveFont(Font.BOLD); statLabel.setFont(font); StatFacade stat = (StatFacade) value; //TODO: this should really call stat.toString() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/ArrowIcon.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/ArrowIcon.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/ArrowIcon.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -82,23 +82,23 @@ * @param g the {@code Graphics} to draw to * @param x the x coordinate * @param y the y coordinate - * @param size the size of the triangle to draw - * @param direction the direction in which to draw the arrow; + * @param triangleSize the size of the triangle to draw + * @param triangleDir the direction in which to draw the arrow; * one of {@code SwingConstants.NORTH}, * {@code SwingConstants.SOUTH}, {@code SwingConstants.EAST} or * {@code SwingConstants.WEST} * @param isEnabled whether or not the arrow is drawn enabled * @see javax.swing.plaf.basic.BasicArrowButton */ - public void paintTriangle(Graphics g, int x, int y, int size, - int direction, boolean isEnabled) + public void paintTriangle(Graphics g, int x, int y, int triangleSize, + int triangleDir, boolean isEnabled) { Color oldColor = g.getColor(); int mid, i, j; j = 0; - size = Math.max(size, 2); - mid = (size / 2) - 1; + triangleSize = Math.max(triangleSize, 2); + mid = (triangleSize / 2) - 1; g.translate(x, y); if (isEnabled) @@ -110,10 +110,10 @@ g.setColor(shadow); } - switch (direction) + switch (triangleDir) { case NORTH: - for (i = 0; i < size; i++) + for (i = 0; i < triangleSize; i++) { g.drawLine(mid - i, i, mid + i, i); } @@ -128,7 +128,7 @@ { g.translate(1, 1); g.setColor(highlight); - for (i = size - 1; i >= 0; i--) + for (i = triangleSize - 1; i >= 0; i--) { g.drawLine(mid - i, j, mid + i, j); j++; @@ -138,14 +138,14 @@ } j = 0; - for (i = size - 1; i >= 0; i--) + for (i = triangleSize - 1; i >= 0; i--) { g.drawLine(mid - i, j, mid + i, j); j++; } break; case WEST: - for (i = 0; i < size; i++) + for (i = 0; i < triangleSize; i++) { g.drawLine(i, mid - i, i, mid + i); } @@ -160,7 +160,7 @@ { g.translate(1, 1); g.setColor(highlight); - for (i = size - 1; i >= 0; i--) + for (i = triangleSize - 1; i >= 0; i--) { g.drawLine(j, mid - i, j, mid + i); j++; @@ -170,7 +170,7 @@ } j = 0; - for (i = size - 1; i >= 0; i--) + for (i = triangleSize - 1; i >= 0; i--) { g.drawLine(j, mid - i, j, mid + i); j++; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableSortingHeader.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableSortingHeader.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTableSortingHeader.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -92,15 +92,15 @@ } @Override - public Component getTableCellRendererComponent(JTable table, + public Component getTableCellRendererComponent(JTable jTable, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - TableColumn draggedColumn = getDraggedColumn(); - if (draggedColumn != null && draggedColumn.getHeaderValue() == value) + TableColumn dragColumn = getDraggedColumn(); + if (dragColumn != null && dragColumn.getHeaderValue() == value) { setModel(usedModel); } @@ -109,7 +109,7 @@ setModel(defaultModel); } Icon icon = null; - TableColumn currentColumn = table.getColumn(value); + TableColumn currentColumn = jTable.getColumn(value); List<? extends SortingPriority> list = getTable().getSortingPriority(); if (!list.isEmpty()) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -406,11 +406,11 @@ { if (child instanceof JMenuItem) { - JMenuItem menu = (JMenuItem) child; - if (menu.isSelected() - && menu.getAction() instanceof JTreeViewTable.ChangeViewAction) + JMenuItem menuItem = (JMenuItem) child; + if (menuItem.isSelected() + && menuItem.getAction() instanceof JTreeViewTable.ChangeViewAction) { - ChangeViewAction changeViewAction = (JTreeViewTable.ChangeViewAction) menu.getAction(); + ChangeViewAction changeViewAction = (JTreeViewTable.ChangeViewAction) menuItem.getAction(); startingView = changeViewAction.view; } } @@ -552,14 +552,14 @@ } @Override - public Component getTableCellRendererComponent(JTable table, + public Component getTableCellRendererComponent(JTable jTable, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column); + super.getTableCellRendererComponent(jTable, value, isSelected, hasFocus, row, column); removeAll(); if (treetableModel.getSelectedTreeView().getViewName() == value) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/SharedTabPane.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/SharedTabPane.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/SharedTabPane.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -39,14 +39,14 @@ public SharedTabPane() { - final SingleSelectionModel model = getModel(); - model.addChangeListener(new ChangeListener() + final SingleSelectionModel selectionModel = getModel(); + selectionModel.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { - int index = model.getSelectedIndex(); + int index = selectionModel.getSelectedIndex(); if (index != -1) { setSharedComponentParent(index); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/table/IntegerEditor.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/table/IntegerEditor.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/table/IntegerEditor.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -123,19 +123,19 @@ Object value, boolean isSelected, int row, int column) { - JFormattedTextField ftf = + JFormattedTextField textField = (JFormattedTextField) super.getTableCellEditorComponent( table, value, isSelected, row, column); - ftf.setValue(value); - return ftf; + textField.setValue(value); + return textField; } //Override to ensure that the value remains an Integer. @Override public Object getCellEditorValue() { - JFormattedTextField ftf = (JFormattedTextField) getComponent(); - Object o = ftf.getValue(); + JFormattedTextField textField = (JFormattedTextField) getComponent(); + Object o = textField.getValue(); if (o instanceof Integer) { return o; @@ -170,12 +170,12 @@ @Override public boolean stopCellEditing() { - JFormattedTextField ftf = (JFormattedTextField) getComponent(); - if (ftf.isEditValid()) + JFormattedTextField textField = (JFormattedTextField) getComponent(); + if (textField.isEditValid()) { try { - ftf.commitEdit(); + textField.commitEdit(); } catch (java.text.ParseException exc) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java 2012-03-01 23:40:29 UTC (rev 16405) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/TreeViewTableModel.java 2012-03-01 23:54:05 UTC (rev 16406) @@ -168,10 +168,10 @@ { if (dataMap.containsKey(elem) && selectedView != null) { - TreeViewNode root = (TreeViewNode) getRoot(); + TreeViewNode rootNode = (TreeViewNode) getRoot(); for (TreeViewPath<? super E> path : selectedView.getPaths(elem)) { - root.removeTreeViewPath(path); + rootNode.removeTreeViewPath(path); } dataMap.remove(elem); } @@ -182,10 +182,10 @@ if (!dataMap.containsKey(elem) && selectedView != null) { dataMap.put(elem, dataview.getData(elem)); - TreeViewNode root = (TreeViewNode) getRoot(); + TreeViewNode rootNode = (TreeViewNode) getRoot(); for (TreeViewPath<? super E> path : selectedView.getPaths(elem)) { - root.insertTreeViewPath(path); + rootNode.insertTreeViewPath(path); } } } @@ -265,8 +265,8 @@ @Override public final void sortModel(Comparator<List<?>> comparator) { - TreeViewNode root = (TreeViewNode) getRoot(); - root.sortChildren(new TreeNodeComparator(comparator)); + TreeViewNode rootNode = (TreeViewNode) getRoot(); + rootNode.sortChildren(new TreeNodeComparator(comparator)); reload(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2012-03-02 00:14:15
|
Revision: 16407 http://pcgen.svn.sourceforge.net/pcgen/?rev=16407&view=rev Author: thpr Date: 2012-03-02 00:14:08 +0000 (Fri, 02 Mar 2012) Log Message: ----------- Additional Generics cleanup Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredListFacade.java Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredListFacadeTableModel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TabTitle.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -198,10 +198,10 @@ { if (e.getActionCommand().equals("ADD") || e.getSource() == availTable) { - List<Object> data = availTable.getSelectedData(); - if (!data.isEmpty() && data.get(0) instanceof InfoFacade) + List<InfoFacade> data = availTable.getSelectedData(); + if (!data.isEmpty()) { - chooser.addSelected((InfoFacade) data.get(0)); + chooser.addSelected(data.get(0)); } return; } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -177,10 +177,10 @@ { if (e.getActionCommand().equals("ADD") || e.getSource() == availTable) { - List<Object> data = availTable.getSelectedData(); + List<LanguageFacade> data = availTable.getSelectedData(); if (!data.isEmpty()) { - chooser.addSelected((LanguageFacade) data.get(0)); + chooser.addSelected(data.get(0)); } return; } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -606,7 +606,7 @@ // Get modChoices to adjust the associated list and Feat Pool adjustedAbilityPool = ChooserUtilities.modChoices(pcAbility, - new ArrayList(), new ArrayList(), true, + new ArrayList<String>(), new ArrayList<String>(), true, theCharacter, false, theCategory); } else Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -2498,6 +2498,11 @@ public void save() throws NullPointerException, IOException { GameMode mode = (GameMode) dataSet.getGameMode(); + /* + * TODO This is a bug. This List receives a CampaignFacade and the + * subsequent write assumes it receives a Campaign. Since this is not + * checked, it is not guaranteed to work. - thpr + */ List campaigns = ListFacades.wrap(dataSet.getCampaigns()); (new PCGIOHandler()).write(theCharacter, mode, campaigns, file.getReference().getAbsolutePath()); theCharacter.setDirty(false); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -132,7 +132,6 @@ * Build up the language lists for a choice of languages linked to a rules * object. e.g. The speak language skill. */ - @SuppressWarnings("unchecked") private void buildObjectLangList() { final List<Language> availLangs = new ArrayList<Language>(); @@ -155,7 +154,7 @@ } else { - ChoiceManagerList aMan = ChooserUtilities.getConfiguredController((PObject) source, theCharacter, null, new ArrayList<String>()); + ChoiceManagerList<Language> aMan = ChooserUtilities.getConfiguredController((PObject) source, theCharacter, null, new ArrayList<String>()); numSelections = aMan.getNumEffectiveChoices(selLangs, new ArrayList<String>()); } numSelectionsRemain.setReference(numSelections); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/SpellSupportFacadeImpl.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -146,7 +146,7 @@ rootNodeMap = new HashMap<String, RootNodeImpl>(); spellBookNames = new DefaultListFacade<String>(); - defaultSpellBook = new DefaultReferenceFacade(pc.getSpellBookNameToAutoAddKnown()); + defaultSpellBook = new DefaultReferenceFacade<String>(pc.getSpellBookNameToAutoAddKnown()); availableSpellNodes = new DefaultListFacade<SpellSupportFacade.SpellNode>(); buildAvailableNodes(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredListFacade.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredListFacade.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredListFacade.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -36,7 +36,7 @@ private List<E> data = new ArrayList<E>(); private ListFacade<E> delegate = null; - private Filter<C, E> filter = null; + private Filter<? super C, ? super E> filter = null; private C context = null; @Override @@ -61,9 +61,9 @@ } } - public void setFilter(Filter<C, E> filter) + public void setFilter(Filter<? super C, ? super E> filter) { - Filter<C, E> oldFilter = this.filter; + Filter<? super C, ? super E> oldFilter = this.filter; this.filter = filter; if (oldFilter != filter) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredListFacadeTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredListFacadeTableModel.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/filter/FilteredListFacadeTableModel.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -71,7 +71,7 @@ filteredList.setDelegate(delegate); } - public void setFilter(Filter<CharacterFacade, E> filter) + public void setFilter(Filter<? super CharacterFacade, ? super E> filter) { filteredList.setFilter(filter); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -89,8 +89,8 @@ private static final String PROP_SELECTED_GAME = "selectedGame"; //$NON-NLS-1$ private static final String PROP_SELECTED_SOURCES = "selectedSources."; //$NON-NLS-1$ - private final FilteredTreeViewTable availableTable; - private final FilteredTreeViewTable selectedTable; + private final FilteredTreeViewTable<Object, CampaignFacade> availableTable; + private final FilteredTreeViewTable<Object, CampaignFacade> selectedTable; private SourceTreeViewModel availTreeViewModel; private SourceTreeViewModel selTreeViewModel; private InfoPane infoPane; @@ -105,8 +105,8 @@ public AdvancedSourceSelectionPanel(PCGenFrame frame) { this.frame = frame; - this.availableTable = new FilteredTreeViewTable(); - this.selectedTable = new FilteredTreeViewTable(); + this.availableTable = new FilteredTreeViewTable<Object, CampaignFacade>(); + this.selectedTable = new FilteredTreeViewTable<Object, CampaignFacade>(); this.selectedCampaigns = new DefaultListFacade<CampaignFacade>(); this.availTreeViewModel = new SourceTreeViewModel(); this.selTreeViewModel = new SourceTreeViewModel(selectedCampaigns); @@ -134,7 +134,7 @@ gameModeList.addActionListener(this); panel.add(gameModeList, BorderLayout.CENTER); - FilterBar bar = new FilterBar(); + FilterBar<Object, CampaignFacade> bar = new FilterBar<Object, CampaignFacade>(); bar.add(panel, BorderLayout.WEST); bar.addDisplayableFilter(new SearchFilterPanel()); panel = new JPanel(new BorderLayout()); @@ -168,7 +168,7 @@ topPane.setLeftComponent(panel); JPanel selPanel = new JPanel(new BorderLayout()); - FilterBar filterBar = new FilterBar(); + FilterBar<Object, CampaignFacade> filterBar = new FilterBar<Object, CampaignFacade>(); filterBar.addDisplayableFilter(new SearchFilterPanel()); selectedTable.setDisplayableFilter(filterBar); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/SourceSelectionDialog.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -250,7 +250,7 @@ final JList sourcesList = new JList(); final JTextField nameField = new JTextField(); ListFacade<SourceSelectionFacade> sources = FacadeFactory.getCustomSourceSelections(); - sourcesList.setModel(new SortedListModel(sources, + sourcesList.setModel(new SortedListModel<SourceSelectionFacade>(sources, Comparators.toStringIgnoreCaseCollator())); sourcesList.addListSelectionListener(new ListSelectionListener() { @@ -482,7 +482,7 @@ JLabel label = new JLabel(LanguageBundle.getString("in_qsrc_intro")); label.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); add(label, BorderLayout.NORTH); - sourceList.setModel(new SortedListModel(FacadeFactory.getDisplayedSourceSelections(), + sourceList.setModel(new SortedListModel<SourceSelectionFacade>(FacadeFactory.getDisplayedSourceSelections(), Comparators.toStringIgnoreCaseCollator())); sourceList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); sourceList.setCellRenderer(new SourceListCellRenderer()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -223,12 +223,11 @@ { if (!e.getValueIsAdjusting()) { - List<Object> data = availableTable.getSelectedData(); + List<ClassFacade> data = availableTable.getSelectedData(); ClassFacade clazz = null; - if (!data.isEmpty() - && data.get(0) instanceof ClassFacade) + if (!data.isEmpty()) { - clazz = (ClassFacade) data.get(0); + clazz = data.get(0); } setSelectedClass(clazz); } @@ -389,19 +388,13 @@ @Override protected Transferable createTransferable(JComponent c) { - List<Object> data = availableTable.getSelectedData(); + List<ClassFacade> data = availableTable.getSelectedData(); if (data.isEmpty()) { return null; } - Object obj = data.get(0); - if (!(obj instanceof ClassFacade)) - { - return null; - } + final ClassFacade selClass = data.get(0); - final ClassFacade selClass = (ClassFacade) obj; - return new Transferable() { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/EquipInfoTab.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -119,7 +119,7 @@ private final JLabel weightLabel; private final JLabel loadLabel; private final JLabel limitLabel; - private DisplayableFilter tableFilter; + private DisplayableFilter<Object, Object> tableFilter; public EquipInfoTab() { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -198,11 +198,11 @@ { if (!e.getValueIsAdjusting()) { - List<Object> data = availableTable.getSelectedData(); + List<EquipmentFacade> data = availableTable.getSelectedData(); EquipmentFacade equipment = null; - if (!data.isEmpty() && data.get(0) instanceof EquipmentFacade) + if (!data.isEmpty()) { - equipment = (EquipmentFacade) data.get(0); + equipment = data.get(0); } setSelectedItem(equipment); } @@ -242,11 +242,11 @@ { if (!e.getValueIsAdjusting()) { - List<Object> data = purchasedTable.getSelectedData(); + List<EquipmentFacade> data = purchasedTable.getSelectedData(); EquipmentFacade skill = null; - if (!data.isEmpty() && data.get(0) instanceof EquipmentFacade) + if (!data.isEmpty()) { - skill = (EquipmentFacade) data.get(0); + skill = data.get(0); } setSelectedItem(skill); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TabTitle.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TabTitle.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TabTitle.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -40,7 +40,7 @@ public static final String ICON = "icon"; public static final String TOOLTIP = "tooltip"; private PropertyChangeSupport support; - private Hashtable table; + private Hashtable<String, Object> table; public TabTitle(String title) { @@ -58,7 +58,7 @@ public TabTitle() { support = new PropertyChangeSupport(this); - table = new Hashtable(); + table = new Hashtable<String, Object>(); } public void addPropertyChangeListener(PropertyChangeListener l) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -255,14 +255,11 @@ @Override public void actionPerformed(ActionEvent e) { - List<Object> data = availableTable.getSelectedData(); - for (Object object : data) + List<TemplateFacade> data = availableTable.getSelectedData(); + for (TemplateFacade object : data) { - if (object instanceof TemplateFacade) - { - character.addTemplate((TemplateFacade) object); - return; - } + character.addTemplate(object); + return; } } @@ -293,14 +290,11 @@ @Override public void actionPerformed(ActionEvent e) { - List<Object> data = selectedTable.getSelectedData(); - for (Object object : data) + List<TemplateFacade> data = selectedTable.getSelectedData(); + for (TemplateFacade object : data) { - if (object instanceof TemplateFacade) - { - character.removeTemplate((TemplateFacade) object); - return; - } + character.removeTemplate(object); + return; } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentModels.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -130,7 +130,7 @@ } public void install(JComboBox equipBox, JTableEx eqTable, - DisplayableFilter<CharacterFacade, EquipmentFacade> filter, + DisplayableFilter<? super CharacterFacade, ? super EquipmentFacade> filter, JTreeTable eqSetTable, JButton equipButton, JButton unequipButton) { this.equipViewBox = equipBox; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -63,7 +63,7 @@ private final CharacterFacade character; private final CharacterLevelsFacade levels; private final ListSelectionModel selectionModel; - private FilteredTreeViewTable table; + private FilteredTreeViewTable<CharacterFacade, SkillFacade> table; private boolean displayCostTrees = false; public SkillTreeViewModel(CharacterFacade character, ListSelectionModel selectionModel) @@ -81,7 +81,7 @@ treeviews = new DefaultListFacade<TreeView<SkillFacade>>(views); } - public void install(FilteredTreeViewTable ftvt) + public void install(FilteredTreeViewTable<CharacterFacade, SkillFacade> ftvt) { this.table = ftvt; ftvt.setTreeViewModel(this); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-03-01 23:54:05 UTC (rev 16406) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-03-02 00:14:08 UTC (rev 16407) @@ -238,18 +238,18 @@ * This returns data that is currently highlighted by the user. * @return */ - public List<Object> getSelectedData() + public List<T> getSelectedData() { TreePath[] paths = getTree().getSelectionPaths(); if (paths == null) { return Collections.emptyList(); } - List<Object> data = new ArrayList<Object>(paths.length); + List<T> data = new ArrayList<T>(paths.length); for (TreePath path : paths) { DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent(); - data.add(node.getUserObject()); + data.add((T) node.getUserObject()); } return data; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-03-17 00:08:21
|
Revision: 16496 http://pcgen.svn.sourceforge.net/pcgen/?rev=16496&view=rev Author: jdempsey Date: 2012-03-17 00:08:14 +0000 (Sat, 17 Mar 2012) Log Message: ----------- Fix bug: Purchase equipment panel. Java has an error when trying to open armor selection. Issue#: CODE-1374 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/kits/KitPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-03-17 00:06:16 UTC (rev 16495) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-03-17 00:08:14 UTC (rev 16496) @@ -198,10 +198,16 @@ { if (e.getActionCommand().equals("ADD") || e.getSource() == availTable) { - List<InfoFacade> data = availTable.getSelectedData(); + List<Object> data = availTable.getSelectedData(); if (!data.isEmpty()) { - chooser.addSelected(data.get(0)); + for (Object object : data) + { + if (object instanceof InfoFacade) + { + chooser.addSelected((InfoFacade) object); + } + } } return; } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/kits/KitPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/kits/KitPanel.java 2012-03-17 00:06:16 UTC (rev 16495) +++ Trunk/pcgen/code/src/java/pcgen/gui2/kits/KitPanel.java 2012-03-17 00:08:14 UTC (rev 16496) @@ -211,11 +211,14 @@ public void actionPerformed(ActionEvent e) { - List<KitFacade> data = availableTable.getSelectedData(); - for (KitFacade kit : data) + List<Object> data = availableTable.getSelectedData(); + for (Object kit : data) { - character.addKit(kit); - return; + if (kit instanceof KitFacade) + { + character.addKit((KitFacade) kit); + return; + } } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-17 00:06:16 UTC (rev 16495) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-03-17 00:08:14 UTC (rev 16496) @@ -401,19 +401,23 @@ @Override public void actionPerformed(ActionEvent e) { - List<CampaignFacade> list = availableTable.getSelectedData(); + List<Object> list = availableTable.getSelectedData(); if (list != null && !list.isEmpty()) { - for (CampaignFacade camp : list) + for (Object obj : list) { - selectedCampaigns.addElement(camp); - if (!FacadeFactory.passesPrereqs(gameMode, selectedCampaigns.getContents())) + if (obj instanceof CampaignFacade) { - JOptionPane.showMessageDialog(AdvancedSourceSelectionPanel.this, - LanguageBundle.getString("in_src_badComboMsg"), //$NON-NLS-1$ - LanguageBundle.getString("in_src_badComboTitle"), //$NON-NLS-1$ - JOptionPane.INFORMATION_MESSAGE); - selectedCampaigns.removeElement(camp); + CampaignFacade camp = (CampaignFacade) obj; + selectedCampaigns.addElement(camp); + if (!FacadeFactory.passesPrereqs(gameMode, selectedCampaigns.getContents())) + { + JOptionPane.showMessageDialog(AdvancedSourceSelectionPanel.this, + LanguageBundle.getString("in_src_badComboMsg"), //$NON-NLS-1$ + LanguageBundle.getString("in_src_badComboTitle"), //$NON-NLS-1$ + JOptionPane.INFORMATION_MESSAGE); + selectedCampaigns.removeElement(camp); + } } } rememberSelectedSources(); @@ -434,12 +438,15 @@ @Override public void actionPerformed(ActionEvent e) { - List<CampaignFacade> list = selectedTable.getSelectedData(); + List<Object> list = selectedTable.getSelectedData(); if (list != null && !list.isEmpty()) { - for (CampaignFacade camp : list) + for (Object obj : list) { - selectedCampaigns.removeElement(camp); + if (obj instanceof CampaignFacade) + { + selectedCampaigns.removeElement((CampaignFacade) obj); + } } rememberSelectedSources(); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java 2012-03-17 00:06:16 UTC (rev 16495) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java 2012-03-17 00:08:14 UTC (rev 16496) @@ -223,11 +223,15 @@ { if (!e.getValueIsAdjusting()) { - List<ClassFacade> data = availableTable.getSelectedData(); + List<Object> data = availableTable.getSelectedData(); ClassFacade clazz = null; - if (!data.isEmpty()) + for (Object object : data) { - clazz = data.get(0); + if (object instanceof ClassFacade) + { + clazz = (ClassFacade) object; + break; + } } setSelectedClass(clazz); } @@ -388,12 +392,21 @@ @Override protected Transferable createTransferable(JComponent c) { - List<ClassFacade> data = availableTable.getSelectedData(); - if (data.isEmpty()) + List<Object> data = availableTable.getSelectedData(); + ClassFacade selClassTemp = null; + for (Object object : data) { + if (object instanceof ClassFacade) + { + selClassTemp = (ClassFacade) object; + break; + } + } + if (selClassTemp == null) + { return null; } - final ClassFacade selClass = data.get(0); + final ClassFacade selClass = selClassTemp; return new Transferable() { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-03-17 00:06:16 UTC (rev 16495) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-03-17 00:08:14 UTC (rev 16496) @@ -114,7 +114,6 @@ private final JButton addEquipmentButton; private final JButton removeEquipmentButton; private final InfoPane infoPane; - private EquipmentFacade selectedItem; private final JFormattedTextField wealthLabel; private final JFormattedTextField goldField; private final JFormattedTextField goldModField; @@ -190,25 +189,6 @@ availableTable.getTree().setLargeModel(true); availableTable.setDisplayableFilter(filterBar); - availableTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() - { - - @Override - public void valueChanged(ListSelectionEvent e) - { - if (!e.getValueIsAdjusting()) - { - List<EquipmentFacade> data = availableTable.getSelectedData(); - EquipmentFacade equipment = null; - if (!data.isEmpty()) - { - equipment = data.get(0); - } - setSelectedItem(equipment); - } - } - - }); availableTable.sortModel(); panel.add(new JScrollPane(availableTable), BorderLayout.CENTER); @@ -234,25 +214,6 @@ panel.add(filterBar, BorderLayout.NORTH); purchasedTable.setDisplayableFilter(filterBar); - purchasedTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() - { - - @Override - public void valueChanged(ListSelectionEvent e) - { - if (!e.getValueIsAdjusting()) - { - List<EquipmentFacade> data = purchasedTable.getSelectedData(); - EquipmentFacade skill = null; - if (!data.isEmpty()) - { - skill = data.get(0); - } - setSelectedItem(skill); - } - } - - }); purchasedTable.setSortingPriority(Collections.singletonList(new SortingPriority(0, SortMode.ASCENDING))); purchasedTable.sortModel(); panel.add(new JScrollPane(purchasedTable), BorderLayout.CENTER); @@ -381,11 +342,6 @@ return label; } - private void setSelectedItem(EquipmentFacade item) - { - this.selectedItem = item; - } - private enum Models { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java 2012-03-17 00:06:16 UTC (rev 16495) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java 2012-03-17 00:08:14 UTC (rev 16496) @@ -255,11 +255,14 @@ @Override public void actionPerformed(ActionEvent e) { - List<TemplateFacade> data = availableTable.getSelectedData(); - for (TemplateFacade object : data) + List<Object> data = availableTable.getSelectedData(); + for (Object object : data) { - character.addTemplate(object); - return; + if (object instanceof TemplateFacade) + { + character.addTemplate((TemplateFacade) object); + return; + } } } @@ -290,11 +293,14 @@ @Override public void actionPerformed(ActionEvent e) { - List<TemplateFacade> data = selectedTable.getSelectedData(); - for (TemplateFacade object : data) + List<Object> data = selectedTable.getSelectedData(); + for (Object object : data) { - character.removeTemplate(object); - return; + if (object instanceof TemplateFacade) + { + character.removeTemplate((TemplateFacade) object); + return; + } } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-03-17 00:06:16 UTC (rev 16495) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-03-17 00:08:14 UTC (rev 16496) @@ -235,21 +235,23 @@ } /** - * This returns data that is currently highlighted by the user. - * @return + * This returns data that is currently highlighted by the user. This may + * include branch nodes which are of type Object and not the type managed by + * the table model. Hence we cannot use <T> here. + * @return A list of selected leaf and branch rows. */ - public List<T> getSelectedData() + public List<Object> getSelectedData() { TreePath[] paths = getTree().getSelectionPaths(); if (paths == null) { return Collections.emptyList(); } - List<T> data = new ArrayList<T>(paths.length); + List<Object> data = new ArrayList<Object>(paths.length); for (TreePath path : paths) { DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent(); - data.add((T) node.getUserObject()); + data.add(node.getUserObject()); } return data; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-05-06 21:52:38
|
Revision: 16702 http://pcgen.svn.sourceforge.net/pcgen/?rev=16702&view=rev Author: jdempsey Date: 2012-05-06 21:52:31 +0000 (Sun, 06 May 2012) Log Message: ----------- Save Table Column Widths Between PCGen Executions Issue#: CODE-526 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/kits/KitPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CompanionInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/DomainInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/RaceInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/spells/SpellNodeDataView.java Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/DataView.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/ChooserDialog.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -287,7 +287,16 @@ return chooser.getAvailableTableTitle(); } + /** + * {@inheritDoc} + */ @Override + public String getPrefsKey() + { + return chooser.getAvailableTableTitle(); + } + + @Override public List<TreeViewPath<InfoFacade>> getPaths(InfoFacade pobj) { List<TreeViewPath<InfoFacade>> paths = new ArrayList<TreeViewPath<InfoFacade>>(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/LanguageChooserDialog.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -256,7 +256,16 @@ return "Available Languages"; } + /** + * {@inheritDoc} + */ @Override + public String getPrefsKey() + { + return getViewName(); + } + + @Override public List<TreeViewPath<LanguageFacade>> getPaths(LanguageFacade pobj) { List<TreeViewPath<LanguageFacade>> paths = new ArrayList<TreeViewPath<LanguageFacade>>(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/kits/KitPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/kits/KitPanel.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/kits/KitPanel.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -320,6 +320,15 @@ return !context.getKits().containsElement(element); } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return isAvailModel ? "KitTreeAvail" : "KitTreeSelected"; //$NON-NLS-1$//$NON-NLS-2$ + } + } private enum TemplateTreeView implements TreeView<KitFacade> @@ -340,6 +349,7 @@ return name; } + @SuppressWarnings("unchecked") public List<TreeViewPath<KitFacade>> getPaths(KitFacade pobj) { switch (this) @@ -347,7 +357,9 @@ case NAME: return Collections.singletonList(new TreeViewPath<KitFacade>(pobj)); case TYPE_NAME: - TreeViewPath<KitFacade> path = createTreeViewPath(pobj, pobj.getDisplayType().split("\\.")); + TreeViewPath<KitFacade> path = + createTreeViewPath(pobj, (Object[]) pobj + .getDisplayType().split("\\.")); //$NON-NLS-1$ return Arrays.asList(path); case SOURCE_NAME: return Collections.singletonList(new TreeViewPath<KitFacade>(pobj, pobj.getSource())); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/sources/AdvancedSourceSelectionPanel.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -579,6 +579,15 @@ public void elementModified(ListEvent<CampaignFacade> e) { } + + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return isAvailModel ? "SourceAvail" : "SourceSelected"; //$NON-NLS-1$//$NON-NLS-2$ + } } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -276,7 +276,9 @@ this.title = title; this.categoryList = new DefaultListFacade<AbilityCategoryFacade>(); this.fullCategoryList = new DefaultListFacade<AbilityCategoryFacade>(); - this.tabData = abilityTab.createState(character, categoryList, fullCategoryList); + this.tabData = + abilityTab.createState(character, categoryList, + fullCategoryList, title); typeMap.put(title, this); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -200,17 +200,18 @@ private final ListFacade<? extends TreeView<AbilityFacade>> treeviews; private final CharacterFacade character; - private AbilityCategoryFacade category; private final ListFacade<AbilityCategoryFacade> categories; private final ListSelectionModel selectionModel; private final List<? extends DataViewColumn> dataColumns; private final InfoFactory infoFactory; + private final String title; public AvailableAbilityTreeViewModel(CharacterFacade character, ListFacade<AbilityCategoryFacade> categories, - ListSelectionModel selectionModel) + ListSelectionModel selectionModel, String tableTitle) { this.character = character; + this.title = tableTitle; this.treeviews = new DefaultListFacade<TreeView<AbilityFacade>>(AbilityTreeViews.createTreeViewList(character)); this.categories = categories; this.selectionModel = selectionModel; @@ -338,6 +339,15 @@ } } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return title; + } + } private class InfoHandler implements ListSelectionListener @@ -532,8 +542,8 @@ private static final String AVAILABLE_TREEVIEW_PANEL_STATE = "AvailableTreeViewPanelState"; public Hashtable<Object, Object> createState(CharacterFacade character, - ListFacade<AbilityCategoryFacade> categories, - ListFacade<AbilityCategoryFacade> fullCategoryList) + ListFacade<AbilityCategoryFacade> categories, + ListFacade<AbilityCategoryFacade> fullCategoryList, String title) { Hashtable<Object, Object> state = new Hashtable<Object, Object>(); CategoryTableModel categoryTableModel = new CategoryTableModel(character, fullCategoryList, categoryBar); @@ -543,7 +553,9 @@ listModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); state.put(ListSelectionModel.class, listModel); state.put(AbilityTreeTableModel.class, new AbilityTreeTableModel(character, categories)); - state.put(AvailableAbilityTreeViewModel.class, new AvailableAbilityTreeViewModel(character, fullCategoryList, listModel)); + state.put(AvailableAbilityTreeViewModel.class, + new AvailableAbilityTreeViewModel(character, fullCategoryList, + listModel, title)); //state.put(AbilityTransferHandler.class, new AbilityTransferHandler(character)); state.put(InfoHandler.class, new InfoHandler(character, categories)); state.put(AbilityRenderer.class, new AbilityRenderer(character)); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ClassInfoTab.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -494,7 +494,16 @@ this.character = character; } + /** + * {@inheritDoc} + */ @Override + public String getPrefsKey() + { + return "ClassTree"; //$NON-NLS-1$ + } + + @Override public ListFacade<? extends TreeView<ClassFacade>> getTreeViews() { return treeviews; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CompanionInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CompanionInfoTab.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/CompanionInfoTab.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -646,6 +646,15 @@ return Collections.emptyList(); } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return "CompanionAvail"; //$NON-NLS-1$ + } + } private enum CompanionTreeView implements TreeView<CompanionStubFacade> Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/DomainInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/DomainInfoTab.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/DomainInfoTab.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -674,6 +674,15 @@ return columns; } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return "DeityTree"; //$NON-NLS-1$ + } + } //TODO: pantheon view Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/PurchaseInfoTab.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -817,6 +817,15 @@ return columns; } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return "PurchaseAvail"; //$NON-NLS-1$ + } + } private class PurchasedTreeViewModel @@ -881,6 +890,15 @@ purchasedTable.refreshModelData(); } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return "Purchased"; //$NON-NLS-1$ + } + } private enum EquipmentTreeView implements TreeView<EquipmentFacade> Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/RaceInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/RaceInfoTab.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/RaceInfoTab.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -435,6 +435,15 @@ return columns; } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return isAvailModel ? "RaceTreeAvail" : "RaceTreeSelected"; //$NON-NLS-1$//$NON-NLS-2$ + } + } private enum RaceTreeView implements TreeView<RaceFacade> Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/TemplateInfoTab.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -432,6 +432,15 @@ return !context.getTemplates().containsElement(element); } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return isAvailModel ? "TemplateTreeAvail" : "TemplateTreeSelected"; //$NON-NLS-1$//$NON-NLS-2$ + } + } private enum TemplateTreeView implements TreeView<TemplateFacade> Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/skill/SkillTreeViewModel.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -116,7 +116,16 @@ return character.getDataSet().getSkills(); } + /** + * {@inheritDoc} + */ @Override + public String getPrefsKey() + { + return "SkillTreeAvail"; //$NON-NLS-1$ + } + + @Override public List<?> getData(SkillFacade obj) { if (selectionModel.isSelectionEmpty()) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/spells/SpellNodeDataView.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/spells/SpellNodeDataView.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/spells/SpellNodeDataView.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -54,4 +54,13 @@ return columns; } + /** + * {@inheritDoc} + */ + @Override + public String getPrefsKey() + { + return "SpellTree"; //$NON-NLS-1$ + } + } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/JTreeViewTable.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -26,10 +26,13 @@ import java.awt.Rectangle; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; + import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.ButtonGroup; @@ -51,9 +54,11 @@ import javax.swing.table.TableColumnModel; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; + import pcgen.core.facade.event.ListEvent; import pcgen.core.facade.event.ListListener; import pcgen.core.facade.util.ListFacade; +import pcgen.gui2.UIPropertyContext; import pcgen.gui2.util.event.DynamicTableColumnModelListener; import pcgen.gui2.util.table.DefaultDynamicTableColumnModel; import pcgen.gui2.util.table.DynamicTableColumnModel; @@ -63,6 +68,7 @@ import pcgen.gui2.util.treeview.TreeView; import pcgen.gui2.util.treeview.TreeViewModel; import pcgen.gui2.util.treeview.TreeViewTableModel; +import pcgen.system.PropertyContext; import pcgen.util.CollectionMaps; import pcgen.util.ListMap; @@ -81,7 +87,8 @@ * setAutoCreateColumnsFromModel(boolean); * @author Connor Petty <cpm...@us...> */ -public class JTreeViewTable<T> extends JTreeTable +@SuppressWarnings("serial") +public class JTreeViewTable<T> extends JTreeTable implements PropertyChangeListener { private final DynamicTableColumnModelListener listener = new DynamicTableColumnModelListener() @@ -114,13 +121,46 @@ protected TreeViewTableModel<T> treetableModel; private TreeViewModel<T> viewModel; private TreeViewsPopupMenu treeviewMenu = new TreeViewsPopupMenu(); + private PropertyContext baseContext; + /** + * Create a new instance of JTreeViewTable + */ public JTreeViewTable() { setTableHeader(new JTreeViewHeader()); setAutoCreateColumnsFromModel(false); + baseContext = UIPropertyContext.createContext("tablePrefs"); } + /** + * {@inheritDoc} + */ + @Override + public void propertyChange(PropertyChangeEvent evt) + { + if (isShowing() && "width".equals(evt.getPropertyName()) //$NON-NLS-1$ + && evt.getSource() instanceof TableColumn) + { + TableColumn col = (TableColumn) evt.getSource(); +// Logging.errorPrint("new width of " + evt.getNewValue() + " for " +// + this.viewModel.getDataView().getPrefsKey() + "." +// + normalisePrefsKey(col.getHeaderValue().toString()) + " from " +// + evt.getOldValue()); + PropertyContext context = + baseContext.createChildContext( + this.viewModel.getDataView().getPrefsKey()) + .createChildContext("width"); //$NON-NLS-1$ + context.setInt(normalisePrefsKey(col.getHeaderValue().toString()), (Integer) evt.getNewValue()); + } + + } + + private String normalisePrefsKey(String origKey) + { + return origKey.replaceAll("[^\\w\\.]", "_"); //$NON-NLS-1$ //$NON-NLS-2$ + } + protected <TM> TreeViewTableModel<TM> createDefaultTreeViewTableModel(DataView<TM> dataView) { return new TreeViewTableModel<TM>(dataView); @@ -141,12 +181,21 @@ @SuppressWarnings("unchecked") ListMap<Visibility, TableColumn, List<TableColumn>> listMap = CollectionMaps.createListMap(HashMap.class, ArrayList.class); + PropertyContext context = + baseContext.createChildContext( + this.viewModel.getDataView().getPrefsKey()) + .createChildContext("width"); //$NON-NLS-1$ int index = 1; for (DataViewColumn column : dataView.getDataColumns()) { TableColumn tableColumn = new TableColumn(index++); tableColumn.setHeaderValue(column.getName()); listMap.add(column.getVisibility(), tableColumn); + tableColumn + .setPreferredWidth(context.initInt( + normalisePrefsKey(tableColumn.getHeaderValue().toString()), + 75)); + tableColumn.addPropertyChangeListener(this); } List<TableColumn> columns = listMap.get(Visibility.ALWAYS_VISIBLE); @@ -158,6 +207,9 @@ TableColumn viewColumn = new TableColumn(); viewColumn.setHeaderValue(startingView.getViewName()); model.addColumn(viewColumn); + viewColumn.setPreferredWidth(context.initInt( + normalisePrefsKey(viewColumn.getHeaderValue().toString()), 150)); + viewColumn.addPropertyChangeListener(this); for (TableColumn column : columns) { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/DataView.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/DataView.java 2012-05-06 19:56:15 UTC (rev 16701) +++ Trunk/pcgen/code/src/java/pcgen/gui2/util/treeview/DataView.java 2012-05-06 21:52:31 UTC (rev 16702) @@ -39,4 +39,8 @@ List<? extends DataViewColumn> getDataColumns(); + /** + * @return The key that will be used to save any preferences for this data view. + */ + String getPrefsKey(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-05-12 23:24:44
|
Revision: 16721 http://pcgen.svn.sourceforge.net/pcgen/?rev=16721&view=rev Author: jdempsey Date: 2012-05-12 23:24:37 +0000 (Sat, 12 May 2012) Log Message: ----------- Fix bug: Equipment does not appear on first equipping Issue#: CODE-1428 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentTreeTableModel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-05-11 00:21:08 UTC (rev 16720) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-05-12 23:24:37 UTC (rev 16721) @@ -368,6 +368,8 @@ carriedWeightRef = new DefaultReferenceFacade<String>(); loadRef = new DefaultReferenceFacade<String>(); weightLimitRef = new DefaultReferenceFacade<String>(); + equipSet = new DefaultReferenceFacade<EquipmentSetFacade>(); + equipmentSets = new DefaultListFacade<EquipmentSetFacade>(); initEquipSet(pc); GameMode game = (GameMode) dataSet.getGameMode(); @@ -453,8 +455,6 @@ */ private void initEquipSet(PlayerCharacter pc) { - equipSet = new DefaultReferenceFacade<EquipmentSetFacade>(); - // Setup the default EquipSet if not already present if (pc.getEquipSet().size() == 0) { @@ -465,7 +465,8 @@ } // Make facades for each root equipset. - equipmentSets = new DefaultListFacade<EquipmentSetFacade>(); + List<EquipmentSetFacade> eqSetList = new ArrayList<EquipmentSetFacade>(); + EquipmentSetFacade currSet = null; String currIdPath = pc.getCalcEquipSetId(); for (EquipSet es : pc.getEquipSet()) { @@ -473,13 +474,18 @@ { final EquipmentSetFacadeImpl facade = new EquipmentSetFacadeImpl(delegate, pc, es, dataSet); - equipmentSets.addElement(facade); + eqSetList.add(facade); if (es.getIdPath().equals(currIdPath)) { - equipSet.setReference(facade); + currSet = facade; } } } + equipmentSets.setContents(eqSetList); + if (currSet != null) + { + equipSet.setReference(currSet); + } EquipmentSetFacade set = equipSet.getReference(); set.getEquippedItems().addListListener(this); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentTreeTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentTreeTableModel.java 2012-05-11 00:21:08 UTC (rev 16720) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/equip/EquipmentTreeTableModel.java 2012-05-12 23:24:37 UTC (rev 16721) @@ -43,8 +43,16 @@ import pcgen.util.ListMap; /** - * + * The model backing the selected table on the equipping tab. This controls the + * tree structure showing the equipment by its equipped location for a + * particular character and equipment set. + * + * <br/> + * Last Editor: $Author: $ + * Last Edited: $Date: $ + * * @author Connor Petty <cpm...@us...> + * @version $Revision: $ */ public class EquipmentTreeTableModel implements SortableTreeTableModel, ListListener<EquipNode>, EquipmentTreeListener { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-06-09 05:57:59
|
Revision: 16843 http://pcgen.svn.sourceforge.net/pcgen/?rev=16843&view=rev Author: jdempsey Date: 2012-06-09 05:57:53 +0000 (Sat, 09 Jun 2012) Log Message: ----------- Fix bug: Create Monster / Kit Box is too large for my screen (Close Button can't be reached) Issue#: CODE-1490 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/KitSelectionDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/KitSelectionDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/KitSelectionDialog.java 2012-06-09 04:14:08 UTC (rev 16842) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/KitSelectionDialog.java 2012-06-09 05:57:53 UTC (rev 16843) @@ -74,6 +74,7 @@ setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); initComponents(); pack(); + Utility.resizeDialogToScreen(this); } private void initComponents() Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java 2012-06-09 04:14:08 UTC (rev 16842) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tools/Utility.java 2012-06-09 05:57:53 UTC (rev 16843) @@ -152,7 +152,10 @@ // encapsulated to accomodate this with a hack. // TODO: remove the hack, once Java fixed this. // final Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - final Rectangle screenSize = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getBounds(); + final Rectangle screenSize = + GraphicsEnvironment.getLocalGraphicsEnvironment() + .getDefaultScreenDevice().getDefaultConfiguration() + .getBounds(); final Dimension dialogSize = dialog.getSize(); @@ -165,12 +168,35 @@ { dialogSize.width = screenSize.width; } - + dialog.setSize(dialogSize); + dialog.setLocation(screenSize.x + (screenSize.width - dialogSize.width) / 2, screenSize.y + (screenSize.height - dialogSize.height) / 2); } /** + * Update the size of the dialog to ensure it will fit on the screen. + * @param dialog The dialog to be resized. + */ + public static void resizeDialogToScreen(JDialog dialog) + { + Rectangle screenBounds = dialog.getGraphicsConfiguration().getBounds(); + + final Dimension dialogSize = dialog.getSize(); + + if (dialogSize.height > screenBounds.height) + { + dialogSize.height = screenBounds.height; + } + + if (dialogSize.width > screenBounds.width) + { + dialogSize.width = screenBounds.width; + } + dialog.setSize(dialogSize); + } + + /** * Centers a <code>JFrame</code> to the screen. * * @param frame JFrame frame to center This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-06-23 13:26:06
|
Revision: 16892 http://pcgen.svn.sourceforge.net/pcgen/?rev=16892&view=rev Author: jdempsey Date: 2012-06-23 13:26:00 +0000 (Sat, 23 Jun 2012) Log Message: ----------- Fix bug: Removing levels causes error * Add telemetry for removing levels. * Fix incorrect mapping of class level numbers when loading and refreshing. * Block invalid level counts when adding and removing levels. * Add protective code for odd situations Issue#: CODE-1497 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-06-22 20:02:52 UTC (rev 16891) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-06-23 13:26:00 UTC (rev 16892) @@ -730,6 +730,9 @@ pcClassLevels.removeElement(pcClassLevels.getSize() - 1); if (classFacade instanceof PCClass) { + Logging.log(Logging.INFO, theCharacter.getName() + + ": Removing level " + (pcClassLevels.getSize()+1) //$NON-NLS-1$ + + " in class " + classFacade); //$NON-NLS-1$ theCharacter.incrementClassLevel(-1, (PCClass) classFacade); } charLevelsFacade.removeLastLevel(); @@ -1312,11 +1315,9 @@ List<PCClass> newClasses = theCharacter.getClassList(); Collection<PCLevelInfo> levelInfo = theCharacter.getLevelInfo(); - Map<String, Integer> levelCount = new HashMap<String, Integer>(); Map<String, PCClass> classMap = new HashMap<String, PCClass>(); for (PCClass pcClass : newClasses) { - levelCount.put(pcClass.getKeyName(), 0); classMap.put(pcClass.getKeyName(), pcClass); } @@ -1331,10 +1332,7 @@ return; } - int clsLvlNum = levelCount.get(classKeyName); - levelCount.put(classKeyName, clsLvlNum + 1); - //PCClassLevel classLevel = currClass.getClassLevel(clsLvlNum); - CharacterLevelFacadeImpl cl = new CharacterLevelFacadeImpl(currClass, theCharacter, clsLvlNum + 1); + CharacterLevelFacadeImpl cl = new CharacterLevelFacadeImpl(currClass, theCharacter, newlevels.size() + 1); newlevels.add(cl); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2012-06-22 20:02:52 UTC (rev 16891) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterLevelsFacadeImpl.java 2012-06-23 13:26:00 UTC (rev 16892) @@ -104,6 +104,10 @@ @Override public CharacterLevelFacade getElementAt(int index) { + if (index < 0 || index >= charLevels.size()) + { + return null; + } return charLevels.get(index); } @@ -397,6 +401,10 @@ public int getSpentSkillPoints(CharacterLevelFacade level) { PCLevelInfo classLevel = getLevelInfo(level); + if (classLevel == null) + { + return 0; + } return classLevel.getSkillPointsGained(theCharacter) - classLevel.getSkillPointsRemaining(); } @@ -408,6 +416,10 @@ public int getRemainingSkillPoints(CharacterLevelFacade level) { PCLevelInfo classLevel = getLevelInfo(level); + if (classLevel == null) + { + return 0; + } return classLevel.getSkillPointsRemaining(); } Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java 2012-06-22 20:02:52 UTC (rev 16891) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/SummaryInfoTab.java 2012-06-23 13:26:00 UTC (rev 16892) @@ -1392,9 +1392,12 @@ if (c != null) { Number levels = (Number) addLevelsField.getValue(); - ClassFacade[] classes = new ClassFacade[levels.intValue()]; - Arrays.fill(classes, c); - character.addCharacterLevels(classes); + if (levels.intValue() >= 0) + { + ClassFacade[] classes = new ClassFacade[levels.intValue()]; + Arrays.fill(classes, c); + character.addCharacterLevels(classes); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-06-25 13:20:29
|
Revision: 16898 http://pcgen.svn.sourceforge.net/pcgen/?rev=16898&view=rev Author: jdempsey Date: 2012-06-25 13:20:18 +0000 (Mon, 25 Jun 2012) Log Message: ----------- Fix bug: Ability Pool deselected after choice made Issue#: CODE-1464 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ability/CategoryTableModel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java 2012-06-25 11:13:21 UTC (rev 16897) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterAbilities.java 2012-06-25 13:20:18 UTC (rev 16898) @@ -379,6 +379,7 @@ { masterListFacade.updateContentsNoOrder(workingListFacade.getContents()); } + updateAbilityCategoryTodo((AbilityCategory)category); } Set<AbilityCategoryFacade> origCats = new HashSet<AbilityCategoryFacade>(abilityListMap.keySet()); @@ -393,8 +394,8 @@ else { abilityListMap.remove(category); - updateAbilityCategoryTodo((AbilityCategory)category); } + updateAbilityCategoryTodo((AbilityCategory)category); } } activeCategories.updateContents(workingActiveCategories.getContents()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java 2012-06-25 11:13:21 UTC (rev 16897) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilityChooserTab.java 2012-06-25 13:20:18 UTC (rev 16898) @@ -555,7 +555,7 @@ ListFacade<AbilityCategoryFacade> fullCategoryList, String title) { Hashtable<Object, Object> state = new Hashtable<Object, Object>(); - CategoryTableModel categoryTableModel = new CategoryTableModel(character, fullCategoryList, categoryBar); + CategoryTableModel categoryTableModel = new CategoryTableModel(character, fullCategoryList, categoryBar, categoryTable); state.put(CategoryTableModel.class, categoryTableModel); ListSelectionModel listModel = new DefaultListSelectionModel(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ability/CategoryTableModel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ability/CategoryTableModel.java 2012-06-25 11:13:21 UTC (rev 16897) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/ability/CategoryTableModel.java 2012-06-25 13:20:18 UTC (rev 16898) @@ -20,6 +20,8 @@ */ package pcgen.gui2.tabs.ability; +import javax.swing.JTable; + import pcgen.core.facade.AbilityCategoryFacade; import pcgen.core.facade.CharacterFacade; import pcgen.core.facade.event.ChangeEvent; @@ -35,11 +37,15 @@ public class CategoryTableModel extends FilteredListFacadeTableModel<AbilityCategoryFacade> implements ChangeListener { + boolean installed = false; + private final JTable categoryTable; + public CategoryTableModel(CharacterFacade character, ListFacade<AbilityCategoryFacade> categories, - Filter<CharacterFacade, AbilityCategoryFacade> filter) + Filter<CharacterFacade, AbilityCategoryFacade> filter, JTable theCategoryTable) { super(character); + this.categoryTable = theCategoryTable; setDelegate(categories); setFilter(filter); } @@ -120,6 +126,15 @@ @Override public void ItemChanged(ChangeEvent event) { + AbilityCategoryFacade facade = null; + if (installed) + { + int selectedRow = categoryTable.getSelectedRow(); + if (selectedRow >= 0 && selectedRow < sortedList.getSize()) + { + facade = sortedList.getElementAt(selectedRow); + } + } Object data = event.getSource(); refilter(); for (int i = 0; i < getRowCount(); i++) @@ -129,8 +144,19 @@ { fireTableRowsUpdated(i, i); } - } + + if (facade != null) + { + for (int i = 0; i < sortedList.getSize(); i++) + { + if (facade == sortedList.getElementAt(i)) + { + categoryTable.getSelectionModel().setSelectionInterval(i, i); + break; + } + } + } } /** @@ -139,6 +165,7 @@ public void install() { character.addAbilityCatSelectionListener(this); + installed = true; } /** @@ -146,6 +173,7 @@ */ public void uninstall() { + installed = false; character.removeAbilityCatSelectionListener(this); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |