MegaMek

Update of /cvsroot/megamek/megamek/megamek/client/util/widget
In directory sc8-pr-cvs1:/tmp/cvs-serv25288/megamek/client/util/widget

Modified Files:
	MechPanelTabStrip.java 
Log Message:
+ Fix mechdisplay crash when loading savegames

Index: MechPanelTabStrip.java
===================================================================
RCS file: /cvsroot/megamek/megamek/megamek/client/util/widget/MechPanelTabStrip.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MechPanelTabStrip.java	25 May 2003 03:48:30 -0000	1.1
--- MechPanelTabStrip.java	23 Dec 2003 18:10:13 -0000	1.2
***************
*** 152,155 ****
--- 152,159 ----
  	
  	private void drawIdleImage(int tab){
+         if (tabs[tab] == null) {
+             // hmm, display not initialized yet...
+             return;
+         }
  		Graphics g = tabs[tab].getIdleImage().getGraphics();

Update of /cvsroot/megamek/megamek/megamek/client
In directory sc8-pr-cvs1:/tmp/cvs-serv25288/megamek/client

Modified Files:
	MechDisplay.java 
Log Message:
+ Fix mechdisplay crash when loading savegames

Index: MechDisplay.java
===================================================================
RCS file: /cvsroot/megamek/megamek/megamek/client/MechDisplay.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** MechDisplay.java	21 Nov 2003 02:47:41 -0000	1.49
--- MechDisplay.java	23 Dec 2003 18:10:13 -0000	1.50
***************
*** 120,138 ****
      
      /**
!      * Changes to the specified panel.
!      */
      public void showPanel(String s) {
!         ((CardLayout)displayP.getLayout()).show(displayP, s);
          if (s == "movement") {
!          tabStrip.setTab(0);
!       } else if (s == "armor") {
!         tabStrip.setTab(1);
!       } else if (s == "weapons"){
!         tabStrip.setTab(3);
!       } else if (s == "systems") {
!         tabStrip.setTab(2);
!       } else if (s == "extras") {
!         tabStrip.setTab(4);
!       }
      }
      
--- 120,138 ----
      
      /**
! 	 * Changes to the specified panel.
! 	 */
      public void showPanel(String s) {
!         ((CardLayout) displayP.getLayout()).show(displayP, s);
          if (s == "movement") {
!             tabStrip.setTab(0);
!         } else if (s == "armor") {
!             tabStrip.setTab(1);
!         } else if (s == "weapons") {
!             tabStrip.setTab(3);
!         } else if (s == "systems") {
!             tabStrip.setTab(2);
!         } else if (s == "extras") {
!             tabStrip.setTab(4);
!         }
      }
      
***************
*** 232,277 ****
      public void displayMech(Entity en) {
          // Look out for a race condition.
!         if ( null == en ) {
              return;
          }
!       DisplayMapSet ams = (DisplayMapSet) mech;
!       removeAll();
!         if(en instanceof Mech){
!           ams = (DisplayMapSet) mech;
!           minLeftMargin = minMechLeftMargin;
!           minTopMargin = minMechTopMargin;
              minBottomMargin = minMechBottomMargin;
              minRightMargin = minMechRightMargin;
!         } else if (en instanceof Tank){
!           ams = (DisplayMapSet) tank;
!           minLeftMargin = minTankLeftMargin;
!           minTopMargin = minTankTopMargin;
!           minBottomMargin = minTankTopMargin;
              minRightMargin = minTankLeftMargin;
!         } else if ( en instanceof BattleArmor){
!           ams = (DisplayMapSet) battleArmor;
              minLeftMargin = minInfLeftMargin;
!           minTopMargin = minInfTopMargin;
!           minBottomMargin = minInfTopMargin;
              minRightMargin = minInfLeftMargin;
!                   
!         } else if (en instanceof Infantry){
!           ams = (DisplayMapSet)infantry;
              minLeftMargin = minInfLeftMargin;
!           minTopMargin = minInfTopMargin;
!           minBottomMargin = minInfTopMargin;
!             minRightMargin = minInfLeftMargin;          
!                     
          }
!         if ( null == ams ) {
!             System.err.println( "The armor panel is null." );
              return;
          }
!         ams.setEntity(en); 
          this.addElement(ams.getContentGroup());
          Vector v = ams.getBackgroundDrawers();
          Enumeration enum = v.elements();
!         while(enum.hasMoreElements()){
!           addBgDrawer( (BackGroundDrawer) enum.nextElement());
          }
          onResize();
--- 232,277 ----
      public void displayMech(Entity en) {
          // Look out for a race condition.
!         if (null == en) {
              return;
          }
!         DisplayMapSet ams = (DisplayMapSet) mech;
!         removeAll();
!         if (en instanceof Mech) {
!             ams = (DisplayMapSet) mech;
!             minLeftMargin = minMechLeftMargin;
!             minTopMargin = minMechTopMargin;
              minBottomMargin = minMechBottomMargin;
              minRightMargin = minMechRightMargin;
!         } else if (en instanceof Tank) {
!             ams = (DisplayMapSet) tank;
!             minLeftMargin = minTankLeftMargin;
!             minTopMargin = minTankTopMargin;
!             minBottomMargin = minTankTopMargin;
              minRightMargin = minTankLeftMargin;
!         } else if (en instanceof BattleArmor) {
!             ams = (DisplayMapSet) battleArmor;
              minLeftMargin = minInfLeftMargin;
!             minTopMargin = minInfTopMargin;
!             minBottomMargin = minInfTopMargin;
              minRightMargin = minInfLeftMargin;
! 
!         } else if (en instanceof Infantry) {
!             ams = (DisplayMapSet) infantry;
              minLeftMargin = minInfLeftMargin;
!             minTopMargin = minInfTopMargin;
!             minBottomMargin = minInfTopMargin;
!             minRightMargin = minInfLeftMargin;
! 
          }
!         if (null == ams) {
!             System.err.println("The armor panel is null.");
              return;
          }
!         ams.setEntity(en);
          this.addElement(ams.getContentGroup());
          Vector v = ams.getBackgroundDrawers();
          Enumeration enum = v.elements();
!         while (enum.hasMoreElements()) {
!             addBgDrawer((BackGroundDrawer) enum.nextElement());
          }
          onResize();