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. |