[Gmod-apollo-cmts] CVS: apollo/src/java/apollo/dataadapter/gamexml GAMEAdapter.java, 1.179, 1.180 GAMEAdapterGUI.java, 1.25, 1.26

[Mark G. <mg...@us...>]

Update of /cvsroot/gmod/apollo/src/java/apollo/dataadapter/gamexml
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3244/apollo/dataadapter/gamexml

Modified Files:
	GAMEAdapter.java GAMEAdapterGUI.java 
Log Message:
a bug fix for scott 
so now game adapter will recognize http: as an url and load it 
rather than trying to load it as file and barfing
this actually is new functionality for file loading
used to be an url tab - and that was ripped out of game adapter
only in fly game adapter now
but the file adapter should be able to be hip to both urls & files anyways
in fact it should just convert files to urls and do them both the same way -
but this fix is fine for now



Index: GAMEAdapter.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/dataadapter/gamexml/GAMEAdapter.java,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** GAMEAdapter.java	21 May 2007 22:13:04 -0000	1.179
--- GAMEAdapter.java	8 Jun 2007 16:47:08 -0000	1.180
***************
*** 437,440 ****
--- 437,448 ----
    }
  
+   /** if file starts with http: then its really an url so correct the type 
+    bug fix for being able to load urls from file adapter and with -x */
+   public DataInput getDataInput() {
+     super.getDataInput().setTypeToFileOrUrl();
+     return super.getDataInput();
+   }
+ 
+ 
    /** from ApolloDataAdapterI interface. dataInput should be set
     * previous to this
***************
*** 448,451 ****
--- 456,460 ----
        // Throws DataAdapter exception if faulty input (like bad filename)
        InputStream xml_stream;
+       //System.out.println("opening GAME XML file " + getDataInput());
        logger.debug("opening GAME XML file " + getDataInput());
        xml_stream = xmlInputStream(getDataInput());
***************
*** 713,716 ****
--- 722,726 ----
      } catch (Exception e) { // FileNotFoundException
        stream = null;
+       //new Throwable().printStackTrace();
        throw new ApolloAdapterException("Error: could not open GAME XML file " + 
                                         filename + " for reading.");//+e+path);

Index: GAMEAdapterGUI.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/apollo/dataadapter/gamexml/GAMEAdapterGUI.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** GAMEAdapterGUI.java	3 Jan 2007 13:50:14 -0000	1.25
--- GAMEAdapterGUI.java	8 Jun 2007 16:47:08 -0000	1.26
***************
*** 23,26 ****
--- 23,27 ----
  import apollo.dataadapter.ApolloAdapterException;
  import apollo.dataadapter.ApolloDataAdapterI;
+ import apollo.dataadapter.DataInput;
  import apollo.dataadapter.DataInputType;
  import apollo.dataadapter.chadoxml.ChadoXmlAdapter;
***************
*** 99,103 ****
--- 100,121 ----
  //   }
  
+ //   /** public for testing synteny - tied in w gui unfortunately 
+ //    this isnt just for tetsting synteny - used to get input - crucial!
+ //    copied from flygameadapterGui - i have no idea why its not here???? */
+ //   public GuiTabPanel getCurrentGamePanel() {
+ //     return gamePanels[tabbedPane.getSelectedIndex()];
+ //   }
+ //   /** copied from flygameadapterGui - i have no idea why its not here???? */
+ //   private DataInput getDataInput() throws ApolloAdapterException {
+ //     try {
+ //       return getCurrentGamePanel().getDataInput();
+ //     }
+ //     catch (RuntimeException e) { throw new ApolloAdapterException(e.getMessage()); }
+ //   }
+ 
    public Object doOperation(Object values) throws ApolloAdapterException {
+ //     if (getDataInput()==null || !getDataInput().hasInput())
+ //       throw new ApolloAdapterException("null input");
+ //     driver.setDataInput(getDataInput());
      driver.setInput(getSelectedPath());
      if (ioOperation.equals(ApolloDataAdapterI.OP_READ_DATA)) {