From: Mark G. <mg...@us...> - 2007-05-21 22:13:05
|
Update of /cvsroot/gmod/apollo/src/java/apollo/dataadapter/gamexml In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32647/apollo/dataadapter/gamexml Modified Files: GAMEAdapter.java Log Message: geez i cant believe im committing to apollo aint this crazy anyways -x url wasnt working as it was setting type to FILE no matter what now takes an url though i noticed game adapter gui then will only take the type set the first time - yikes Index: GAMEAdapter.java =================================================================== RCS file: /cvsroot/gmod/apollo/src/java/apollo/dataadapter/gamexml/GAMEAdapter.java,v retrieving revision 1.178 retrieving revision 1.179 diff -C2 -d -r1.178 -r1.179 *** GAMEAdapter.java 17 Jan 2007 14:44:49 -0000 1.178 --- GAMEAdapter.java 21 May 2007 22:13:04 -0000 1.179 *************** *** 701,707 **** --- 701,711 ---- } + /** Only files should be sent this way - if an URL is sent here it wont work + and something is wrong */ private InputStream getStreamFromFile(String filename) throws ApolloAdapterException { InputStream stream=null; + // returns null for urls String path = apollo.util.IOUtil.findFile(filename, false); + try { logger.info("Trying to open GAME XML file " + filename); *************** *** 710,714 **** stream = null; throw new ApolloAdapterException("Error: could not open GAME XML file " + ! filename + " for reading."); } --- 714,718 ---- stream = null; throw new ApolloAdapterException("Error: could not open GAME XML file " + ! filename + " for reading.");//+e+path); } |