Changeset 5526 for branches/OmeroEditor/src/ui/formFields/FormField.java

Timestamp:

07/04/08 11:49:37 (5 months ago)

Author:

will

Message:

Text-changed and focus listeners for text fields, which update the dataField with new values, have been extracted into a new class, AttributeEditorListeners?, used by (eg) AttributeTextEditor? and AttributeTextAreaEditor?

Files:

• branches/OmeroEditor/src/ui/formFields/FormField.java (modified) (7 diffs)

branches/OmeroEditor/src/ui/formFields/FormField.java

@@ -69 +69 @@
 // Subclasses have eg TextFields etc
 
-public abstract class FormField extends JPanel implements DataFieldObserver{
+public abstract class FormField 
+        extends JPanel 
+        implements DataFieldObserver{
         
         IDataFieldObservable dataFieldObs;
@@ -84 +86 @@
         public static final String HAS_FOCUS = "hasFocus";
         
-        boolean textChanged = false;
-        TextChangedListener textChangedListener = new TextChangedListener();
-        FocusListener focusChangedListener = new FocusChangedListener();
+        /**
+         * Add this listener to various buttons etc, so that if they are clicked.
+         * this field will become selected.
+         */
         FocusListener componentFocusListener = new FormFieldComponentFocusListener();
         
@@ -128 +131 @@
         Icon spacerIcon;                // A blank icon to replace collapsedIcon if there are no children.
         
-        // used in Diff (comparing two trees), to get a ref to all components, to colour red if different!
-        ArrayList<JComponent> visibleAttributes = new ArrayList<JComponent>();
                 
         boolean showDescription = false;        // not saved, just used to toggle
@@ -205 +206 @@
                 descriptionLabel = new JLabel();
                 descriptionLabel.setBackground(null);
-                visibleAttributes.add(descriptionLabel);
+                
                 infoIcon = ImageFactory.getInstance().getIcon(ImageFactory.INFO_ICON);
                 descriptionButton = new JButton(infoIcon);
@@ -559 +560 @@
                         if(evt.getPropertyName().equals(FormField.HAS_FOCUS)) {
                                 panelClicked(true);
+                                System.out.println("FormField. FocusGainedPropertyChangedListener");
                         }
                 }
@@ -761 +763 @@
         }
 
-        public ArrayList<JComponent> getVisibleAttributes() {
-                return visibleAttributes;
-        }
         
         private String addHtmlTagsForNameLabel(String text) {
@@ -770 +769 @@
         }
         
-        
-        public class TextChangedListener implements KeyListener {
-                
-                public void keyTyped(KeyEvent event) {
-                        textChanged = true;             // some character was typed, so set this flag
-                }
-                public void keyPressed(KeyEvent event) {}
-                public void keyReleased(KeyEvent event) {}
-        
-        }
-        
-        public class FocusChangedListener implements FocusListener {
-                
-                public void focusLost(FocusEvent event) {
-                        if (textChanged) {
-                                JTextComponent source = (JTextComponent)event.getSource();
-                                
-                                setDataFieldAttribute(source.getName(), source.getText(), true);
-                                
-                                textChanged = false;
-                        }
-                }
-                public void focusGained(FocusEvent event) {}
-        }
-        
-
         // called to update dataField with attribute
         protected void setDataFieldAttribute(String attributeName, String value, boolean notifyUndoRedo) {