[jsword-svn] common/java/config/org/crosswire/common/config/swing s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Nov 28 14:36:33 MST 2004
Update of /cvs/jsword/common/java/config/org/crosswire/common/config/swing
In directory www.crosswire.org:/tmp/cvs-serv11368/java/config/org/crosswire/common/config/swing
Modified Files:
StringArrayField.java FontField.java NumberField.java
DirectoryField.java TextField.java PasswordField.java
MapField.java
Log Message:
intellij refactor - safe
Index: NumberField.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/NumberField.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NumberField.java 28 Apr 2004 22:35:38 -0000 1.1
--- NumberField.java 28 Nov 2004 21:36:31 -0000 1.2
***************
*** 37,41 ****
public class NumberField extends JPanel implements Field
{
! /**
* Create a new FileField
*/
--- 37,41 ----
public class NumberField extends JPanel implements Field
{
! /**
* Create a new FileField
*/
***************
*** 90,92 ****
--- 90,97 ----
*/
private JTextField text = new JTextField();
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3256443594867750451L;
}
Index: FontField.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/FontField.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FontField.java 16 Aug 2004 22:07:35 -0000 1.3
--- FontField.java 28 Nov 2004 21:36:31 -0000 1.4
***************
*** 35,39 ****
public class FontField extends FontChooser implements Field
{
! /**
*
*/
--- 35,39 ----
public class FontField extends FontChooser implements Field
{
! /**
*
*/
***************
*** 81,83 ****
--- 81,88 ----
return this;
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3258411729237848625L;
}
Index: PasswordField.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/PasswordField.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PasswordField.java 28 Apr 2004 22:35:38 -0000 1.1
--- PasswordField.java 28 Nov 2004 21:36:31 -0000 1.2
***************
*** 33,37 ****
public class PasswordField extends JPasswordField implements Field
{
! /**
* Some fields will need some extra info to display properly
* like the options in an options field. FieldMap calls this
--- 33,37 ----
public class PasswordField extends JPasswordField implements Field
{
! /**
* Some fields will need some extra info to display properly
* like the options in an options field. FieldMap calls this
***************
*** 69,71 ****
--- 69,76 ----
return this;
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3256442490960621625L;
}
Index: MapField.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/MapField.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MapField.java 16 Aug 2004 22:07:35 -0000 1.5
--- MapField.java 28 Nov 2004 21:36:31 -0000 1.6
***************
*** 54,58 ****
public class MapField extends JPanel implements Field
{
! /**
* Create a PropertyHashtableField for editing Hashtables.
*/
--- 54,58 ----
public class MapField extends JPanel implements Field
{
! /**
* Create a PropertyHashtableField for editing Hashtables.
*/
***************
*** 138,147 ****
if (JOptionPane.showConfirmDialog(this, input, Msg.NEW_CLASS.toString(), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
{
! String new_class = input.class_field.getText();
! String new_name = input.name_field.getText();
! if (isValid(new_class))
{
! tableModel.add(new_name, new_class);
}
}
--- 138,147 ----
if (JOptionPane.showConfirmDialog(this, input, Msg.NEW_CLASS.toString(), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
{
! String newClass = input.classField.getText();
! String newName = input.nameField.getText();
! if (isValid(newClass))
{
! tableModel.add(newName, newClass);
}
}
***************
*** 154,168 ****
{
InputPane input = new InputPane();
! input.name_field.setText(currentKey());
! input.class_field.setText(currentValue());
if (JOptionPane.showConfirmDialog(this, input, Msg.EDIT_CLASS.toString(), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
{
! String new_class = input.class_field.getText();
! String new_name = input.name_field.getText();
! if (isValid(new_class))
{
! tableModel.update(currentKey(), new_name, new_class);
}
}
--- 154,168 ----
{
InputPane input = new InputPane();
! input.nameField.setText(currentKey());
! input.classField.setText(currentValue());
if (JOptionPane.showConfirmDialog(this, input, Msg.EDIT_CLASS.toString(), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
{
! String newClass = input.classField.getText();
! String newName = input.nameField.getText();
! if (isValid(newClass))
{
! tableModel.update(currentKey(), newName, newClass);
}
}
***************
*** 190,197 ****
if (!superclass.isAssignableFrom(clazz))
{
! throw new ClassCastException(Msg.BAD_SUPERCLASS.toString(new Object[]
! {
! name, superclass
! }));
}
--- 190,194 ----
if (!superclass.isAssignableFrom(clazz))
{
! throw new ClassCastException(Msg.BAD_SUPERCLASS.toString(new Object[] { name, superclass }));
}
***************
*** 233,237 ****
static class NamedMapTableModel extends MapTableModel
{
! /**
*
*/
--- 230,234 ----
static class NamedMapTableModel extends MapTableModel
{
! /**
*
*/
***************
*** 256,259 ****
--- 253,261 ----
return false;
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3257566217748427059L;
}
***************
*** 264,268 ****
static class InputPane extends JPanel
{
! /**
*
*/
--- 266,270 ----
static class InputPane extends JPanel
{
! /**
*
*/
***************
*** 271,281 ****
super(new FieldLayout(10, 10));
! name_field = new JTextField();
! class_field = new JTextField(20);
add(new JLabel(Msg.NAME + ":")); //$NON-NLS-1$
! add(name_field);
add(new JLabel(Msg.CLASS + ":")); //$NON-NLS-1$
! add(class_field);
setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
--- 273,283 ----
super(new FieldLayout(10, 10));
! nameField = new JTextField();
! classField = new JTextField(20);
add(new JLabel(Msg.NAME + ":")); //$NON-NLS-1$
! add(nameField);
add(new JLabel(Msg.CLASS + ":")); //$NON-NLS-1$
! add(classField);
setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
***************
*** 285,294 ****
* To edit a name (Map key)
*/
! protected JTextField name_field;
/**
* To edit a class (Map value)
*/
! protected JTextField class_field;
}
--- 287,301 ----
* To edit a name (Map key)
*/
! protected JTextField nameField;
/**
* To edit a class (Map value)
*/
! protected JTextField classField;
!
! /**
! * Serialization ID
! */
! private static final long serialVersionUID = 3257849861683296313L;
}
***************
*** 315,320 ****
/**
! * SERIALUID(dm): A placeholder for the ultimate version id.
*/
! private static final long serialVersionUID = 1L;
}
--- 322,327 ----
/**
! * Serialization ID
*/
! private static final long serialVersionUID = 3257849861683296313L;
}
Index: DirectoryField.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/DirectoryField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DirectoryField.java 6 Oct 2004 22:52:34 -0000 1.2
--- DirectoryField.java 28 Nov 2004 21:36:31 -0000 1.3
***************
*** 29,33 ****
public class DirectoryField extends FileField
{
! /* (non-Javadoc)
* @see org.crosswire.common.config.swing.FileField#doBrowse()
*/
--- 29,33 ----
public class DirectoryField extends FileField
{
! /* (non-Javadoc)
* @see org.crosswire.common.config.swing.FileField#doBrowse()
*/
***************
*** 41,43 ****
--- 41,48 ----
}
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3905239018106075189L;
}
Index: TextField.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/TextField.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TextField.java 28 Apr 2004 22:35:38 -0000 1.1
--- TextField.java 28 Nov 2004 21:36:31 -0000 1.2
***************
*** 32,36 ****
public class TextField extends JTextField implements Field
{
! /**
* Some fields will need some extra info to display properly
* like the options in an options field. FieldMap calls this
--- 32,36 ----
public class TextField extends JTextField implements Field
{
! /**
* Some fields will need some extra info to display properly
* like the options in an options field. FieldMap calls this
***************
*** 75,77 ****
--- 75,82 ----
return this;
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3257009864814311474L;
}
Index: StringArrayField.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/swing/StringArrayField.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StringArrayField.java 16 Aug 2004 22:07:35 -0000 1.4
--- StringArrayField.java 28 Nov 2004 21:36:31 -0000 1.5
***************
*** 51,55 ****
public class StringArrayField extends JPanel implements Field
{
! /**
* Create a PropertyHashtableField for editing String arrays.
*/
--- 51,55 ----
public class StringArrayField extends JPanel implements Field
{
! /**
* Create a PropertyHashtableField for editing String arrays.
*/
***************
*** 194,198 ****
public static class InputPane extends JPanel
{
! /**
* Simple ctor
*/
--- 194,198 ----
public static class InputPane extends JPanel
{
! /**
* Simple ctor
*/
***************
*** 211,214 ****
--- 211,219 ----
*/
protected JTextField name_field = new JTextField();
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3256444715753878326L;
}
***************
*** 235,240 ****
/**
! * SERIALUID(dm): A placeholder for the ultimate version id.
*/
! private static final long serialVersionUID = 1L;
}
--- 240,245 ----
/**
! * Serialization ID
*/
! private static final long serialVersionUID = 3256444715753878326L;
}
More information about the jsword-svn
mailing list