From: <jde...@us...> - 2007-07-03 09:57:09
|
Revision: 3296 http://svn.sourceforge.net/pcgen/?rev=3296&view=rev Author: jdempsey Date: 2007-07-03 02:57:11 -0700 (Tue, 03 Jul 2007) Log Message: ----------- Fix bug: Template sorting requires double click to open sub tree Issue#: 1734820 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java Trunk/pcgen/code/src/java/pcgen/gui/utils/LabelTreeCellRenderer.java Modified: Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java 2007-07-03 01:50:15 UTC (rev 3295) +++ Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java 2007-07-03 09:57:11 UTC (rev 3296) @@ -1253,6 +1253,8 @@ setSpellsTab_SelectedListMode(getPCGenOption("SpellsTab.selectedListMode", GuiConstants.INFOSPELLS_VIEW_CLASS)); //$NON-NLS-1$ setSummaryTabShown(getPCGenOption("summaryTabShown", true)); //$NON-NLS-1$ setTabPlacement(getOptionTabPlacement("tabPlacement", SwingConstants.BOTTOM)); //$NON-NLS-1$ + setTemplateSelTab_ListMode(getPCGenOption("TemplateTab.selectedListMode", GuiConstants.INFOTEMPLATE_VIEW_NAME)); //$NON-NLS-1$ + setTemplateTab_ListMode(getPCGenOption("TemplateTab.availableListMode", GuiConstants.INFOTEMPLATE_VIEW_NAME)); //$NON-NLS-1$ setToolTipTextShown(getPCGenOption("toolTipTextShown", true)); //$NON-NLS-1$ setUseHigherLevelSlotsDefault(getPCGenOption("useHigherLevelSlotsDefault", false)); //$NON-NLS-1$ setUseWaitCursor(getPCGenOption("useWaitCursor", true)); //$NON-NLS-1$ @@ -1586,6 +1588,8 @@ setPCGenOption("SpellsTab.selectedListMode", getSpellsTab_SelectedListMode()); //$NON-NLS-1$ setPCGenOption("summaryTabShown", isSummaryTabShown()); //$NON-NLS-1$ setPCGenOption("tabPlacement", convertTabPlacementToString(tabPlacement)); //$NON-NLS-1$ + setPCGenOption("TemplateTab.availableListMode", getTemplateTab_ListMode()); //$NON-NLS-1$ + setPCGenOption("TemplateTab.selectedListMode", getTemplateSelTab_ListMode()); //$NON-NLS-1$ setPCGenOption("toolTipTextShown", isToolTipTextShown()); //$NON-NLS-1$ setPCGenOption("useHigherLevelSlotsDefault", isUseHigherLevelSlotsDefault()); //$NON-NLS-1$ setPCGenOption("useMonsterDefault", isUseMonsterDefault()); //$NON-NLS-1$ Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java 2007-07-03 01:50:15 UTC (rev 3295) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java 2007-07-03 09:57:11 UTC (rev 3296) @@ -1,5 +1,5 @@ /* - * InfoRace.java + * InfoTemplate.java * Copyright 2002 (C) Bryan McRoberts * * This library is free software; you can redistribute it and/or @@ -346,7 +346,8 @@ // View List Sanity check // int iView = SettingsHandler.getTemplateTab_ListMode(); - if (iView >= GuiConstants.INFOTEMPLATE_VIEW_NAME) + if (iView >= GuiConstants.INFOTEMPLATE_VIEW_NAME + && iView <= GuiConstants.INFOTEMPLATE_VIEW_SOURCE_NAME) { viewMode = iView; } @@ -357,9 +358,10 @@ viewComboBox.setSelectedIndex(viewMode); iView = SettingsHandler.getTemplateSelTab_ListMode(); - if (iView >= GuiConstants.INFOTEMPLATE_VIEW_NAME) + if (iView >= GuiConstants.INFOTEMPLATE_VIEW_NAME + && iView <= GuiConstants.INFOTEMPLATE_VIEW_SOURCE_NAME) { - viewMode = iView; + viewSelMode = iView; } SettingsHandler.setTemplateSelTab_ListMode(viewSelMode); viewSelComboBox.addItem(PropertyFactory.getString("in_nameLabel")); @@ -1052,11 +1054,6 @@ + COL_NAMES[4], false))); } - public boolean isCellEditable(Object node, int column) - { - return false; - } - /** * Returns Class for the column. * @param column Modified: Trunk/pcgen/code/src/java/pcgen/gui/utils/LabelTreeCellRenderer.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/utils/LabelTreeCellRenderer.java 2007-07-03 01:50:15 UTC (rev 3295) +++ Trunk/pcgen/code/src/java/pcgen/gui/utils/LabelTreeCellRenderer.java 2007-07-03 09:57:11 UTC (rev 3296) @@ -104,10 +104,22 @@ int bi = stringValue.indexOf("|"); int ei = stringValue.lastIndexOf("|"); + Color tempColor = null; if (bi > -1 && bi != ei) { final String aString = stringValue.substring(bi + 1, ei); - myColor = new Color(Integer.parseInt(aString)); + try + { + tempColor = new Color(Integer.parseInt(aString)); + } + catch (NumberFormatException e) + { + // Ignore - expected. + } + } + if (bi > -1 && bi != ei && tempColor != null) + { + myColor = tempColor; stringValue = stringValue.substring(0, bi) + stringValue.substring(ei + 1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |