From: <jde...@us...> - 2010-10-26 11:01:01
|
Revision: 13570 http://pcgen.svn.sourceforge.net/pcgen/?rev=13570&view=rev Author: jdempsey Date: 2010-10-26 11:00:53 +0000 (Tue, 26 Oct 2010) Log Message: ----------- Fix bug: PCGen no longer saves gui options correctly - backport from 5.16 branch Issue#: CODE-354 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoKnownSpells.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoPreparedSpells.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoSpellBooks.java Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -41,6 +41,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -893,6 +895,31 @@ selectedTable.addMouseListener(new JTreeTableMouseAdapter( selectedTable, new SelectedClickHandler(), false)); + asplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocations(); + } + }); + bsplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocations(); + } + }); + splitPane.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocations(); + } + }); + textQFilter.getDocument().addDocumentListener(new DocumentListener() { public void changedUpdate(DocumentEvent evt) @@ -1140,6 +1167,35 @@ rightPane.add(rightBottomPanel, BorderLayout.SOUTH); } + private void saveDividerLocations() + { + if (!hasBeenSized) + { + return; + } + + int s = splitPane.getDividerLocation(); + + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoClasses.splitPane", s); //$NON-NLS-1$ + } + + s = asplit.getDividerLocation(); + + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoClasses.asplit", s); //$NON-NLS-1$ + } + + s = bsplit.getDividerLocation(); + + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoClasses.bsplit", s); //$NON-NLS-1$ + } + } + private boolean maybeSetExperience(int xp) { // Skip this processing if we have already been through Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -50,6 +50,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -1099,6 +1101,55 @@ } }); + splitPane.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) + { + if (hasBeenSized) + { + int s = splitPane.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption( + "InfoDomain.splitPane", s); + } + } + } + }); + bSplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) + { + if (hasBeenSized) + { + int s = bSplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoDomain.bSplit", + s); + } + } + } + }); + aSplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) + { + if (hasBeenSized) + { + int s = aSplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoDomain.aSplit", + s); + } + } + } + }); + } private void viewComboBoxActionPerformed() Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -43,6 +43,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -3248,33 +3250,30 @@ formComponentShown(); } }); - addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + asplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - int s = splitPane.getDividerLocation(); - - if (s > 0) + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler - .setPCGenOption("InfoEquipping.splitPane", s); + saveDividerLocations(); } - - s = asplit.getDividerLocation(); - - if (s > 0) + }); + bsplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoEquipping.asplit", s); + saveDividerLocations(); } - - s = bsplit.getDividerLocation(); - - if (s > 0) + }); + splitPane.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoEquipping.bsplit", s); + saveDividerLocations(); } - } - }); + }); viewEqSetButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) @@ -3371,6 +3370,35 @@ }); } + private void saveDividerLocations() + { + if (!hasBeenSized) + { + return; + } + + int s = splitPane.getDividerLocation(); + + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoEquipping.splitPane", s); //$NON-NLS-1$ + } + + s = asplit.getDividerLocation(); + + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoEquipping.asplit", s); //$NON-NLS-1$ + } + + s = bsplit.getDividerLocation(); + + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoEquipping.bsplit", s); //$NON-NLS-1$ + } + } + /** * This method is called from within the constructor to * initialize the form. Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -44,6 +44,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; @@ -1883,33 +1885,31 @@ { formComponentShown(); } - - public void componentResized(ComponentEvent e) - { - saveDividerLocs(); - } }); - asplit.addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + asplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - saveDividerLocs(); - } - }); - bsplit.addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocs(); + } + }); + bsplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - saveDividerLocs(); - } - }); - splitPane.addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocs(); + } + }); + splitPane.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() { - saveDividerLocs(); - } - }); + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocs(); + } + }); removeButton.addActionListener(sellOneListener); addButton.addActionListener(buyOneListener); @@ -2030,6 +2030,11 @@ */ public void saveDividerLocs() { + if (!hasBeenSized) + { + return; + } + int s = splitPane.getDividerLocation(); if (s > 0) { Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -41,6 +41,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -520,6 +522,7 @@ sCol.addPropertyChangeListener(new ResizeColumnListener( raceTable, "Race", i)); } + hasBeenSized = true; } if (t > 0) @@ -544,18 +547,23 @@ formComponentShown(); } }); - addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + bsplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - int s = bsplit.getDividerLocation(); - - if (s > 0) + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoRace.bsplit", s); + if (hasBeenSized) + { + int s = bsplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler + .setPCGenOption("InfoRace.bsplit", s); + } + } } - } - }); + }); + selButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -54,6 +54,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.File; import java.util.ArrayList; import java.util.List; @@ -1650,35 +1652,30 @@ formComponentShown(); } }); - addComponentListener(new ComponentAdapter() - { - @Override - public void componentResized(@SuppressWarnings("unused") - ComponentEvent e) + topSplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - int i = topSplit.getDividerLocation(); - - if (i > 0) + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoResources.topSplit", i); //$NON-NLS-1$ + saveDividerLocations(); } - - i = botSplit.getDividerLocation(); - - if (i > 0) + }); + botSplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoResources.botSplit", i); //$NON-NLS-1$ + saveDividerLocations(); } - - i = centerSplit.getDividerLocation(); - - if (i > 0) + }); + centerSplit.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption( - "InfoResources.centerSplit", i); //$NON-NLS-1$ + saveDividerLocations(); } - } - }); + }); addButton.addActionListener(new ActionListener() { public void actionPerformed(@SuppressWarnings("unused") @@ -1774,6 +1771,32 @@ }); } + private void saveDividerLocations() + { + if (!hasBeenSized) + { + return; + } + + int s = topSplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoResources.topSplit", s); //$NON-NLS-1$ + } + + s = botSplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoResources.botSplit", s); //$NON-NLS-1$ + } + + s = centerSplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoResources.centerSplit", s); //$NON-NLS-1$ + } + } + /** * This method is called from within the constructor to * initialize the form. Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -53,6 +53,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collections; import java.util.EventObject; @@ -1269,6 +1271,7 @@ { splitPane.setDividerLocation(s); SettingsHandler.setPCGenOption("InfoSkills.splitPane", s); //$NON-NLS-1$ + Logging.errorPrint("Saved splitpane loc of " + s); } if (t > 0) @@ -1309,34 +1312,30 @@ } } }); - addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + asplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - saveDividerLocations(); - } - }); - asplit.addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocations(); + } + }); + bsplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - saveDividerLocations(); - } - }); - bsplit.addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocations(); + } + }); + splitPane.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() { - saveDividerLocations(); - } - }); - splitPane.addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) - { - saveDividerLocations(); - } - }); + public void propertyChange(PropertyChangeEvent evt) + { + saveDividerLocations(); + } + }); removeButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) @@ -2084,6 +2083,11 @@ private void saveDividerLocations() { + if (!hasBeenSized) + { + return; + } + int s = splitPane.getDividerLocation(); if (s > 0) Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -42,6 +42,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -1295,32 +1297,30 @@ formComponentShown(); } }); - addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + topVertSplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - int s = topVertSplit.getDividerLocation(); - - if (s > 0) + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoTempMod.topVertSplit", s); //$NON-NLS-1$ + saveDividerLocations(); } - - s = botHorzSplit.getDividerLocation(); - - if (s > 0) + }); + botHorzSplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoTempMod.botHorzSplit", s); //$NON-NLS-1$ + saveDividerLocations(); } - - s = centerHorzSplit.getDividerLocation(); - - if (s > 0) + }); + centerHorzSplit.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption( "InfoTempMod.centerHorzSplit", s); //$NON-NLS-1$ + saveDividerLocations(); } - } - }); + }); applyBonusButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) @@ -1347,6 +1347,32 @@ */ } + private void saveDividerLocations() + { + if (!hasBeenSized) + { + return; + } + + int s = topVertSplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoTempMod.topVertSpli", s); //$NON-NLS-1$ + } + + s = botHorzSplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoTempMod.botHorzSplit", s); //$NON-NLS-1$ + } + + s = centerHorzSplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoTempMod.centerHorzSplit", s); //$NON-NLS-1$ + } + } + /** * This method is called from within the constructor to * initialize the form. Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -39,6 +39,8 @@ import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -202,30 +204,31 @@ refresh(); } }); - addComponentListener(new ComponentAdapter() - { - public void componentShown(ComponentEvent evt) + split.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() { - formComponentShown(); - } + public void propertyChange(PropertyChangeEvent evt) + { + if (hasBeenSized) + { + int s = split.getDividerLocation(); - public void componentResized(ComponentEvent e) - { - int s = split.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption( + "InfoTemplates.asplit", s); + } - if (s > 0) - { - SettingsHandler.setPCGenOption("InfoTemplates.asplit", s); - } + s = bsplit.getDividerLocation(); - s = bsplit.getDividerLocation(); - - if (s > 0) - { - SettingsHandler.setPCGenOption("InfoTemplates.bsplit", s); + if (s > 0) + { + SettingsHandler.setPCGenOption( + "InfoTemplates.bsplit", s); + } + } } - } - }); + }); removeButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) @@ -758,6 +761,7 @@ sCol.addPropertyChangeListener(new ResizeColumnListener( availableTable, "Template", i)); } + hasBeenSized = true; } if (t > 0) Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoKnownSpells.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoKnownSpells.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoKnownSpells.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -35,6 +35,8 @@ import java.awt.event.ComponentEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.BufferedWriter; import java.io.File; import java.io.FileOutputStream; @@ -317,32 +319,54 @@ formComponentShown(); } }); - addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + splitPane.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() { - int s = splitPane.getDividerLocation(); - - if (s > 0) + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoKnownSpells.splitPane", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = splitPane.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption( + "InfoKnownSpells.splitPane", s); + } + } } - - s = asplit.getDividerLocation(); - - if (s > 0) + }); + bsplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoKnownSpells.asplit", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = bsplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoKnownSpells.bsplit", + s); + } + } } - - s = bsplit.getDividerLocation(); - - if (s > 0) + }); + asplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoKnownSpells.bsplit", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = asplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoKnownSpells.asplit", + s); + } + } } - } - }); + }); shouldAutoSpells.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoPreparedSpells.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoPreparedSpells.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoPreparedSpells.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -1,5 +1,5 @@ /* - * InfoKnownSpells.java + * InfoPrepSpells.java * Copyright 2006 (C) James Dempsey <jde...@us...> * * This library is free software; you can redistribute it and/or @@ -34,6 +34,8 @@ import java.awt.event.ComponentEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -135,7 +137,7 @@ private boolean hasBeenSized = false; /** - * Constructor for the InfoKnownSpells object + * Constructor for the InfoPrepSpells object * * @param pc The character this tab is being created to display. */ @@ -327,32 +329,54 @@ formComponentShown(); } }); - addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + splitPane.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() { - int s = splitPane.getDividerLocation(); - - if (s > 0) + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoPrepSpells.splitPane", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = splitPane.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption( + "InfoPrepSpells.splitPane", s); + } + } } - - s = asplit.getDividerLocation(); - - if (s > 0) + }); + bsplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoPrepSpells.asplit", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = bsplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoPrepSpells.bsplit", + s); + } + } } - - s = bsplit.getDividerLocation(); - - if (s > 0) + }); + asplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoPrepSpells.bsplit", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = asplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoPrepSpells.asplit", + s); + } + } } - } - }); + }); canUseHigherSlots.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoSpellBooks.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoSpellBooks.java 2010-10-26 06:50:40 UTC (rev 13569) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/InfoSpellBooks.java 2010-10-26 11:00:53 UTC (rev 13570) @@ -1,5 +1,5 @@ /* - * InfoKnownSpells.java + * InfoSpellBooks.java * Copyright 2006 (C) James Dempsey <jde...@us...> * * This library is free software; you can redistribute it and/or @@ -34,6 +34,8 @@ import java.awt.event.ComponentEvent; import java.awt.event.FocusAdapter; import java.awt.event.FocusEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -278,33 +280,54 @@ formComponentShown(); } }); - addComponentListener(new ComponentAdapter() - { - public void componentResized(ComponentEvent e) + splitPane.addPropertyChangeListener( + JSplitPane.DIVIDER_LOCATION_PROPERTY, new PropertyChangeListener() { - int s = splitPane.getDividerLocation(); - - if (s > 0) + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption( - "InfoSpellBooks.splitPane", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = splitPane.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption( + "InfoSpellBooks.splitPane", s); + } + } } - - s = asplit.getDividerLocation(); - - if (s > 0) + }); + bsplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoSpellBooks.asplit", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = bsplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoSpellBooks.bsplit", + s); + } + } } - - s = bsplit.getDividerLocation(); - - if (s > 0) + }); + asplit.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY, + new PropertyChangeListener() + { + public void propertyChange(PropertyChangeEvent evt) { - SettingsHandler.setPCGenOption("InfoSpellBooks.bsplit", s); //$NON-NLS-1$ + if (hasBeenSized) + { + int s = asplit.getDividerLocation(); + if (s > 0) + { + SettingsHandler.setPCGenOption("InfoSpellBooks.asplit", + s); + } + } } - } - }); + }); addSpellButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |