[Geotools-commits] CVS: geotools/src/uk/ac/leeds/ccg/geotools Viewer.java,1.36,1.37

[James M. <jma...@us...>]

Update of /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/geotools
In directory usw-pr-cvs1:/tmp/cvs-serv2913/uk/ac/leeds/ccg/geotools

Modified Files:
	Viewer.java 
Log Message:
fixed bugs with viewer wrt highlights and tooltips for themes which were switched off



Index: Viewer.java
===================================================================
RCS file: /cvsroot/geotools/geotools/src/uk/ac/leeds/ccg/geotools/Viewer.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Viewer.java	2001/11/15 13:49:07	1.36
--- Viewer.java	2001/11/23 18:51:46	1.37
***************
*** 608,612 ****
          for (Enumeration e = staticThemes.elements() ; e.hasMoreElements() ;) {
              t=(Theme)e.nextElement();
!             t.paintHighlight(g,scale);
          }
          try{
--- 608,614 ----
          for (Enumeration e = staticThemes.elements() ; e.hasMoreElements() ;) {
              t=(Theme)e.nextElement();
!             if(isThemeVisible(t)){
!                 t.paintHighlight(g,scale);
!             }
          }
          try{
***************
*** 1144,1150 ****
              Enumeration e = visibleThemes.elements();
              while(e.hasMoreElements()){
!                 String tempTip = ((Theme)e.nextElement()).getTipText(getMapGeoPoint(),this.scale);
!                 if(tempTip !=null && !tempTip.trim().equals("")){
!                     tip = tempTip;
                  }
              }
--- 1146,1155 ----
              Enumeration e = visibleThemes.elements();
              while(e.hasMoreElements()){
!                 Theme theme = (Theme)e.nextElement();
!                 if(isThemeVisible(theme)){
!                     String tempTip = (theme).getTipText(getMapGeoPoint(),this.scale);
!                     if(tempTip !=null && !tempTip.trim().equals("")){
!                         tip = tempTip;
!                     }
                  }
              }