[Jrisk-cvs] SF.net SVN: jrisk: [285] Risk
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: jrisk: [285] Risk
|
From: <yu...@us...> - 2008-03-29 20:08:18
|
Revision: 285
http://jrisk.svn.sourceforge.net/jrisk/?rev=285&view=rev
Author: yuranet
Date: 2008-03-29 13:08:15 -0700 (Sat, 29 Mar 2008)
Log Message:
-----------
DONE dynamic loading
Modified Paths:
--------------
Risk/build.xml
Risk/risk/engine/Risk.java
Risk/risk/engine/core/RiskGame.java
Risk/risk/engine/guishared/PicturePanel.java
Risk/risk/engine/translation/MapTranslator.java
Risk/risk/lobby/client/ClientGameRisk.java
Risk/risk/lobby/client/ClientRisk.java
Risk/risk/lobby/client/RiskMap.java
Risk/risk/lobby/server/ServerRisk.java
Risk/risk/tools/mapeditor/MapEditor.java
Added Paths:
-----------
Risk/risk/engine/RiskIO.java
Modified: Risk/build.xml
===================================================================
--- Risk/build.xml 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/build.xml 2008-03-29 20:08:15 UTC (rev 285)
@@ -244,30 +244,23 @@
<copy file="${dir.dist}/RiskClient.jar" todir="${dir.lobby.dist.client}"/>
- <copy file="gpl.txt" todir="${dir.lobby.dist.client}"/>
- <copy file="ChangeLog.txt" todir="${dir.lobby.dist.client}"/>
-
- <mkdir dir="${dir.lobby.dist.client}/maps"/>
- <copy todir="${dir.lobby.dist.client}/maps">
+ <copy todir="${dir.lobby.dist.client}/Risk/maps">
<fileset dir="maps" includes="**/*.*"/>
</copy>
+ <copy file="gpl.txt" todir="${dir.lobby.dist.client}"/>
+ <copy file="ChangeLog.txt" todir="${dir.lobby.dist.client}"/>
+
<mkdir dir="${dir.lobby.dist.client}/help"/>
<copy file="help/risk_credits.htm" todir="${dir.lobby.dist.client}/help"/>
-<!--
- <mkdir dir="${dir.lobby.dist.client}/risk/engine/translation"/>
- <copy todir="${dir.lobby.dist.client}/risk/engine/translation">
- <fileset dir="risk/engine/translation" includes="*.properties" />
- </copy>
--->
+
</target>
<target name="lobby.server.dist" if="dir.lobby.dist.server.available">
<copy file="${dir.dist}/RiskServer.jar" todir="${dir.lobby.dist.server}"/>
- <mkdir dir="${dir.lobby.dist.server}/maps"/>
- <copy todir="${dir.lobby.dist.server}/maps">
+ <copy todir="${dir.lobby.dist.server}/Risk/maps">
<fileset dir="maps" includes="*.map,*.cards"/>
</copy>
Modified: Risk/risk/engine/Risk.java
===================================================================
--- Risk/risk/engine/Risk.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/engine/Risk.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -65,12 +65,28 @@
protected static ResourceBundle resb;
protected Properties riskconfig;
+
+
public static URL mapsdir;
public static Applet applet;
+ public static RiskIO streamOpener;
+ public static InputStream openMapStream(String a) throws IOException {
+ if (streamOpener==null) {
- public static void setupMapsDir(Applet a) {
+ return new URL(mapsdir,a).openStream();
+ }
+ else {
+
+ return streamOpener.openMapStream(a);
+
+ }
+
+ }
+
+ public void setupMapsDir(Applet a) {
+
applet = a;
if (mapsdir==null) {
@@ -81,8 +97,6 @@
mapsdir = new URL( risk.engine.Risk.applet.getCodeBase() , "maps/");
-
-
}
else {
Added: Risk/risk/engine/RiskIO.java
===================================================================
--- Risk/risk/engine/RiskIO.java (rev 0)
+++ Risk/risk/engine/RiskIO.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -0,0 +1,11 @@
+package risk.engine;
+
+import java.io.InputStream;
+import java.io.IOException;
+
+public interface RiskIO {
+
+ InputStream openStream(String name) throws IOException;
+ InputStream openMapStream(String name) throws IOException;
+
+}
\ No newline at end of file
Modified: Risk/risk/engine/core/RiskGame.java
===================================================================
--- Risk/risk/engine/core/RiskGame.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/engine/core/RiskGame.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -1433,14 +1433,10 @@
return false;
}
- private URL getURL(String a) throws Exception {
+ //private URL getURL(String a) throws Exception {
+ // return new URL(risk.engine.Risk.mapsdir,a);
+ //}
-
- return new URL(risk.engine.Risk.mapsdir,a);
-
-
- }
-
/**
* Loads the map
* @param filename The map filename
@@ -1457,7 +1453,7 @@
//System.out.print("Starting Load Map...\n");
- BufferedReader bufferin=new BufferedReader(new InputStreamReader( getURL(filename).openStream()));
+ BufferedReader bufferin=new BufferedReader(new InputStreamReader( risk.engine.Risk.openMapStream(filename)));
String input = bufferin.readLine();
String mode = "none";
@@ -1618,7 +1614,7 @@
f = defaultMap;
}
- BufferedReader bufferin=new BufferedReader(new InputStreamReader(getURL(f).openStream()));
+ BufferedReader bufferin=new BufferedReader(new InputStreamReader(risk.engine.Risk.openMapStream(f)));
/*
@@ -1754,7 +1750,7 @@
//System.out.print("Starting load cards and missions...\n");
- BufferedReader bufferin=new BufferedReader(new InputStreamReader(getURL(filename).openStream()));
+ BufferedReader bufferin=new BufferedReader(new InputStreamReader(risk.engine.Risk.openMapStream(filename)));
String input = bufferin.readLine();
String mode = "none";
@@ -1918,7 +1914,7 @@
f = defaultCards;
}
- BufferedReader bufferin=new BufferedReader(new InputStreamReader(getURL(f).openStream()));
+ BufferedReader bufferin=new BufferedReader(new InputStreamReader(risk.engine.Risk.openMapStream(f)));
/*
Modified: Risk/risk/engine/guishared/PicturePanel.java
===================================================================
--- Risk/risk/engine/guishared/PicturePanel.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/engine/guishared/PicturePanel.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -101,8 +101,8 @@
RiskGame game = myrisk.getGame();
- BufferedImage m = ImageIO.read( new URL(Risk.mapsdir,game.getImageMap()) );
- BufferedImage O = ImageIO.read( new URL(Risk.mapsdir,game.getImagePic()) );
+ BufferedImage m = ImageIO.read(Risk.openMapStream(game.getImageMap()) );
+ BufferedImage O = ImageIO.read(Risk.openMapStream(game.getImagePic()) );
memoryLoad(m,O);
@@ -1032,12 +1032,12 @@
if (imagename==null) {
- return Toolkit.getDefaultToolkit().getImage( new URL(Risk.mapsdir, game.getImagePic() ) ).getScaledInstance(203,127, java.awt.Image.SCALE_SMOOTH );
+ return Toolkit.getDefaultToolkit().getImage( new URL(Risk.mapsdir,game.getImagePic() ) ).getScaledInstance(203,127, java.awt.Image.SCALE_SMOOTH );
}
else {
- BufferedImage s = ImageIO.read( new URL(Risk.mapsdir,"preview/"+imagename) );
+ BufferedImage s = ImageIO.read(Risk.openMapStream("preview/"+imagename) );
String name = game.getMapName();
BufferedImage tmpimg = new BufferedImage( 203,127, java.awt.image.BufferedImage.TYPE_INT_RGB );
Modified: Risk/risk/engine/translation/MapTranslator.java
===================================================================
--- Risk/risk/engine/translation/MapTranslator.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/engine/translation/MapTranslator.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -35,7 +35,7 @@
//file exists, use it!
try {
- MapResb = new PropertyResourceBundle( (new URL(risk.engine.Risk.mapsdir,strFile)).openStream() );
+ MapResb = new PropertyResourceBundle( risk.engine.Risk.openMapStream(strFile) );
}
catch( IOException ioe ) {
@@ -93,7 +93,7 @@
//file exists, use it!
try {
- CardsResb = new PropertyResourceBundle( (new URL(risk.engine.Risk.mapsdir,strFile)).openStream() );
+ CardsResb = new PropertyResourceBundle( risk.engine.Risk.openMapStream(strFile) );
} catch( IOException ioe ) {
Modified: Risk/risk/lobby/client/ClientGameRisk.java
===================================================================
--- Risk/risk/lobby/client/ClientGameRisk.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/lobby/client/ClientGameRisk.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -4,6 +4,9 @@
import risk.ui.FlashGUI.FlashRiskAdapter;
import risk.ui.FlashGUI.GameFrame;
+import java.io.InputStream;
+import java.io.IOException;
+
import risk.engine.*;
import risk.engine.core.*;
@@ -38,9 +41,30 @@
private final static String version = "0.1";
- public ClientGameRisk() { }
+ public ClientGameRisk() {
+ if (Risk.streamOpener==null) {
+ Risk.streamOpener = new RiskIO() {
+
+ public InputStream openStream(String name) throws IOException {
+
+ return LobbyClientGUI.openStream("Risk/"+name);
+
+ }
+
+ public InputStream openMapStream(String name) throws IOException {
+
+ return openStream("maps/"+name);
+ }
+
+ };
+
+ }
+
+ }
+
+
//##################################################################################
// game setup
//##################################################################################
@@ -177,7 +201,7 @@
public RiskMap getRiskMap(String name) {
- Risk.setupMapsDir(applet);
+ //Risk.setupMapsDir(applet);
if (MapMap==null) { MapMap = new HashMap(); }
@@ -190,7 +214,7 @@
try {
- themap = new RiskMap( Risk.mapsdir, name );
+ themap = new RiskMap( "Risk/maps/", name );
break;
}
Modified: Risk/risk/lobby/client/ClientRisk.java
===================================================================
--- Risk/risk/lobby/client/ClientRisk.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/lobby/client/ClientRisk.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -40,6 +40,15 @@
ClientGameRisk lgml;
+ public void setupMapsDir(Applet a) {
+
+ // TODO this should not be needed as there should
+ // be some OTHER way to check for sandbox
+ // as signed applets may be used, and unsigned webstart may be
+ applet = a;
+
+ }
+
public ClientRisk(Applet a, ClientGameRisk b) {
super(a);
Modified: Risk/risk/lobby/client/RiskMap.java
===================================================================
--- Risk/risk/lobby/client/RiskMap.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/lobby/client/RiskMap.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -1,5 +1,7 @@
package risk.lobby.client;
+import org.lobby.client.LobbyClientGUI;
+
import javax.swing.ImageIcon;
import java.io.InputStreamReader;
import java.io.BufferedReader;
@@ -66,11 +68,11 @@
}
- public RiskMap(URL f,String a) throws Exception {
+ public RiskMap(String f,String a) throws Exception {
fileName = a;
- BufferedReader bufferin=new BufferedReader(new InputStreamReader(new URL(f,a).openStream()));
+ BufferedReader bufferin=new BufferedReader(new InputStreamReader( LobbyClientGUI.openStream(f+a) ));
BufferedReader bufferin2=null;
StringTokenizer st=null;
@@ -105,12 +107,12 @@
risk.engine.translation.MapTranslator.setCards( name );
- bufferin2=new BufferedReader(new InputStreamReader(new URL( f,name ).openStream()));
+ bufferin2=new BufferedReader(new InputStreamReader(LobbyClientGUI.openStream(f+name)));
}
else if ( fm.equals("prv") ) {
- BufferedImage mapimageO = ImageIO.read( new URL(f,"preview/"+st.nextToken()) );
+ BufferedImage mapimageO = ImageIO.read( LobbyClientGUI.openStream(f+"preview/"+st.nextToken()) );
icon = new ImageIcon(mapimageO.getScaledInstance(50,31,Image.SCALE_SMOOTH));
iconSmall = new ImageIcon(mapimageO.getScaledInstance(32,20,Image.SCALE_SMOOTH));
Modified: Risk/risk/lobby/server/ServerRisk.java
===================================================================
--- Risk/risk/lobby/server/ServerRisk.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/lobby/server/ServerRisk.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -31,6 +31,18 @@
}
+ public void setupMapsDir(java.applet.Applet a) {
+
+ try {
+
+ mapsdir = new java.io.File("Risk/maps").toURI().toURL();
+ }
+ catch(Exception ex) {
+
+ throw new RuntimeException(ex);
+ }
+ }
+
public void makeNewGame() {
try {
Modified: Risk/risk/tools/mapeditor/MapEditor.java
===================================================================
--- Risk/risk/tools/mapeditor/MapEditor.java 2008-03-28 18:29:01 UTC (rev 284)
+++ Risk/risk/tools/mapeditor/MapEditor.java 2008-03-29 20:08:15 UTC (rev 285)
@@ -409,8 +409,8 @@
map.loadMap(name);
map.loadCards( map.getCardsFile() );
- BufferedImage ipic = makeRGBImage( ImageIO.read( new URL(Risk.mapsdir,map.getImagePic()) ) );
- BufferedImage imap = makeRGBImage( ImageIO.read( new URL(Risk.mapsdir,map.getImageMap()) ) );
+ BufferedImage ipic = makeRGBImage( ImageIO.read(Risk.openMapStream(map.getImagePic()) ) );
+ BufferedImage imap = makeRGBImage( ImageIO.read(Risk.openMapStream(map.getImageMap()) ) );
map.setMemoryLoad();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
