Menu
▾
▴
[Freecol-commits] SF.net SVN: freecol:[9887] freecol/trunk
|
From: <mp...@us...> - 2012-06-10 05:16:59
|
Revision: 9887
http://freecol.svn.sourceforge.net/freecol/?rev=9887&view=rev
Author: mpope
Date: 2012-06-10 05:16:52 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Suppress Java7 warnings and a test sequence ambiguity.
Modified Paths:
--------------
freecol/trunk/src/net/sf/freecol/client/gui/option/AbstractUnitOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/option/LanguageOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/option/ListOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/option/ModOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/option/SelectOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/option/StringOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/option/UnitTypeOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/AdvantageCellEditor.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/ChoiceDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/EndTurnDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/FileList.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/FindSettlementDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/NationCellEditor.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/NationCellRenderer.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/NewPanel.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/PlayersTable.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/SelectAmountDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/TradeRouteDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/TradeRouteInputDialog.java
freecol/trunk/src/net/sf/freecol/client/gui/plaf/FreeColListUI.java
freecol/trunk/test/src/net/sf/freecol/server/SaveLoadTest.java
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/AbstractUnitOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/AbstractUnitOptionUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/AbstractUnitOptionUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -72,6 +72,7 @@
* @param option The <code>AbstractUnitOption</code> to make a user interface for
* @param editable boolean whether user can modify the setting
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public AbstractUnitOptionUI(GUI gui, final AbstractUnitOption option, boolean editable) {
super(gui, option, editable);
@@ -135,6 +136,7 @@
numberUI.reset();
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
public void itemStateChanged(ItemEvent e) {
JComboBox box = roleUI.getComponent();
UnitType type = (UnitType) typeUI.getComponent().getSelectedItem();
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -74,6 +74,7 @@
* interface for.
* @param editable boolean whether user can modify the setting
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public AudioMixerOptionUI(GUI gui, final AudioMixerOption option, boolean editable) {
super(gui, option, editable);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/LanguageOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/LanguageOptionUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/LanguageOptionUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -42,6 +42,7 @@
* @param option The <code>LanguageOption</code> to make a user interface for.
* @param editable boolean whether user can modify the setting
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public LanguageOptionUI(GUI gui, final LanguageOption option, boolean editable) {
super(gui, option, editable);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/ListOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/ListOptionUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/ListOptionUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -77,6 +77,7 @@
* @param option The <code>ListOption</code> to display.
* @param editable boolean whether user can modify the setting
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public ListOptionUI(final GUI gui, final ListOption<T> option,
boolean editable) {
super(gui, option, editable);
@@ -218,6 +219,7 @@
/**
* Reset with the value from the Option.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public void reset() {
model.clear();
for (AbstractOption<T> o : getOption().getValue()) {
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/ModOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/ModOptionUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/ModOptionUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -48,6 +48,7 @@
* @param option The <code>ModOption</code> to make a user interface for
* @param editable boolean whether user can modify the setting
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public ModOptionUI(GUI gui, final ModOption option, boolean editable) {
super(gui, option, editable);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/SelectOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/SelectOptionUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/SelectOptionUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -43,6 +43,7 @@
* @param option The <code>SelectOption</code> to make a user interface for
* @param editable boolean whether user can modify the setting
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public SelectOptionUI(GUI gui, final SelectOption option, boolean editable) {
super(gui, option, editable);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/StringOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/StringOptionUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/StringOptionUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -46,6 +46,7 @@
* @param option The <code>StringOption</code> to make a user interface for
* @param editable boolean whether user can modify the setting
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public StringOptionUI(GUI gui, final StringOption option, boolean editable) {
super(gui, option, editable);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/UnitTypeOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/UnitTypeOptionUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/UnitTypeOptionUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -47,6 +47,7 @@
* @param option The <code>UnitTypeOption</code> to make a user interface for
* @param editable boolean whether user can modify the setting
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public UnitTypeOptionUI(GUI gui, final UnitTypeOption option, boolean editable) {
super(gui, option, editable);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/AdvantageCellEditor.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/AdvantageCellEditor.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/AdvantageCellEditor.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -44,6 +44,7 @@
*
* @param nationTypes List of <code>EuropeanNationType></code>
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public AdvantageCellEditor(List<EuropeanNationType> nationTypes) {
super(new JComboBox(new Vector<EuropeanNationType>(nationTypes)));
((JComboBox) getComponent()).setRenderer(new AdvantageRenderer());
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/BuildQueuePanel.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -112,6 +112,7 @@
*/
private List<UnitType> buildableUnits = new ArrayList<UnitType>();
+ @SuppressWarnings("unchecked") // FIXME in Java7
public BuildQueuePanel(FreeColClient freeColClient, GUI gui, Colony colony) {
super(freeColClient, gui, new MigLayout("wrap 3", "[260:][390:, fill][260:]", "[][][300:400:][]"));
@@ -157,6 +158,7 @@
buildQueueList.addMouseListener(new BuildQueueMouseAdapter(false));
Action deleteAction = new AbstractAction() {
+ @SuppressWarnings("deprecation") // FIXME in Java7
public void actionPerformed(ActionEvent e) {
for (Object type : buildQueueList.getSelectedValues()) {
removeBuildable(type);
@@ -169,6 +171,7 @@
buildQueueList.getActionMap().put("delete", deleteAction);
Action addAction = new AbstractAction() {
+ @SuppressWarnings("deprecation") // FIXME in Java7
public void actionPerformed(ActionEvent e) {
DefaultListModel model = (DefaultListModel) buildQueueList.getModel();
for (Object type : ((JList) e.getSource()).getSelectedValues()) {
@@ -235,6 +238,7 @@
model.removeElement(type);
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
private void updateUnitList() {
DefaultListModel units = (DefaultListModel) unitList.getModel();
units.clear();
@@ -304,6 +308,7 @@
}
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
private void updateBuildingList() {
DefaultListModel buildings = (DefaultListModel) buildingList.getModel();
DefaultListModel current = (DefaultListModel) buildQueueList.getModel();
@@ -601,6 +606,7 @@
}
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
private void updateDetailView() {
cellRenderer = getCellRenderer();
buildQueueList.setCellRenderer(cellRenderer);
@@ -626,6 +632,7 @@
* <code>BuildQueueItem</code>s between the build queue list, the
* unit list and the building list.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public class BuildQueueTransferHandler extends TransferHandler {
private final DataFlavor buildQueueFlavor = new DataFlavor(List.class, "BuildingQueueFlavor");
@@ -832,6 +839,7 @@
* queue.
*/
@Override
+ @SuppressWarnings("deprecation") // FIXME in Java7
protected Transferable createTransferable(JComponent comp) {
if (comp instanceof JList) {
source = (JList) comp;
@@ -999,6 +1007,7 @@
}
@Override
+ @SuppressWarnings({"deprecation", "unchecked"}) // FIXME in Java7
public void mousePressed(MouseEvent e) {
if (!enabled && e.getClickCount() == 1 && !e.isConsumed()) {
enabled = true;
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/CaptureGoodsDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -69,6 +69,7 @@
* @param winner The <code>Unit</code> that is looting.
* @param loot The <code>Goods</code> to loot.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public CaptureGoodsDialog(FreeColClient freeColClient, GUI gui,
Unit winner, List<Goods> loot) {
super(freeColClient, gui);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/ChoiceDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/ChoiceDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/ChoiceDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -59,6 +59,7 @@
* @param cancelText <code>String</code>
* @param choices List of <code>ChoiceItem<T></code>
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public ChoiceDialog(FreeColClient freeColClient, GUI gui, String text,
String cancelText, List<ChoiceItem<T>> choices) {
super(freeColClient, gui);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/ColonyPanel.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/ColonyPanel.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/ColonyPanel.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -175,6 +175,7 @@
* @param gui The <code>GUI</code> to display on.
* @param colony The <code>Colony</code> to display in this panel.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public ColonyPanel(FreeColClient freeColClient, GUI gui, Colony colony) {
super(freeColClient, gui);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/EditSettlementDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -74,6 +74,7 @@
* @param gui the GUI
* @param settlement the IndianSettlement to edit
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public EditSettlementDialog(FreeColClient freeColClient, GUI gui, final IndianSettlement settlement) {
super(freeColClient, gui);
@@ -128,6 +129,7 @@
setSize(getPreferredSize());
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
private DefaultComboBoxModel getSkillModel() {
IndianNationType ownerType = (IndianNationType)
((Nation) owner.getSelectedItem()).getType();
@@ -138,6 +140,7 @@
return skillModel;
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
public void itemStateChanged(ItemEvent e) {
skill.setModel(getSkillModel());
skill.setSelectedItem(settlement.getLearnableSkill());
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/EndTurnDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/EndTurnDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/EndTurnDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -93,6 +93,7 @@
/**
* The constructor to use.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public EndTurnDialog(FreeColClient freeColClient, GUI gui, List<Unit> units) {
super(freeColClient, gui);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/FileList.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/FileList.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/FileList.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -37,6 +37,7 @@
*
* @param directory The directory to list files from.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public FileList(File directory) {
super();
setListData(getEntries(directory, getDefaultFileFilter()));
@@ -50,6 +51,7 @@
* @param directory The directory to list files from.
* @param fileFilter The filter to apply when displaying the files.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public FileList(File directory, FileFilter fileFilter) {
super();
setListData(getEntries(directory, fileFilter));
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/FindSettlementDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/FindSettlementDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/FindSettlementDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -77,6 +77,7 @@
/**
* The constructor to use.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public FindSettlementDialog(FreeColClient freeColClient, GUI gui) {
super(freeColClient, gui);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/NationCellEditor.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/NationCellEditor.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/NationCellEditor.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -34,6 +34,7 @@
*
* @param nations array of <code>Nation</code>
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public NationCellEditor(Nation[] nations) {
super(new JComboBox(nations));
}
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/NationCellRenderer.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/NationCellRenderer.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/NationCellRenderer.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -50,6 +50,7 @@
*
* @param nations array of <code>Nation</code>
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public NationCellRenderer(Nation[] nations) {
this.nations = nations;
this.comboBox = new JComboBox(nations);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/NegotiationDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -497,6 +497,7 @@
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
private void updateColonyBox() {
if (!player.isEuropean()) {
@@ -593,6 +594,7 @@
setSize(getPreferredSize());
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
private void updateGoodsBox(List<Goods> allGoods) {
// Remove all action listeners, so the update has no effect (except
@@ -725,6 +727,7 @@
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
public void updateStanceBox(){
stanceBox.removeAllItems();
Stance stance = source.getStance(target);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/NewPanel.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/NewPanel.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/NewPanel.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -92,8 +92,11 @@
Advantages.FIXED,
Advantages.NONE
};
+
+ @SuppressWarnings("unchecked") // FIXME in Java7
private final JComboBox nationalAdvantages = new JComboBox(choices);
+ @SuppressWarnings("unchecked") // FIXME in Java7
private final JComboBox specificationBox = new JComboBox();
private final Component[] joinComponents = new Component[] {
@@ -137,6 +140,7 @@
* @param specification An optional <code>Specification</code> value for
* the new game.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public NewPanel(FreeColClient freeColClient, GUI gui, Specification specification) {
super(freeColClient, gui);
this.specification = specification;
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/PlayersTable.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/PlayersTable.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/PlayersTable.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -240,8 +240,10 @@
class AvailableCellRenderer implements TableCellRenderer {
+ @SuppressWarnings("unchecked") // FIXME in Java7
private JComboBox box = new JComboBox(allStates);
+ @SuppressWarnings("unchecked") // FIXME in Java7
public AvailableCellRenderer() {
box.setRenderer(new NationStateRenderer());
}
@@ -272,7 +274,9 @@
public final class AvailableCellEditor extends AbstractCellEditor implements TableCellEditor {
+ @SuppressWarnings("unchecked") // FIXME in Java7
private JComboBox aiStateBox = new JComboBox(aiStates);
+ @SuppressWarnings("unchecked") // FIXME in Java7
private JComboBox allStateBox = new JComboBox(allStates);
private JComboBox activeBox;
@@ -282,6 +286,7 @@
}
};
+ @SuppressWarnings("unchecked") // FIXME in Java7
public AvailableCellEditor() {
aiStateBox.setRenderer(new NationStateRenderer());
aiStateBox.addActionListener(listener);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/ReportProductionPanel.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -58,6 +58,7 @@
*
* @param gui The parent of this panel.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public ReportProductionPanel(FreeColClient freeColClient, GUI gui) {
super(freeColClient, gui, Messages.message("reportProductionAction.name"));
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/SelectAmountDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/SelectAmountDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/SelectAmountDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -53,6 +53,7 @@
/**
* The constructor to use.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public SelectAmountDialog(FreeColClient freeColClient, GUI gui, GoodsType goodsType,
int available, int defaultAmount, boolean needToPay) {
super(freeColClient, gui);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/SelectDestinationDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -100,6 +100,7 @@
* The constructor to use.
* @param freeColClient
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public SelectDestinationDialog(FreeColClient freeColClient, GUI gui, Unit unit) {
super(freeColClient, gui);
@@ -350,6 +351,7 @@
return "";
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
private void filterDestinations() {
DefaultListModel model = (DefaultListModel) destinationList.getModel();
Object selected = destinationList.getSelectedValue();
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/TradeRouteDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/TradeRouteDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/TradeRouteDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -67,6 +67,7 @@
= new JButton(Messages.message("traderouteDialog.deassignRoute"));
private final DefaultListModel listModel = new DefaultListModel();
+ @SuppressWarnings("unchecked") // FIXME in Java7
private final JList tradeRoutes = new JList(listModel);
private final JScrollPane tradeRouteView = new JScrollPane(tradeRoutes);
@@ -88,6 +89,7 @@
* @param gui The <code>GUI</code> to display in.
* @param unit The optional <code>Unit</code> to operate on.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public TradeRouteDialog(FreeColClient freeColClient, final GUI gui,
Unit unit) {
super(freeColClient, gui);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/TradeRouteInputDialog.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/TradeRouteInputDialog.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/TradeRouteInputDialog.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -97,6 +97,7 @@
private final DefaultListModel listModel = new DefaultListModel();
+ @SuppressWarnings("unchecked") // FIXME in Java7
private final JList stopList = new JList(listModel);
private final JScrollPane tradeRouteView = new JScrollPane(stopList);
@@ -113,6 +114,7 @@
* @param gui The <code>GUI</code> to display on.
* @param newRoute The <code>TradeRoute</code> to operate on.
*/
+ @SuppressWarnings("unchecked") // FIXME in Java7
public TradeRouteInputDialog(FreeColClient freeColClient, GUI gui,
TradeRoute newRoute) {
super(freeColClient, gui);
@@ -514,6 +516,7 @@
return MOVE;
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
public boolean importData(JComponent target, Transferable data) {
if (canImport(target, data.getTransferDataFlavors())) {
try {
Modified: freecol/trunk/src/net/sf/freecol/client/gui/plaf/FreeColListUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/plaf/FreeColListUI.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/src/net/sf/freecol/client/gui/plaf/FreeColListUI.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -41,6 +41,7 @@
}
+ @SuppressWarnings("unchecked") // FIXME in Java7
public void installUI(JComponent c) {
super.installUI(c);
((JList) c).setCellRenderer(createRenderer());
Modified: freecol/trunk/test/src/net/sf/freecol/server/SaveLoadTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/server/SaveLoadTest.java 2012-06-09 08:11:10 UTC (rev 9886)
+++ freecol/trunk/test/src/net/sf/freecol/server/SaveLoadTest.java 2012-06-10 05:16:52 UTC (rev 9887)
@@ -88,6 +88,8 @@
} catch (FreeColException e) {
fail(e.getMessage());
}
+ ((FileOption) mapGenerator.getMapGeneratorOptions()
+ .getOption(MapGeneratorOptions.IMPORT_FILE)).setValue(null);
assertEquals(FreeColServer.GameState.IN_GAME, server.getGameState());
assertNotNull(server.getGame());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
