From: <th...@us...> - 2012-03-01 22:28:21
|
Revision: 16397 http://pcgen.svn.sourceforge.net/pcgen/?rev=16397&view=rev Author: thpr Date: 2012-03-01 22:28:14 +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/prefs/CharacterStatsPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ColorsPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/CopySettingsPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DisplayOptionsPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LanguagePanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LocationPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LookAndFeelPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/NewPurchaseMethodDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/OutputPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/PurchaseModeFrame.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java Trunk/pcgen/code/src/java/pcgen/gui2/prefs/TabsPanel.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/CharacterStatsPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/CharacterStatsPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/CharacterStatsPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -346,6 +346,7 @@ // add a listener to know when the window has closed pmsFrame.addWindowListener(new WindowAdapter() { + @Override public void windowClosed(WindowEvent e) { Collection<PointBuyMethod> methods = SettingsHandler @@ -412,6 +413,7 @@ { scoreListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { abilitiesAllSameButton.setSelected(true); @@ -420,6 +422,7 @@ purchaseModeListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { abilitiesPurchasedButton.setSelected(true); @@ -428,6 +431,7 @@ rolledModeListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { abilitiesRolledButton.setSelected(true); @@ -532,6 +536,7 @@ /* (non-Javadoc) * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ + @Override public void actionPerformed(ActionEvent actionEvent) { showPurchaseModeConfiguration(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ColorsPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ColorsPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/ColorsPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -163,6 +163,7 @@ private final class PrefsButtonListener implements ActionListener { + @Override public void actionPerformed(ActionEvent actionEvent) { JButton source = (JButton) actionEvent.getSource(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/CopySettingsPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/CopySettingsPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/CopySettingsPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -173,6 +173,7 @@ /* (non-Javadoc) * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ + @Override public void actionPerformed(ActionEvent actionEvent) { GameMode gmFrom = (GameMode) gameModeSelect.getSelectedItem(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DisplayOptionsPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DisplayOptionsPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/DisplayOptionsPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -176,6 +176,7 @@ label.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(final MouseEvent e) { checkbox.setSelected(!checkbox.isSelected()); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LanguagePanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LanguagePanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LanguagePanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -120,6 +120,7 @@ final SortedSet<JRadioButton> sorted = new TreeSet<JRadioButton>(new Comparator<JRadioButton>() { + @Override public int compare(final JRadioButton o1, final JRadioButton o2) { @@ -332,6 +333,7 @@ /** * {@inheritDoc} */ + @Override public boolean needsRestart() { String langCountry[] = getSelectedLangCountry(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LocationPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LocationPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LocationPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -434,6 +434,7 @@ pcgenFilesDirRadio.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { pcgenFilesDir.setText(System.getProperty("user.dir")); @@ -442,6 +443,7 @@ }); usersFilesDirRadio.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { pcgenFilesDir.setText(System.getProperty("user.home") @@ -451,6 +453,7 @@ }); selectFilesDirRadio.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { pcgenFilesDir.setText(""); @@ -562,6 +565,7 @@ private final class PrefsButtonListener implements ActionListener { + @Override public void actionPerformed(ActionEvent actionEvent) { JButton source = (JButton) actionEvent.getSource(); @@ -754,6 +758,7 @@ /** * @see java.awt.event.FocusListener#focusGained(FocusEvent) */ + @Override public void focusGained(FocusEvent e) { // reset variables @@ -771,6 +776,7 @@ /** * @see java.awt.event.FocusListener#focusLost(FocusEvent) */ + @Override public void focusLost(FocusEvent e) { // Check the source to see if it was a text field Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LookAndFeelPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LookAndFeelPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/LookAndFeelPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -208,12 +208,14 @@ static final class ThemePackFilter extends FileFilter { // The description of this filter + @Override public String getDescription() { return "Themepacks (*themepack.zip)"; } // Accept all directories and themepack.zip files. + @Override public boolean accept(File f) { if (f.isDirectory()) @@ -258,6 +260,7 @@ /** * {@inheritDoc} */ + @Override public boolean needsRestart() { boolean needsRestart = false; @@ -305,6 +308,7 @@ private final class PrefsButtonListener implements ActionListener { + @Override public void actionPerformed(ActionEvent actionEvent) { JButton source = (JButton) actionEvent.getSource(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/NewPurchaseMethodDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/NewPurchaseMethodDialog.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/NewPurchaseMethodDialog.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -144,6 +144,7 @@ setTitle("Enter name and points for Purchase Method"); addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent evt) { closeDialog(); @@ -191,6 +192,7 @@ buttonPanel.add(cancelButton); cancelButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { cancelButtonActionPerformed(); @@ -202,6 +204,7 @@ buttonPanel.add(okButton); okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { okButtonActionPerformed(); Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/OutputPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/OutputPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/OutputPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -470,6 +470,7 @@ private final class PrefsButtonListener implements ActionListener { + @Override public void actionPerformed(ActionEvent actionEvent) { JButton source = (JButton) actionEvent.getSource(); @@ -640,6 +641,7 @@ /** * @see java.awt.event.FocusListener#focusGained(FocusEvent) */ + @Override public void focusGained(FocusEvent e) { // reset variables @@ -657,6 +659,7 @@ /** * @see java.awt.event.FocusListener#focusLost(FocusEvent) */ + @Override public void focusLost(FocusEvent e) { // Check the source to see if it was a text field Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/PurchaseModeFrame.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/PurchaseModeFrame.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/PurchaseModeFrame.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -243,6 +243,7 @@ okButton = new JButton(); okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { CustomData.writePurchaseModeConfiguration(); @@ -257,6 +258,7 @@ setTitle(s_TITLE); addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent evt) { exitForm(); @@ -274,6 +276,7 @@ purchaseScoreMinEdit.setPreferredSize(new Dimension(30, 20)); purchaseScoreMinEdit.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { purchaseScoreMinValueActionPerformed(); @@ -296,6 +299,7 @@ purchaseScoreMinIncreaseButton.setPreferredSize(new Dimension(30, 20)); purchaseScoreMinIncreaseButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { purchaseScoreMinIncreaseButtonActionPerformed(); @@ -310,6 +314,7 @@ purchaseScoreMinDecreaseButton.setPreferredSize(new Dimension(30, 20)); purchaseScoreMinDecreaseButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { purchaseScoreMinDecreaseButtonActionPerformed(); @@ -337,6 +342,7 @@ purchaseScoreMaxEdit.setPreferredSize(new Dimension(30, 20)); purchaseScoreMaxEdit.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { purchaseScoreMaxValueActionPerformed(); @@ -359,6 +365,7 @@ purchaseScoreMaxIncreaseButton.setPreferredSize(new Dimension(30, 20)); purchaseScoreMaxIncreaseButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { purchaseScoreMaxIncreaseButtonActionPerformed(); @@ -373,6 +380,7 @@ purchaseScoreMaxDecreaseButton.setPreferredSize(new Dimension(30, 20)); purchaseScoreMaxDecreaseButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { purchaseScoreMaxDecreaseButtonActionPerformed(); @@ -439,6 +447,7 @@ currentPurchaseMethods.setPreferredSize(new Dimension(140, 21)); currentPurchaseMethods.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { currentPurchaseMethodsActionPerformed(); @@ -449,6 +458,7 @@ addMethodButton.setText("New"); addMethodButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { addMethodButtonActionPerformed(); @@ -458,6 +468,7 @@ removeMethodButton.setText("Remove"); removeMethodButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { removeMethodButtonActionPerformed(); @@ -491,6 +502,7 @@ okButton.setToolTipText("Accept these values"); okButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { okButtonActionPerformed(); @@ -503,6 +515,7 @@ resetButton.setToolTipText("Reset to saved values"); resetButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { resetButtonActionPerformed(); @@ -514,6 +527,7 @@ cancelButton.setToolTipText("Cancel Purchase Mode Configuration"); cancelButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { cancelButtonActionPerformed(); @@ -877,31 +891,37 @@ copySavedToCurrent(); } + @Override public boolean isCellEditable(int rowIndex, int columnIndex) { return canEdit[columnIndex]; } + @Override public Class<?> getColumnClass(int columnIndex) { return types[columnIndex]; } + @Override public int getColumnCount() { return columnHeaders.length; } + @Override public String getColumnName(int param) { return columnHeaders[param]; } + @Override public int getRowCount() { return currentValues.length; } + @Override public void setValueAt(Object obj, int row, int column) { if ((row < 0) || (row >= currentValues.length)) @@ -920,6 +940,7 @@ } } + @Override public Object getValueAt(int row, int column) { if ((row < 0) || (row >= currentValues.length)) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/SourcesPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -183,6 +183,7 @@ this.add(loadURL); loadURL.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent evt) { if (((JCheckBox) evt.getSource()).isSelected()) Modified: Trunk/pcgen/code/src/java/pcgen/gui2/prefs/TabsPanel.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/prefs/TabsPanel.java 2012-03-01 22:27:57 UTC (rev 16396) +++ Trunk/pcgen/code/src/java/pcgen/gui2/prefs/TabsPanel.java 2012-03-01 22:28:14 UTC (rev 16397) @@ -164,6 +164,7 @@ expertGUICheckBox.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent evt) { SettingsHandler.setExpertGUI(expertGUICheckBox.isSelected()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |