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