[Crossfire-cvs] CVS commit: CFJavaEditor/src/cfeditor

[<cro...@li...>]

Module Name:	CFJavaEditor
Committed By:	avogl
Date:		Sun May  4 19:17:53 UTC 2003

Modified Files:
	CFJavaEditor/src/cfeditor: CFTreasureListTree.java
	    CMapPropertiesDialog.java

Log Message:
Fixed a bug which caused the MapProperties not to
appear due to an exception (Only happened when default
font is applied).
--AV



Start of context diffs


Index: CFJavaEditor/src/cfeditor/CFTreasureListTree.java
diff -c CFJavaEditor/src/cfeditor/CFTreasureListTree.java:1.4 CFJavaEditor/src/cfeditor/CFTreasureListTree.java:1.5
*** CFJavaEditor/src/cfeditor/CFTreasureListTree.java:1.4	Sat May  3 11:23:07 2003
--- CFJavaEditor/src/cfeditor/CFTreasureListTree.java	Sun May  4 12:17:52 2003
***************
*** 866,871 ****
--- 866,873 ----
           */
          public TreasureCellRenderer() {
              plain = CMainControl.getInstance().getPlainFont();
+             if (plain == null)
+                 plain = JFontChooser.default_font;
              bold = new Font(plain.getName(), Font.BOLD, plain.getSize());
  
              // get icons

Index: CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java
diff -c CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java:1.6 CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java:1.7
*** CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java:1.6	Sat May  3 11:23:07 2003
--- CFJavaEditor/src/cfeditor/CMapPropertiesDialog.java	Sun May  4 12:17:52 2003
***************
*** 197,206 ****
              }
  
              optionPanel.add(scrollPane2);
!             if (m_control.getPlainFont().getSize() <= 12)
!                 optionPanel.setPreferredSize(new Dimension(240, 185));
!             else
                  optionPanel.setPreferredSize(new Dimension(280, 185));
  
              // set constraints
              c.weightx = 1.0; c.weighty = 1.0;
--- 197,207 ----
              }
  
              optionPanel.add(scrollPane2);
! 
!             if (m_control.isBigFont())
                  optionPanel.setPreferredSize(new Dimension(280, 185));
+             else
+                 optionPanel.setPreferredSize(new Dimension(240, 185));
  
              // set constraints
              c.weightx = 1.0; c.weighty = 1.0;