[jsword-svn] common/java/config/org/crosswire/common/config/swing s

jswordcvs at crosswire.org jswordcvs at crosswire.org
Sat Jan 15 05:05:35 MST 2005


Update of /cvs/jsword/common/java/config/org/crosswire/common/config/swing
In directory www.crosswire.org:/tmp/cvs-serv31101/java/config/org/crosswire/common/config/swing

Modified Files:
	ConfigEditorFactory.java AbstractConfigEditor.java 
	AdvancedConfigEditor.java WizardConfigEditor.java 
	ConfigEditor.java TreeConfigEditor.java 
	TabbedConfigEditor.java 
Log Message:
general tidy-ups

Index: WizardConfigEditor.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/WizardConfigEditor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WizardConfigEditor.java	21 Sep 2004 17:45:47 -0000	1.5
--- WizardConfigEditor.java	15 Jan 2005 12:05:33 -0000	1.6
***************
*** 69,73 ****
       * so don't use field initializers.
       */
!     protected void initialize()
      {
          actions = new ActionFactory(WizardConfigEditor.class, this);
--- 69,73 ----
       * so don't use field initializers.
       */
!     protected void initializeGUI()
      {
          actions = new ActionFactory(WizardConfigEditor.class, this);

Index: TreeConfigEditor.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/TreeConfigEditor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TreeConfigEditor.java	16 Aug 2004 22:07:35 -0000	1.4
--- TreeConfigEditor.java	15 Jan 2005 12:05:33 -0000	1.5
***************
*** 61,65 ****
       * so don't use field initializers.
       */
!     protected void initialize()
      {
          JPanel panel = new JPanel();
--- 61,65 ----
       * so don't use field initializers.
       */
!     protected void initializeGUI()
      {
          JPanel panel = new JPanel();
***************
*** 248,254 ****
  
      /**
!      * SERIALUID(dm): A placeholder for the ultimate version id.
       */
!     private static final long serialVersionUID = 1L;
  
      /**
--- 248,254 ----
  
      /**
!      * Serialization ID
       */
!     private static final long serialVersionUID = 3256720688860576049L;
  
      /**

Index: AbstractConfigEditor.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/AbstractConfigEditor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractConfigEditor.java	8 Sep 2004 19:54:24 -0000	1.5
--- AbstractConfigEditor.java	15 Jan 2005 12:05:33 -0000	1.6
***************
*** 53,61 ****
       * @see org.crosswire.common.config.swing.ConfigEditor#init(org.crosswire.common.config.Config)
       */
!     public void init(Config aConfig)
      {
          this.config = aConfig;
  
!         initialize();
  
          config.addConfigListener(new ConfigListener()
--- 53,61 ----
       * @see org.crosswire.common.config.swing.ConfigEditor#init(org.crosswire.common.config.Config)
       */
!     public void construct(Config aConfig)
      {
          this.config = aConfig;
  
!         initializeGUI();
  
          config.addConfigListener(new ConfigListener()
***************
*** 122,129 ****
  
      /**
!      * Now this wasn't created with JBuilder but maybe, just maybe, by
!      * calling my method this, JBuilder may grok it.
       */
!     protected abstract void initialize();
  
      /**
--- 122,128 ----
  
      /**
!      * Create the GUI
       */
!     protected abstract void initializeGUI();
  
      /**

Index: TabbedConfigEditor.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/TabbedConfigEditor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TabbedConfigEditor.java	16 Aug 2004 22:07:35 -0000	1.2
--- TabbedConfigEditor.java	15 Jan 2005 12:05:33 -0000	1.3
***************
*** 45,49 ****
       * so don't use field initializers.
       */
!     protected void initialize()
      {
          JComponent bar = new ButtonPane(this);
--- 45,49 ----
       * so don't use field initializers.
       */
!     protected void initializeGUI()
      {
          JComponent bar = new ButtonPane(this);
***************
*** 154,156 ****
--- 154,161 ----
       */
      protected static final ImageIcon TAB_ICON = null;
+ 
+     /**
+      * Serialization ID
+      */
+     private static final long serialVersionUID = 3256444715753878326L;
  }

Index: ConfigEditor.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/ConfigEditor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ConfigEditor.java	28 Apr 2004 22:35:38 -0000	1.1
--- ConfigEditor.java	15 Jan 2005 12:05:33 -0000	1.2
***************
*** 37,41 ****
       * @param config The configurable settings
       */
!     public void init(Config config);
  
      /**
--- 37,41 ----
       * @param config The configurable settings
       */
!     public void construct(Config config);
  
      /**

Index: AdvancedConfigEditor.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/AdvancedConfigEditor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AdvancedConfigEditor.java	8 Sep 2004 19:54:24 -0000	1.4
--- AdvancedConfigEditor.java	15 Jan 2005 12:05:33 -0000	1.5
***************
*** 47,53 ****
  public class AdvancedConfigEditor extends TreeConfigEditor
  {
!     /**
!      * Now this wasn't created with JBuilder but maybe, just maybe, by
!      * calling my method this, JBuilder may grok it.
       */
      protected void jbInit()
--- 47,52 ----
  public class AdvancedConfigEditor extends TreeConfigEditor
  {
! 	/**
!      * WARNING: this code is not called from anywhere and is probably broken
       */
      protected void jbInit()
***************
*** 161,165 ****
      {
          Object obj = tree.getLastSelectedPathComponent();
!         if (obj == null) return;
  
          title.setText(obj + Msg.PROPERTIES.toString());
--- 160,167 ----
      {
          Object obj = tree.getLastSelectedPathComponent();
!         if (obj == null)
!         {
!             return;
!         }
  
          title.setText(obj + Msg.PROPERTIES.toString());
***************
*** 198,201 ****
--- 200,208 ----
  
      /**
+      * Serialization ID
+      */
+     private static final long serialVersionUID = 3616451198199345203L;
+ 
+     /**
       * A custom data model for the TreeConfig Tree
       * @author Joe Walker
***************
*** 225,232 ****
  
                      // Chop off all after the first dot
!                     int dot_pos = temp.indexOf("."); //$NON-NLS-1$
!                     if (dot_pos != -1)
                      {
!                         temp = temp.substring(0, dot_pos);
                      }
  
--- 232,239 ----
  
                      // Chop off all after the first dot
!                     int dotPos = temp.indexOf("."); //$NON-NLS-1$
!                     if (dotPos != -1)
                      {
!                         temp = temp.substring(0, dotPos);
                      }
  
***************
*** 361,364 ****
--- 368,376 ----
              return comp;
          }
+ 
+         /**
+          * Serialization ID
+          */
+         private static final long serialVersionUID = 3256720688860576049L;
      }
  }

Index: ConfigEditorFactory.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/ConfigEditorFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConfigEditorFactory.java	16 Aug 2004 22:07:35 -0000	1.3
--- ConfigEditorFactory.java	15 Jan 2005 12:05:33 -0000	1.4
***************
*** 58,62 ****
          {
              ConfigEditor base = (ConfigEditor) ClassUtil.getImplementation(ConfigEditor.class);
!             base.init(config);
              base.showDialog(parent, al);
          }
--- 58,62 ----
          {
              ConfigEditor base = (ConfigEditor) ClassUtil.getImplementation(ConfigEditor.class);
!             base.construct(config);
              base.showDialog(parent, al);
          }



More information about the jsword-svn mailing list