[gee-cvs] gabel/src/net/sf/gabel/forager ExperimentRoundParameters.java, 1.1, 1.2 GridView.java, 1.38, 1.39

[Allen L. <al...@us...>]

Update of /cvsroot/gabel/gabel/src/net/sf/gabel/forager
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27365/src/net/sf/gabel/forager

Modified Files:
	ExperimentRoundParameters.java GridView.java 
Log Message:
* Fixing SubjectView size issues in bunnified forager
* special instructions are now looked up via http URL instead of in the
  classpath.
* minor hygiene


Index: GridView.java
===================================================================
RCS file: /cvsroot/gabel/gabel/src/net/sf/gabel/forager/GridView.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** GridView.java	4 Jul 2006 22:37:50 -0000	1.38
--- GridView.java	14 Aug 2006 18:30:02 -0000	1.39
***************
*** 133,144 ****
  
      public void setScreenSize(Dimension screenSize) {
          this.screenSize = screenSize;
          int availableWidth = (int) screenSize.getWidth();
          int availableHeight = (int) screenSize.getHeight();
          if (boardSize == null) {
!             setBoardSize( new Dimension((int) (availableWidth * .8), (int) (availableHeight * .8)) );
          }
- 
-         // stretch board to the max
          dw = (availableWidth / boardSize.getWidth());
          dh = (availableHeight / boardSize.getHeight());
--- 133,145 ----
  
      public void setScreenSize(Dimension screenSize) {
+         System.err.println("setting screen size: " + screenSize);
+         System.err.println("board size: " + boardSize);
          this.screenSize = screenSize;
          int availableWidth = (int) screenSize.getWidth();
          int availableHeight = (int) screenSize.getHeight();
+         // stretch board to the max
          if (boardSize == null) {
!             boardSize = screenSize;
          }
          dw = (availableWidth / boardSize.getWidth());
          dh = (availableHeight / boardSize.getHeight());

Index: ExperimentRoundParameters.java
===================================================================
RCS file: /cvsroot/gabel/gabel/src/net/sf/gabel/forager/ExperimentRoundParameters.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ExperimentRoundParameters.java	19 Jun 2006 06:37:57 -0000	1.1
--- ExperimentRoundParameters.java	14 Aug 2006 18:30:02 -0000	1.2
***************
*** 398,403 ****
              resource = "food-invisible-agents-invisible.html";
          }
!         StringBuffer buffer = Utils.getTextResource(
!                 ForagerConfiguration.getDefaultConfigurationDirectory() + resource);
          return (buffer == null) ? "Couldn't find special instructions: "  + resource
                  : buffer.toString();
--- 398,403 ----
              resource = "food-invisible-agents-invisible.html";
          }
! 
!         StringBuffer buffer = Utils.getURLResource("/instructions/forager/" + resource);
          return (buffer == null) ? "Couldn't find special instructions: "  + resource
                  : buffer.toString();