Menu
▾
▴
[Freecol-commits] SF.net SVN: freecol:[9141] freecol/trunk/src/net/sf/freecol/client
|
From: <pi...@us...> - 2011-10-30 12:20:57
|
Revision: 9141
http://freecol.svn.sourceforge.net/freecol/?rev=9141&view=rev
Author: pibizza
Date: 2011-10-30 12:20:51 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Moving getSoundPlayer away from the FreeColClient
Modified Paths:
--------------
freecol/trunk/src/net/sf/freecol/client/FreeColClient.java
freecol/trunk/src/net/sf/freecol/client/gui/Canvas.java
freecol/trunk/src/net/sf/freecol/client/gui/MapViewer.java
freecol/trunk/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/MiniMap.java
freecol/trunk/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java
Modified: freecol/trunk/src/net/sf/freecol/client/FreeColClient.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/FreeColClient.java 2011-10-30 12:14:45 UTC (rev 9140)
+++ freecol/trunk/src/net/sf/freecol/client/FreeColClient.java 2011-10-30 12:20:51 UTC (rev 9141)
@@ -39,7 +39,6 @@
import net.sf.freecol.client.gui.Canvas;
import net.sf.freecol.client.gui.MapViewer;
import net.sf.freecol.client.gui.GUI;
-import net.sf.freecol.client.gui.ImageLibrary;
import net.sf.freecol.client.gui.action.ActionManager;
import net.sf.freecol.client.gui.plaf.FreeColLookAndFeel;
import net.sf.freecol.client.gui.sound.SoundPlayer;
@@ -321,14 +320,6 @@
return mapEditor;
}
- /**
- * Gets the <code>ImageLibrary</code>.
- *
- * @return The <code>ImageLibrary</code>.
- */
- public ImageLibrary getImageLibrary() {
- return gui.getImageLibrary();
- }
/**
* Gets the object responsible for keeping and updating the actions.
@@ -659,11 +650,6 @@
return client;
}
- public SoundPlayer getSoundPlayer()
- {
- return gui.getSoundPlayer();
- }
-
/**
* Plays some sound. Parameter == null stops playing a sound.
*
Modified: freecol/trunk/src/net/sf/freecol/client/gui/Canvas.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/Canvas.java 2011-10-30 12:14:45 UTC (rev 9140)
+++ freecol/trunk/src/net/sf/freecol/client/gui/Canvas.java 2011-10-30 12:20:51 UTC (rev 9141)
@@ -733,7 +733,7 @@
}
public ImageLibrary getImageLibrary() {
- return freeColClient.getImageLibrary();
+ return gui.getImageLibrary();
}
Modified: freecol/trunk/src/net/sf/freecol/client/gui/MapViewer.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/MapViewer.java 2011-10-30 12:14:45 UTC (rev 9140)
+++ freecol/trunk/src/net/sf/freecol/client/gui/MapViewer.java 2011-10-30 12:20:51 UTC (rev 9141)
@@ -1423,9 +1423,9 @@
float newScale = lib.getScalingFactor() + delta;
try {
if (newScale >= 1f) {
- setImageLibrary(freeColClient.getImageLibrary());
+ setImageLibrary(gui.getImageLibrary());
} else {
- setImageLibrary(freeColClient.getImageLibrary().getScaledImageLibrary(newScale));
+ setImageLibrary(gui.getImageLibrary().getScaledImageLibrary(newScale));
}
} catch (Exception ex) {
logger.warning("Failed to retrieve scaled image library.");
Modified: freecol/trunk/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java 2011-10-30 12:14:45 UTC (rev 9140)
+++ freecol/trunk/src/net/sf/freecol/client/gui/option/AudioMixerOptionUI.java 2011-10-30 12:20:51 UTC (rev 9141)
@@ -108,7 +108,7 @@
}
private void updateMixerLabel() {
- SoundPlayer soundPlayer = FreeColClient.get().getSoundPlayer();
+ SoundPlayer soundPlayer = client.getGUI().getSoundPlayer();
Mixer mixer;
String text = (soundPlayer == null)
? Messages.message("nothing")
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/MiniMap.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/MiniMap.java 2011-10-30 12:14:45 UTC (rev 9140)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/MiniMap.java 2011-10-30 12:20:51 UTC (rev 9141)
@@ -257,7 +257,7 @@
final Graphics2D g = (Graphics2D) graphics;
final AffineTransform originTransform = g.getTransform();
final Map map = freeColClient.getGame().getMap();
- final ImageLibrary library = freeColClient.getImageLibrary();
+ final ImageLibrary library = freeColClient.getGUI().getImageLibrary();
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
Modified: freecol/trunk/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java 2011-10-30 12:14:45 UTC (rev 9140)
+++ freecol/trunk/src/net/sf/freecol/client/gui/panel/WorkProductionPanel.java 2011-10-30 12:20:51 UTC (rev 9141)
@@ -84,9 +84,9 @@
add(localizedLabel(colonyTile.getLabel()), "span, align center, wrap 30");
TileType tileType = colonyTile.getWorkTile().getType();
- int width = canvas.getFreeColClient().getImageLibrary()
+ int width = canvas.getFreeColClient().getGUI().getImageLibrary()
.getTerrainImageWidth(tileType);
- int height = canvas.getFreeColClient().getImageLibrary()
+ int height = canvas.getFreeColClient().getGUI().getImageLibrary()
.getTerrainImageHeight(tileType);
BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
canvas.getMapViewer().displayColonyTile((Graphics2D) image.getGraphics(),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|