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

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

Module Name:	CFJavaEditor
Committed By:	avogl
Date:		Sun Jan 12 23:33:06 UTC 2003

Modified Files:
	CFJavaEditor/src/cfeditor: CArchPanel.java CArchPanelPan.java
	    CFJavaEditor.java CMapArchPanel.java CMapTileList.java
	    CMapViewBasic.java COptionDialog.java

Log Message:
Small update for the CFJavaEditor:

For the first time I have tested the CFJavaEditor with
Java SDK 1.4.1 on WinXP. Everything worked fine as far as
I could see, but a few methods have been declared deprecated.
Now I replaced these deprecations.

Apart from that I have changed the scrollbar behaviour of
the map view window: When clicking on one of the scrollbar
arrows, the view scrolls now by the length of one tile
(32 pixels) instead of just one pixel as before.

--AndreasV



Start of context diffs


Index: CFJavaEditor/src/cfeditor/CArchPanel.java
diff -c CFJavaEditor/src/cfeditor/CArchPanel.java:1.4 CFJavaEditor/src/cfeditor/CArchPanel.java:1.5
*** CFJavaEditor/src/cfeditor/CArchPanel.java:1.4	Sun Nov  3 08:43:18 2002
--- CFJavaEditor/src/cfeditor/CArchPanel.java	Sun Jan 12 15:33:04 2003
***************
*** 127,137 ****
      }
  
      public void disableTabPane() {
!         m_tabDesktop.disable();
      }
  
      public void enableTabPane() {
!         m_tabDesktop.enable();
          if(m_selectedPanel != null)
              m_selectedPanel.showArchList();
      }
--- 127,137 ----
      }
  
      public void disableTabPane() {
!         m_tabDesktop.setEnabled(false);
      }
  
      public void enableTabPane() {
!         m_tabDesktop.setEnabled(true);
          if(m_selectedPanel != null)
              m_selectedPanel.showArchList();
      }

Index: CFJavaEditor/src/cfeditor/CArchPanelPan.java
diff -c CFJavaEditor/src/cfeditor/CArchPanelPan.java:1.3 CFJavaEditor/src/cfeditor/CArchPanelPan.java:1.4
*** CFJavaEditor/src/cfeditor/CArchPanelPan.java:1.3	Sun Nov  3 08:43:18 2002
--- CFJavaEditor/src/cfeditor/CArchPanelPan.java	Sun Jan 12 15:33:04 2003
***************
*** 143,151 ****
      }
  
      int addArchPanelCombo(String name) {
!         this.disable();
          this.jbox.addItem(name);
!         this.enable();
          return(combo_counter++);
      }
  
--- 143,151 ----
      }
  
      int addArchPanelCombo(String name) {
!         this.setEnabled(false);
          this.jbox.addItem(name);
!         this.setEnabled(true);
          return(combo_counter++);
      }
  

Index: CFJavaEditor/src/cfeditor/CFJavaEditor.java
diff -c CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.6 CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.7
*** CFJavaEditor/src/cfeditor/CFJavaEditor.java:1.6	Wed Dec 18 14:33:32 2002
--- CFJavaEditor/src/cfeditor/CFJavaEditor.java	Sun Jan 12 15:33:05 2003
***************
*** 30,36 ****
   * The launcher that launches the whole level editor application.
   *
   * @author <a href="mailto:mic...@no...">Michael Toennies</a>
!  * @version $Revision: 1.6 $
   */
  public class CFJavaEditor {
      /**
--- 30,36 ----
   * The launcher that launches the whole level editor application.
   *
   * @author <a href="mailto:mic...@no...">Michael Toennies</a>
!  * @version $Revision: 1.7 $
   */
  public class CFJavaEditor {
      /**



Index: CFJavaEditor/src/cfeditor/CMapTileList.java
diff -c CFJavaEditor/src/cfeditor/CMapTileList.java:1.7 CFJavaEditor/src/cfeditor/CMapTileList.java:1.8
*** CFJavaEditor/src/cfeditor/CMapTileList.java:1.7	Wed Dec 18 14:33:32 2002
--- CFJavaEditor/src/cfeditor/CMapTileList.java	Sun Jan 12 15:33:05 2003
***************
*** 268,278 ****
          String liststring;
          String num, numx, numy;
  
!         m_list.disable();
          model.removeAllElements();
          if(map ==null) {
              getPanelArch(-1);
!             m_list.enable();
              return;
          }
  
--- 268,278 ----
          String liststring;
          String num, numx, numy;
  
!         m_list.setEnabled(false);
          model.removeAllElements();
          if(map ==null) {
              getPanelArch(-1);
!             m_list.setEnabled(true);
              return;
          }
  
***************
*** 319,325 ****
          // refresh the MapArchPanel to display the new arch
          m_view.refreshMapArchPanel();
  
!         m_list.enable();
      }
  
      /**
--- 319,325 ----
          // refresh the MapArchPanel to display the new arch
          m_view.refreshMapArchPanel();
  
!         m_list.setEnabled(true);
      }
  
      /**

Index: CFJavaEditor/src/cfeditor/COptionDialog.java
diff -c CFJavaEditor/src/cfeditor/COptionDialog.java:1.5 CFJavaEditor/src/cfeditor/COptionDialog.java:1.6
*** CFJavaEditor/src/cfeditor/COptionDialog.java:1.5	Sun Nov  3 08:43:19 2002
--- CFJavaEditor/src/cfeditor/COptionDialog.java	Sun Jan 12 15:33:05 2003
***************
*** 121,127 ****
          m_loadArches.setSelected(m_control.isArchLoadedFromCollection());
          m_loadArches.addActionListener(new selectArchLoadAL(m_loadArches, this));
          optionPartPanel.add(m_loadArches);
!         if (m_control.isArchLoadedFromCollection()) m_archField.disable();
  
          mainPanel.add(optionPartPanel);
  
--- 121,127 ----
          m_loadArches.setSelected(m_control.isArchLoadedFromCollection());
          m_loadArches.addActionListener(new selectArchLoadAL(m_loadArches, this));
          optionPartPanel.add(m_loadArches);
!         if (m_control.isArchLoadedFromCollection()) m_archField.setEnabled(false);
  
          mainPanel.add(optionPartPanel);
  
***************
*** 240,250 ****
          public void actionPerformed(ActionEvent event) {
              // state has changed
              if (cbox.isSelected()) {
!                 m_archField.disable();
                  frame.update(frame.getGraphics());
              }
              else {
!                 m_archField.enable();
                  frame.update(frame.getGraphics());
              }
          }
--- 240,250 ----
          public void actionPerformed(ActionEvent event) {
              // state has changed
              if (cbox.isSelected()) {
!                 m_archField.setEnabled(false);
                  frame.update(frame.getGraphics());
              }
              else {
!                 m_archField.setEnabled(true);
                  frame.update(frame.getGraphics());
              }
          }