Spring Rich Client

Update of /cvsroot/spring-rich-c/spring-richclient/lib/spring
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3815/lib/spring

Modified Files:
	spring-sandbox.jar 
Log Message:


Index: spring-sandbox.jar
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/lib/spring/spring-sandbox.jar,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
Binary files /tmp/cvsiaiZsu and /tmp/cvsg4qV6d differ

Update of /cvsroot/spring-rich-c/spring-richclient/sandbox/src/org/springframework/richclient/preference
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23259/sandbox/src/org/springframework/richclient/preference

Added Files:
	PropertiesPreferenceStore.java PreferenceDialog.java 
	FormBackedPreferencePage.java PreferencePage.java 
	PreferenceCommand.java PreferenceStore.java 
	PreferenceManager.java 
Log Message:
initial checkin of preferences support

--- NEW FILE: FormBackedPreferencePage.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.preference;

import javax.swing.JComponent;

import org.springframework.richclient.forms.Form;

/**
 * @author Peter De Bruycker
 */
public class FormBackedPreferencePage extends PreferencePage {

    private Form form;

    public FormBackedPreferencePage(Form form) {
        super(form.getId());
        this.form = form;
    }

    protected JComponent createContents() {
        return form.getControl();
    }
}
--- NEW FILE: PreferencePage.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.preference;

import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JPanel;

import org.springframework.richclient.dialog.AbstractDialogPage;
import org.springframework.richclient.layout.GridBagLayoutBuilder;
import org.springframework.util.Assert;

/**
 * @author Peter De Bruycker
 */
public abstract class PreferencePage extends AbstractDialogPage {

    private JButton applyButton;

    private boolean createApplyAndDefaultButtons = true;

    private JButton defaultsButton;

    private PreferencePage parent;

    private PreferenceDialog preferenceDialog;

    public PreferencePage(String id) {
        super(id);
    }

    private JComponent createButtons() {
        JPanel panel = new JPanel(new FlowLayout(FlowLayout.RIGHT));

        defaultsButton = new JButton("Restore defaults");
        defaultsButton.addActionListener(new ActionListener() {

            public void actionPerformed(ActionEvent e) {
                onDefaults();
            }
        });

        applyButton = new JButton("Apply");
        applyButton.addActionListener(new ActionListener() {

            public void actionPerformed(ActionEvent e) {
                onApply();
            }
        });

        panel.add(defaultsButton);
        panel.add(applyButton);

        return panel;
    }

    protected abstract JComponent createContents();

    protected final JComponent createControl() {
        GridBagLayoutBuilder builder = new GridBagLayoutBuilder();

        //    JPanel panel = new JPanel(new BorderLayout());

        JComponent contents = createContents();
        Assert.notNull(contents, "Contents cannot be null.");
        //    panel.add(contents);
        builder.append(contents, 1, 1, true, true);

        if (createApplyAndDefaultButtons) {
            builder.nextLine();
            builder.append(createButtons());
            //      panel.add(createButtons(), BorderLayout.SOUTH);
        }

        //    return panel;
        return builder.getPanel();
    }

    public PreferencePage getParent() {
        return parent;
    }

    protected PreferenceStore getPreferenceStore() {
        return preferenceDialog.getPreferenceStore();
    }

    /**
     * Must store the preference values in the PreferenceStore. Does not save
     * the PreferenceStore. Subclasses should override this method.
     */
    protected void onApply() {
    }

    protected void onDefaults() {
    }

    /**
     * Notification that the user clicked the OK button on the PreferenceDialog.
     */
    protected boolean onFinish() {
        onApply();
        return true;
    }

    public void setCreateApplyAndDefaultButtons(boolean create) {
        createApplyAndDefaultButtons = create;
    }

    public void setParent(PreferencePage parent) {
        this.parent = parent;
    }

    public void setPreferenceDialog(PreferenceDialog dialog) {
        Assert.notNull(dialog);
        preferenceDialog = dialog;
    }
}
--- NEW FILE: PreferenceManager.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.preference;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
 * @author Peter De Bruycker
 */
public class PreferenceManager {

    private PreferenceDialog dialog;

    private List preferencePages = new ArrayList();

    private PreferenceStore preferenceStore;

    public PreferenceDialog createDialog() {
        if (dialog == null) {
            dialog = new PreferenceDialog();

            for (Iterator iter = preferencePages.iterator(); iter.hasNext();) {
                PreferencePage page = (PreferencePage) iter.next();
                if (page.getParent() == null) {
                    dialog.addPreferencePage(page);
                } else {
                    dialog.addPreferencePage(page.getParent(), page);
                }
            }

            dialog.setPreferenceStore(preferenceStore);
        }
        return dialog;
    }

    public PreferenceStore getPreferenceStore() {
        return preferenceStore;
    }

    public void setPreferencePages(List pages) {
        preferencePages = pages;
    }

    public void setPreferenceStore(PreferenceStore store) {
        preferenceStore = store;
        try {
            preferenceStore.load();
        } catch (IOException e) {
            e.printStackTrace();
        }
    }
}
--- NEW FILE: PropertiesPreferenceStore.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.preference;

import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;

import org.springframework.util.Assert;

/**
 * @author Peter De Bruycker
 */
public class PropertiesPreferenceStore implements PreferenceStore {

    private Properties defaults = new Properties();

    private boolean dirty = false;

    private String fileName;

    private List listeners = new ArrayList();

    private Properties properties = new Properties();

    public PropertiesPreferenceStore() {
    }

    public void addPropertyChangeListener(PropertyChangeListener listener) {
        listeners.add(listener);
    }

    public void export(OutputStream out) throws IOException {
        Assert.notNull(out, "OutputStream cannot be null.");
        properties.store(out, null);
        dirty = false;
    }

    public void firePropertyChangeEvent(String name, Object oldValue,
            Object newValue) {

        if (listeners.size() > 0
                && (oldValue == null || !oldValue.equals(newValue))) {
            final PropertyChangeEvent pe = new PropertyChangeEvent(this, name,
                    oldValue, newValue);
            for (int i = 0; i < listeners.size(); ++i) {
                PropertyChangeListener l = (PropertyChangeListener) listeners
                        .get(i);
                l.propertyChange(pe);
            }
        }
    }

    private boolean getBoolean(Properties p, String name) {
        return Boolean.valueOf(p.getProperty(name)).booleanValue();
    }

    public boolean getBoolean(String name) {
        return getBoolean(properties, name);
    }

    public boolean getDefaultBoolean(String name) {
        return getBoolean(defaults, name);
    }

    public double getDefaultDouble(String name) {
        return getDouble(defaults, name);
    }

    public float getDefaultFloat(String name) {
        return getFloat(defaults, name);
    }

    public int getDefaultInt(String name) {
        return getInt(defaults, name);
    }

    public long getDefaultLong(String name) {
        return getLong(defaults, name);
    }

    public String getDefaultString(String name) {
        return getString(defaults, name);
    }

    private double getDouble(Properties p, String name) {
        try {
            return Double.parseDouble(p.getProperty(name));
        } catch (NumberFormatException e) {
            return 0.0;
        }
    }

    public double getDouble(String name) {
        return getDouble(properties, name);
    }

    public String getFileName(String name) {
        return fileName;
    }

    private float getFloat(Properties p, String name) {
        try {
            return Float.parseFloat(p.getProperty(name));
        } catch (NumberFormatException e) {
            return 0.0f;
        }
    }

    public float getFloat(String name) {
        return getFloat(properties, name);
    }

    private int getInt(Properties p, String name) {
        try {
            return Integer.parseInt(p.getProperty(name));
        } catch (NumberFormatException e) {
            return 0;
        }
    }

    public int getInt(String name) {
        return getInt(properties, name);
    }

    private long getLong(Properties p, String name) {
        try {
            return Long.parseLong(p.getProperty(name));
        } catch (NumberFormatException e) {
            return 0L;
        }
    }

    public long getLong(String name) {
        return getLong(properties, name);
    }

    public List getPropertyChangeListeners() {
        return listeners;
    }

    private String getString(Properties p, String name) {
        String value = p.getProperty(name);
        return value == null ? "" : value;
    }

    public String getString(String name) {
        return getString(properties, name);
    }

    public boolean isDefault(String name) {
        return (!properties.containsKey(name) && defaults.containsKey(name));
    }

    public boolean isDirty() {
        return dirty;
    }

    public void load() throws IOException {
        Assert.notNull(fileName, "fileName cannot be null");
        FileInputStream in = new FileInputStream(fileName);
        properties.load(in);
        in.close();
    }

    public void removePropertyChangeListener(PropertyChangeListener listener) {
        listeners.remove(listener);
    }

    public void save() throws IOException {
        Assert.notNull(fileName, "fileName cannot be null");
        FileOutputStream out = null;
        try {
            out = new FileOutputStream(fileName);
            properties.store(out, null);
        } finally {
            if (out != null)
                out.close();
        }
    }

    public void setDefault(String name, boolean value) {
        setValue(defaults, name, value);
    }

    public void setDefault(String name, double value) {
        setValue(defaults, name, value);
    }

    public void setDefault(String name, float value) {
        setValue(defaults, name, value);
    }

    public void setDefault(String name, int value) {
        setValue(defaults, name, value);
    }

    public void setDefault(String name, long value) {
        setValue(defaults, name, value);
    }

    public void setDefault(String name, String value) {
        setValue(defaults, name, value);
    }

    public void setFileName(String name) {
        fileName = name;
    }

    public void setToDefault(String name) {
        Object oldValue = properties.get(name);
        properties.remove(name);
        dirty = true;
        Object newValue = defaults.get(name);
        firePropertyChangeEvent(name, oldValue, newValue);
    }

    private void setValue(Properties p, String name, boolean value) {
        p.put(name, value == true ? "true" : "false");
    }

    private void setValue(Properties p, String name, double value) {
        p.put(name, Double.toString(value));
    }

    private void setValue(Properties p, String name, float value) {
        p.put(name, Float.toString(value));
    }

    private void setValue(Properties p, String name, int value) {
        p.put(name, Integer.toString(value));
    }

    private void setValue(Properties p, String name, long value) {
        p.put(name, Long.toString(value));
    }

    private void setValue(Properties p, String name, String value) {
        p.put(name, value);
    }

    public void setValue(String name, boolean value) {
        boolean oldValue = getBoolean(name);
        if (oldValue != value) {
            setValue(properties, name, value);
            dirty = true;
            firePropertyChangeEvent(name, new Boolean(oldValue), new Boolean(
                    value));
        }
    }

    public void setValue(String name, double value) {
        double oldValue = getDouble(name);
        if (oldValue != value) {
            setValue(properties, name, value);
            dirty = true;
            firePropertyChangeEvent(name, new Double(oldValue), new Double(
                    value));
        }
    }

    public void setValue(String name, float value) {
        float oldValue = getFloat(name);
        if (oldValue != value) {
            setValue(properties, name, value);
            dirty = true;
            firePropertyChangeEvent(name, new Float(oldValue), new Float(value));
        }
    }

    public void setValue(String name, int value) {
        int oldValue = getInt(name);
        if (oldValue != value) {
            setValue(properties, name, value);
            dirty = true;
            firePropertyChangeEvent(name, new Integer(oldValue), new Integer(
                    value));
        }
    }

    public void setValue(String name, long value) {
        long oldValue = getLong(name);
        if (oldValue != value) {
            setValue(properties, name, value);
            dirty = true;
            firePropertyChangeEvent(name, new Long(oldValue), new Long(value));
        }
    }

    public void setValue(String name, String value) {
        String oldValue = getString(name);
        if (oldValue == null || !oldValue.equals(value)) {
            setValue(properties, name, value);
            dirty = true;
            firePropertyChangeEvent(name, oldValue, value);
        }
    }
}
--- NEW FILE: PreferenceDialog.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.preference;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import org.springframework.richclient.dialog.TitledPageApplicationDialog;
import org.springframework.richclient.dialog.TreeCompositeDialogPage;
import org.springframework.util.Assert;

/**
 * @author Peter De Bruycker
 */
public class PreferenceDialog extends TitledPageApplicationDialog {

    private List preferencePages = new ArrayList();

    private PreferenceStore preferenceStore;

    public PreferenceDialog() {
        super(new TreeCompositeDialogPage("preferenceDialog"));
    }

    private void addPage(PreferencePage page) {
        Assert.isTrue(!isControlCreated(),
                "Add pages before control is created.");
        preferencePages.add(page);
        page.setPreferenceDialog(this);
    }

    public void addPreferencePage(PreferencePage page) {
        addPage(page);
        getPageContainer().addPage(page);
    }

    public void addPreferencePage(PreferencePage parent, PreferencePage page) {
        addPage(page);
        getPageContainer().addPage(parent, page);
    }

    private TreeCompositeDialogPage getPageContainer() {
        return (TreeCompositeDialogPage) getDialogPage();
    }

    public PreferenceStore getPreferenceStore() {
        return preferenceStore;
    }

    public boolean onFinish() {
        for (Iterator iter = preferencePages.iterator(); iter.hasNext();) {
            PreferencePage page = (PreferencePage) iter.next();
            // give page the chance to veto
            if (!page.onFinish()) {
                return false;
            }
        }
        if (preferenceStore != null && preferenceStore.isDirty()) {
            try {
                preferenceStore.save();
            } catch (IOException e) {
                // TODO handle exception
                e.printStackTrace();
                return false;
            }
        }

        return true;
    }

    public void setPreferenceStore(PreferenceStore store) {
        Assert.notNull(store, "PreferenceStore cannot be null.");
        preferenceStore = store;
    }
}
--- NEW FILE: PreferenceStore.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.preference;

import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.io.OutputStream;

/**
 * A <code>PreferenceStore</code> holds preferences.
 * @author Peter De Bruycker
 */
public interface PreferenceStore {

    public void addPropertyChangeListener(PropertyChangeListener listener);

    public void export(OutputStream out) throws IOException;

    public boolean getBoolean(String name);

    public boolean getDefaultBoolean(String name);

    public double getDefaultDouble(String name);

    public float getDefaultFloat(String name);

    public int getDefaultInt(String name);

    public long getDefaultLong(String name);

    public String getDefaultString(String name);

    public double getDouble(String name);

    public float getFloat(String name);

    public int getInt(String name);

    public long getLong(String name);

    public String getString(String name);

    public boolean isDefault(String name);

    public boolean isDirty();

    public void load() throws IOException;

    public void removePropertyChangeListener(PropertyChangeListener listener);

    public void save() throws IOException;

    public void setDefault(String name, boolean value);

    public void setDefault(String name, double value);

    public void setDefault(String name, float value);

    public void setDefault(String name, int value);

    public void setDefault(String name, long value);

    public void setDefault(String name, String defaultObject);

    public void setToDefault(String name);

    public void setValue(String name, boolean value);

    public void setValue(String name, double value);

    public void setValue(String name, float value);

    public void setValue(String name, int value);

    public void setValue(String name, long value);

    public void setValue(String name, String value);

}
--- NEW FILE: PreferenceCommand.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.preference;

import org.springframework.richclient.command.ActionCommand;

/**
 * @author Peter De Bruycker
 */
public class PreferenceCommand extends ActionCommand {

    private PreferenceManager preferenceManager;

    public PreferenceCommand() {
        super("preferenceCommand");
    }
    
    public void doExecuteCommand() {
        preferenceManager.createDialog().showDialog();
    }

    public void setPreferenceManager(PreferenceManager manager) {
        preferenceManager = manager;
    }
}

Update of /cvsroot/spring-rich-c/spring-richclient/sandbox/src/org/springframework/richclient/preference
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23235/sandbox/src/org/springframework/richclient/preference

Log Message:
Directory /cvsroot/spring-rich-c/spring-richclient/sandbox/src/org/springframework/richclient/preference added to the repository

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15079/src/org/springframework/richclient/command/config

Modified Files:
	CommandButtonIconInfo.java 
Log Message:
added equals and hashcode methods

Index: CommandButtonIconInfo.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/config/CommandButtonIconInfo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CommandButtonIconInfo.java	22 Oct 2004 21:35:23 -0000	1.6
--- CommandButtonIconInfo.java	28 Oct 2004 18:14:34 -0000	1.7
***************
*** 27,30 ****
--- 27,31 ----
  import org.springframework.richclient.factory.ButtonConfigurer;
  import org.springframework.util.Assert;
+ import org.springframework.util.ObjectUtils;
  import org.springframework.util.ToStringCreator;
  
***************
*** 34,37 ****
--- 35,39 ----
  public class CommandButtonIconInfo implements ButtonConfigurer,
          VisualizedElement {
+ 
      public static final CommandButtonIconInfo BLANK_ICON_INFO = new CommandButtonIconInfo(
              null);
***************
*** 79,88 ****
              button.setPressedIcon(null);
              button.setRolloverIcon(null);
!         }
!         else if (button instanceof JMenuItem) {
              button.setIcon(icon);
              button.setDisabledIcon(disabledIcon);
!         }
!         else {
              // jbutton or togglebuttons
              button.setIcon(icon);
--- 81,88 ----
              button.setPressedIcon(null);
              button.setRolloverIcon(null);
!         } else if (button instanceof JMenuItem) {
              button.setIcon(icon);
              button.setDisabledIcon(disabledIcon);
!         } else {
              // jbutton or togglebuttons
              button.setIcon(icon);
***************
*** 97,103 ****
      public Image getImage() {
          if (getIcon() instanceof ImageIcon) {
!             return ((ImageIcon)getIcon()).getImage();
!         }
!         else {
              return null;
          }
--- 97,102 ----
      public Image getImage() {
          if (getIcon() instanceof ImageIcon) {
!             return ((ImageIcon) getIcon()).getImage();
!         } else {
              return null;
          }
***************
*** 147,149 ****
--- 146,176 ----
          return new ToStringCreator(this).appendProperties().toString();
      }
+ 
+     public boolean equals(Object o) {
+         if (!(o instanceof CommandButtonIconInfo)) {
+             return false;
+         }
+         CommandButtonIconInfo other = (CommandButtonIconInfo) o;
+         return ObjectUtils.nullSafeEquals(icon, other.icon)
+                 && ObjectUtils.nullSafeEquals(disabledIcon, other.disabledIcon)
+                 && ObjectUtils.nullSafeEquals(pressedIcon, other.pressedIcon)
+                 && ObjectUtils.nullSafeEquals(rolloverIcon, other.rolloverIcon)
+                 && ObjectUtils.nullSafeEquals(selectedIcon, other.selectedIcon);
+     }
+ 
+     /*
+      * (non-Javadoc)
+      * 
+      * @see java.lang.Object#hashCode()
+      */
+     public int hashCode() {
+         int hash = 1;
+         hash = hash * 31 + (icon == null ? 0 : icon.hashCode());
+         hash = hash * 31 + (disabledIcon == null ? 0 : disabledIcon.hashCode());
+         hash = hash * 31 + (pressedIcon == null ? 0 : pressedIcon.hashCode());
+         hash = hash * 31 + (rolloverIcon == null ? 0 : rolloverIcon.hashCode());
+         hash = hash * 31 + (selectedIcon == null ? 0 : selectedIcon.hashCode());
+         return hash;
+     }
+ 
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17659/src/org/springframework/richclient/command

Modified Files:
	CommandGroupFactoryBean.java 
Log Message:


Index: CommandGroupFactoryBean.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/CommandGroupFactoryBean.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CommandGroupFactoryBean.java	28 Oct 2004 16:21:00 -0000	1.4
--- CommandGroupFactoryBean.java	28 Oct 2004 16:22:22 -0000	1.5
***************
*** 21,27 ****
  	public static final String SEPARATOR_MEMBER_CODE = "separator";
  
! 	public static final String COMMAND_MEMBER_CODE = "command:";
  
! 	public static final String GROUP_MEMBER_CODE = "group:";
  
  	private String groupId;
--- 21,27 ----
  	public static final String SEPARATOR_MEMBER_CODE = "separator";
  
! 	public static final String COMMAND_MEMBER_PREFIX = "command:";
  
! 	public static final String GROUP_MEMBER_PREFIX = "group:";
  
  	private String groupId;
***************
*** 127,134 ****
  					group.addGlueInternal();
  				}
! 				else if (str.startsWith(COMMAND_MEMBER_CODE)) {
  					addCommandMember(str.substring(8), false, group);
  				}
! 				else if (str.startsWith(GROUP_MEMBER_CODE)) {
  					addCommandMember(str.substring(6), true, group);
  				}
--- 127,134 ----
  					group.addGlueInternal();
  				}
! 				else if (str.startsWith(COMMAND_MEMBER_PREFIX)) {
  					addCommandMember(str.substring(8), false, group);
  				}
! 				else if (str.startsWith(GROUP_MEMBER_PREFIX)) {
  					addCommandMember(str.substring(6), true, group);
  				}

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17240/src/org/springframework/richclient/command

Modified Files:
	CommandGroupFactoryBean.java SimpleGroupMember.java 
	CommandGroup.java LazyGroupMember.java 
Removed Files:
	InlinedGroupMember.java 
Log Message:
removed unneeded complexity

Index: LazyGroupMember.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/LazyGroupMember.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LazyGroupMember.java	9 Sep 2004 05:20:32 -0000	1.2
--- LazyGroupMember.java	28 Oct 2004 16:21:15 -0000	1.3
***************
*** 22,133 ****
  
  public class LazyGroupMember extends GroupMember {
!     private CommandGroup parentGroup;
! 
!     private String lazyCommandId;
! 
!     private boolean inlinedGroup;
! 
!     private boolean addedLazily;
  
!     private GroupMember loadedMember;
  
!     public LazyGroupMember(CommandGroup parentGroup, String lazyCommandId) {
!         this(parentGroup, lazyCommandId, false);
!     }
  
!     public LazyGroupMember(CommandGroup parentGroup, String lazyCommandId,
!             boolean inlinedGroup) {
!         if (logger.isDebugEnabled()) {
!             logger.debug("Lazy group member '" + lazyCommandId
!                     + "' instantiated for group '" + parentGroup.getId() + "'");
!         }
!         this.parentGroup = parentGroup;
!         this.lazyCommandId = lazyCommandId;
!         this.inlinedGroup = inlinedGroup;
!     }
  
!     public void setEnabled(boolean enabled) {
!         if (loadedMember != null) {
!             loadedMember.setEnabled(enabled);
!         }
!     }
  
!     protected void fill(GroupContainerPopulator parentContainerPopulator,
!             Object controlFactory, CommandButtonConfigurer buttonConfigurer,
!             List previousButtons) {
!         if (lazyLoaded()) {
!             loadedMember.fill(parentContainerPopulator, controlFactory,
!                     buttonConfigurer, previousButtons);
!         }
!     }
  
!     private boolean lazyLoaded() {
!         if (loadedMember != null) { return true; }
!         doLazyLoad();
!         return loadedMember != null;
!     }
  
!     private void doLazyLoad() {
!         CommandRegistry commandRegistry = parentGroup.getCommandRegistry();
  
!         Assert.isTrue(parentGroup.getCommandRegistry() != null,
!                 "Command registry must be set for group '"
!                         + parentGroup.getId()
!                         + "' in order to load lazy command '" + lazyCommandId
!                         + "'.");
  
!         if (commandRegistry.containsCommandGroup(lazyCommandId)) {
!             CommandGroup group = commandRegistry.getCommandGroup(lazyCommandId);
!             Assert.notNull(group);
!             if (inlinedGroup) {
!                 loadedMember = new InlinedGroupMember(parentGroup, group);
!             }
!             else {
!                 loadedMember = new SimpleGroupMember(parentGroup, group);
!             }
!         }
!         else if (commandRegistry.containsActionCommand(lazyCommandId)) {
!             ActionCommand command = commandRegistry
!                     .getActionCommand(lazyCommandId);
!             Assert.notNull(command);
!             loadedMember = new SimpleGroupMember(parentGroup, command);
!         }
!         else {
!             logger
!                     .warn("Lazy command '"
!                             + lazyCommandId
!                             + "' was asked to display; however, no backing command instance exists in registry.");
!         }
  
!         if (addedLazily && loadedMember != null) {
!             loadedMember.onAdded();
!         }
!     }
  
!     public boolean managesCommand(String commandId) {
!         return this.lazyCommandId.equals(commandId);
!     }
  
!     public boolean managesCommandDirectly(String commandId) {
!         return managesCommand(commandId);
!     }
  
!     protected void onAdded() {
!         if (loadedMember != null) {
!             loadedMember.onAdded();
!         }
!         else {
!             addedLazily = true;
!         }
!     }
  
!     protected void onRemoved() {
!         if (loadedMember != null) {
!             loadedMember.onRemoved();
!         }
!         else {
!             addedLazily = false;
!         }
!     }
  
  }
\ No newline at end of file
--- 22,107 ----
  
  public class LazyGroupMember extends GroupMember {
! 	private CommandGroup parentGroup;
  
! 	private String lazyCommandId;
  
! 	private boolean addedLazily;
  
! 	private GroupMember loadedMember;
  
! 	public LazyGroupMember(CommandGroup parentGroup, String lazyCommandId) {
! 		if (logger.isDebugEnabled()) {
! 			logger.debug("Lazy group member '" + lazyCommandId + "' instantiated for group '" + parentGroup.getId() + "'");
! 		}
! 		this.parentGroup = parentGroup;
! 		this.lazyCommandId = lazyCommandId;
! 	}
  
! 	public void setEnabled(boolean enabled) {
! 		if (loadedMember != null) {
! 			loadedMember.setEnabled(enabled);
! 		}
! 	}
  
! 	protected void fill(GroupContainerPopulator parentContainerPopulator, Object controlFactory,
! 			CommandButtonConfigurer buttonConfigurer, List previousButtons) {
! 		if (lazyLoaded()) {
! 			loadedMember.fill(parentContainerPopulator, controlFactory, buttonConfigurer, previousButtons);
! 		}
! 	}
  
! 	private boolean lazyLoaded() {
! 		if (loadedMember != null) {
! 			return true;
! 		}
! 		doLazyLoad();
! 		return loadedMember != null;
! 	}
  
! 	private void doLazyLoad() {
! 		CommandRegistry commandRegistry = parentGroup.getCommandRegistry();
  
! 		Assert.isTrue(parentGroup.getCommandRegistry() != null, "Command registry must be set for group '"
! 				+ parentGroup.getId() + "' in order to load lazy command '" + lazyCommandId + "'.");
  
! 		if (commandRegistry.containsCommandGroup(lazyCommandId)) {
! 			CommandGroup group = commandRegistry.getCommandGroup(lazyCommandId);
! 			loadedMember = new SimpleGroupMember(parentGroup, group);
! 		}
! 		else if (commandRegistry.containsActionCommand(lazyCommandId)) {
! 			ActionCommand command = commandRegistry.getActionCommand(lazyCommandId);
! 			loadedMember = new SimpleGroupMember(parentGroup, command);
! 		}
! 		else {
! 			logger.warn("Lazy command '" + lazyCommandId
! 					+ "' was asked to display; however, no backing command instance exists in registry.");
! 		}
  
! 		if (addedLazily && loadedMember != null) {
! 			loadedMember.onAdded();
! 		}
! 	}
  
! 	public boolean managesCommand(String commandId) {
! 		return this.lazyCommandId.equals(commandId);
! 	}
  
! 	protected void onAdded() {
! 		if (loadedMember != null) {
! 			loadedMember.onAdded();
! 		}
! 		else {
! 			addedLazily = true;
! 		}
! 	}
  
! 	protected void onRemoved() {
! 		if (loadedMember != null) {
! 			loadedMember.onRemoved();
! 		}
! 		else {
! 			addedLazily = false;
! 		}
! 	}
  
  }
\ No newline at end of file

Index: CommandGroupFactoryBean.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/CommandGroupFactoryBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CommandGroupFactoryBean.java	19 Oct 2004 13:17:46 -0000	1.3
--- CommandGroupFactoryBean.java	28 Oct 2004 16:21:00 -0000	1.4
***************
*** 17,217 ****
   */
  public class CommandGroupFactoryBean implements BeanNameAware, FactoryBean {
!     public static final String GLUE_MEMBER_CODE = "glue";
  
!     public static final String SEPARATOR_MEMBER_CODE = "separator";
  
!     public static final String COMMAND_MEMBER_CODE = "command://";
  
!     public static final String GROUP_MEMBER_CODE = "group://";
  
!     private String groupId;
  
!     private CommandRegistry commandRegistry;
  
!     private CommandConfigurer commandConfigurer;
  
!     private Object[] encodedMembers;
  
!     private boolean exclusive;
  
!     private boolean allowsEmptySelection;
  
!     private CommandGroup commandGroup;
  
!     public CommandGroupFactoryBean() {
  
!     }
  
!     public CommandGroupFactoryBean(String groupId, Object[] encodedMembers) {
!         this(groupId, null, null, encodedMembers);
!     }
  
!     public CommandGroupFactoryBean(String groupId,
!             CommandRegistry commandRegistry, Object[] encodedMembers) {
!         this(groupId, commandRegistry, null, encodedMembers);
!     }
  
!     public CommandGroupFactoryBean(String groupId,
!             CommandRegistry commandRegistry, CommandConfigurer configurer,
!             Object[] encodedMembers) {
!         setBeanName(groupId);
!         setCommandRegistry(commandRegistry);
!         setMembers(encodedMembers);
!         setCommandConfigurer(configurer);
!     }
  
!     public void setCommandRegistry(CommandRegistry commandRegistry) {
!         this.commandRegistry = commandRegistry;
!     }
  
!     public void setCommandConfigurer(CommandConfigurer configurer) {
!         this.commandConfigurer = configurer;
!     }
  
!     public void setMembers(Object[] encodedMembers) {
!         this.encodedMembers = encodedMembers;
!     }
  
!     public void setBeanName(String beanName) {
!         this.groupId = beanName;
!     }
  
!     public boolean isExclusive() {
!         return exclusive;
!     }
  
!     public void setExclusive(boolean exclusive) {
!         this.exclusive = exclusive;
!     }
  
!     public void setAllowsEmptySelection(boolean allowsEmptySelection) {
!         this.allowsEmptySelection = allowsEmptySelection;
!     }
  
!     public Object getObject() throws Exception {
!         return getCommandGroup();
!     }
  
!     public CommandGroup getCommandGroup() {
!         if (commandGroup == null) {
!             commandGroup = createCommandGroup();
!         }
!         return commandGroup;
!     }
  
!     protected CommandGroup createCommandGroup() {
!         CommandGroup group;
!         if (isExclusive()) {
!             ExclusiveCommandGroup g = new ExclusiveCommandGroup(groupId,
!                     commandRegistry);
!             g.setAllowsEmptySelection(allowsEmptySelection);
!             group = g;
!         }
!         else {
!             group = new CommandGroup(groupId, commandRegistry);
!         }
!         initCommandGroupMembers(group);
!         return group;
!     }
  
!     private void initCommandGroupMembers(CommandGroup group) {
!         for (int i = 0; i < encodedMembers.length; i++) {
!             Object o = encodedMembers[i];
!             if (o instanceof AbstractCommand) {
!                 group.addInternal((AbstractCommand)o);
!                 configureIfNecessary((AbstractCommand)o);
!             }
!             else if (o instanceof String) {
!                 String str = (String)o;
!                 if (str.equalsIgnoreCase(SEPARATOR_MEMBER_CODE)) {
!                     group.addSeparatorInternal();
!                 }
!                 else if (str.equalsIgnoreCase(GLUE_MEMBER_CODE)) {
!                     group.addGlueInternal();
!                 }
!                 else if (str.startsWith(COMMAND_MEMBER_CODE)) {
!                     addCommandMember(str.substring(10), false, group);
!                 }
!                 else if (str.startsWith(GROUP_MEMBER_CODE)) {
!                     addCommandMember(str.substring(8), true, group);
!                 }
!                 else {
!                     addCommandMember(str, false, group);
!                 }
!             }
!         }
!     }
  
!     private void addCommandMember(String commandId, boolean isGroup,
!             CommandGroup group) {
!         EncodedGroupMemberInfo info = parseEncodedCommandInfo(commandId);
!         AbstractCommand command = null;
!         if (commandRegistry != null) {
!             if (isGroup) {
!                 command = commandRegistry.getCommandGroup(info.commandId);
!                 if (command != null) {
!                     if (info.inlined) {
!                         group.addInlinedInternal((CommandGroup)command);
!                     }
!                     else {
!                         group.addInternal(command);
!                     }
!                 }
!             }
!             else {
!                 command = commandRegistry.getActionCommand(info.commandId);
!                 if (command != null) {
!                     group.addInternal(command);
!                 }
!             }
!         }
!         if (command == null) {
!             group.addLazyInternal(info.commandId, info.inlined);
!         }
!     }
  
!     private EncodedGroupMemberInfo parseEncodedCommandInfo(String str) {
!         String[] info = StringUtils.commaDelimitedListToStringArray(str);
!         if (info.length == 1) {
!             return new EncodedGroupMemberInfo(info[0], false);
!         }
!         else if (info.length == 2) {
!             return new EncodedGroupMemberInfo(info[0], Boolean.valueOf(info[1])
!                     .booleanValue());
!         }
!         else {
!             throw new IllegalArgumentException(
!                     "Invalid encoded command group info '" + str
!                             + "'; code should be of format <groupId>,[inlined]");
!         }
!     }
  
!     protected void configureIfNecessary(AbstractCommand command) {
!         if (commandConfigurer != null) {
!             if (!command.isFaceConfigured()) {
!                 System.out.println("configuring command " + command.getId());
!                 commandConfigurer.configure(command);
!             }
!         }
!     }
  
!     private static final class EncodedGroupMemberInfo {
!         private String commandId;
  
!         private boolean inlined;
  
!         public EncodedGroupMemberInfo(String commandId, boolean inlined) {
!             this.commandId = commandId;
!             this.inlined = inlined;
!         }
!     }
  
!     public Class getObjectType() {
!         return CommandGroup.class;
!     }
  
!     public boolean isSingleton() {
!         return true;
!     }
  
  }
\ No newline at end of file
--- 17,206 ----
   */
  public class CommandGroupFactoryBean implements BeanNameAware, FactoryBean {
! 	public static final String GLUE_MEMBER_CODE = "glue";
  
! 	public static final String SEPARATOR_MEMBER_CODE = "separator";
  
! 	public static final String COMMAND_MEMBER_CODE = "command:";
  
! 	public static final String GROUP_MEMBER_CODE = "group:";
  
! 	private String groupId;
  
! 	private CommandRegistry commandRegistry;
  
! 	private CommandConfigurer commandConfigurer;
  
! 	private Object[] encodedMembers;
  
! 	private boolean exclusive;
  
! 	private boolean allowsEmptySelection;
  
! 	private CommandGroup commandGroup;
  
! 	public CommandGroupFactoryBean() {
  
! 	}
  
! 	public CommandGroupFactoryBean(String groupId, Object[] encodedMembers) {
! 		this(groupId, null, null, encodedMembers);
! 	}
  
! 	public CommandGroupFactoryBean(String groupId, CommandRegistry commandRegistry, Object[] encodedMembers) {
! 		this(groupId, commandRegistry, null, encodedMembers);
! 	}
  
! 	public CommandGroupFactoryBean(String groupId, CommandRegistry commandRegistry, CommandConfigurer configurer,
! 			Object[] encodedMembers) {
! 		setBeanName(groupId);
! 		setCommandRegistry(commandRegistry);
! 		setMembers(encodedMembers);
! 		setCommandConfigurer(configurer);
! 	}
  
! 	public void setCommandRegistry(CommandRegistry commandRegistry) {
! 		this.commandRegistry = commandRegistry;
! 	}
  
! 	public void setCommandConfigurer(CommandConfigurer configurer) {
! 		this.commandConfigurer = configurer;
! 	}
  
! 	public void setMembers(Object[] encodedMembers) {
! 		this.encodedMembers = encodedMembers;
! 	}
  
! 	public void setBeanName(String beanName) {
! 		this.groupId = beanName;
! 	}
  
! 	public boolean isExclusive() {
! 		return exclusive;
! 	}
  
! 	public void setExclusive(boolean exclusive) {
! 		this.exclusive = exclusive;
! 	}
  
! 	public void setAllowsEmptySelection(boolean allowsEmptySelection) {
! 		this.allowsEmptySelection = allowsEmptySelection;
! 	}
  
! 	public Object getObject() throws Exception {
! 		return getCommandGroup();
! 	}
  
! 	public CommandGroup getCommandGroup() {
! 		if (commandGroup == null) {
! 			commandGroup = createCommandGroup();
! 		}
! 		return commandGroup;
! 	}
  
! 	protected CommandGroup createCommandGroup() {
! 		CommandGroup group;
! 		if (isExclusive()) {
! 			ExclusiveCommandGroup g = new ExclusiveCommandGroup(groupId, commandRegistry);
! 			g.setAllowsEmptySelection(allowsEmptySelection);
! 			group = g;
! 		}
! 		else {
! 			group = new CommandGroup(groupId, commandRegistry);
! 		}
! 		initCommandGroupMembers(group);
! 		return group;
! 	}
  
! 	private void initCommandGroupMembers(CommandGroup group) {
! 		for (int i = 0; i < encodedMembers.length; i++) {
! 			Object o = encodedMembers[i];
! 			if (o instanceof AbstractCommand) {
! 				group.addInternal((AbstractCommand)o);
! 				configureIfNecessary((AbstractCommand)o);
! 			}
! 			else if (o instanceof String) {
! 				String str = (String)o;
! 				if (str.equalsIgnoreCase(SEPARATOR_MEMBER_CODE)) {
! 					group.addSeparatorInternal();
! 				}
! 				else if (str.equalsIgnoreCase(GLUE_MEMBER_CODE)) {
! 					group.addGlueInternal();
! 				}
! 				else if (str.startsWith(COMMAND_MEMBER_CODE)) {
! 					addCommandMember(str.substring(8), false, group);
! 				}
! 				else if (str.startsWith(GROUP_MEMBER_CODE)) {
! 					addCommandMember(str.substring(6), true, group);
! 				}
! 				else {
! 					addCommandMember(str, false, group);
! 				}
! 			}
! 		}
! 	}
  
! 	private void addCommandMember(String commandId, boolean isGroup, CommandGroup group) {
! 		EncodedGroupMemberInfo info = parseEncodedCommandInfo(commandId);
! 		AbstractCommand command = null;
! 		if (commandRegistry != null) {
! 			if (isGroup) {
! 				command = commandRegistry.getCommandGroup(info.commandId);
! 				if (command != null) {
! 					group.addInternal(command);
! 				}
! 			}
! 			else {
! 				command = commandRegistry.getActionCommand(info.commandId);
! 				if (command != null) {
! 					group.addInternal(command);
! 				}
! 			}
! 		}
! 		if (command == null) {
! 			group.addLazyInternal(info.commandId);
! 		}
! 	}
  
! 	private EncodedGroupMemberInfo parseEncodedCommandInfo(String str) {
! 		String[] info = StringUtils.commaDelimitedListToStringArray(str);
! 		if (info.length == 1) {
! 			return new EncodedGroupMemberInfo(info[0], false);
! 		}
! 		else if (info.length == 2) {
! 			return new EncodedGroupMemberInfo(info[0], Boolean.valueOf(info[1]).booleanValue());
! 		}
! 		else {
! 			throw new IllegalArgumentException("Invalid encoded command group info '" + str
! 					+ "'; code should be of format <groupId>,[inlined]");
! 		}
! 	}
  
! 	protected void configureIfNecessary(AbstractCommand command) {
! 		if (commandConfigurer != null) {
! 			if (!command.isFaceConfigured()) {
! 				System.out.println("configuring command " + command.getId());
! 				commandConfigurer.configure(command);
! 			}
! 		}
! 	}
  
! 	private static final class EncodedGroupMemberInfo {
! 		private String commandId;
  
! 		private boolean inlined;
  
! 		public EncodedGroupMemberInfo(String commandId, boolean inlined) {
! 			this.commandId = commandId;
! 			this.inlined = inlined;
! 		}
! 	}
  
! 	public Class getObjectType() {
! 		return CommandGroup.class;
! 	}
  
! 	public boolean isSingleton() {
! 		return true;
! 	}
  
  }
\ No newline at end of file

Index: SimpleGroupMember.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/SimpleGroupMember.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleGroupMember.java	19 Oct 2004 13:17:46 -0000	1.3
--- SimpleGroupMember.java	28 Oct 2004 16:21:00 -0000	1.4
***************
*** 75,82 ****
      }
  
-     public boolean managesCommandDirectly(String commandId) {
-         return managesCommand(commandId);
-     }
- 
      public AbstractCommand getCommand() {
          return command;
--- 75,78 ----

--- InlinedGroupMember.java DELETED ---

Index: CommandGroup.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/CommandGroup.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CommandGroup.java	28 Oct 2004 16:08:15 -0000	1.9
--- CommandGroup.java	28 Oct 2004 16:21:00 -0000	1.10
***************
*** 88,135 ****
  	}
  
- 	protected void addInternal(AbstractCommand command) {
- 		this.memberList.add(new SimpleGroupMember(this, command));
- 	}
- 
- 	protected void addInlinedInternal(CommandGroup group) {
- 		this.memberList.add(new InlinedGroupMember(this, group));
- 	}
- 
- 	protected void addLazyInternal(String commandId, boolean inlinedGroup) {
- 		this.memberList.add(new LazyGroupMember(this, commandId, inlinedGroup));
- 	}
- 
- 	protected void addSeparatorInternal() {
- 		this.memberList.add(new SeparatorGroupMember());
- 	}
- 
- 	protected void addGlueInternal() {
- 		this.memberList.add(new GlueGroupMember());
- 	}
- 
- 	public void setCommandRegistry(CommandRegistry registry) {
- 		if (!ObjectUtils.nullSafeEquals(this.commandRegistry, registry)) {
- 
- 			//@TODO should groups listen to command registration events if
- 			// they've
- 			//got lazy members that haven't been instantiated? Or are
- 			// targetable
- 			//commands lightweight enough?
- 			if (logger.isDebugEnabled()) {
- 				logger.debug("Setting registry " + registry + " for command group '" + getId() + "'");
- 			}
- 			this.commandRegistry = registry;
- 		}
- 	}
- 
- 	public void setEnabled(boolean enabled) {
- 		super.setEnabled(enabled);
- 	}
- 
- 	public void setVisible(boolean visible) {
- 		super.setVisible(visible);
- 		getMemberList().setContainersVisible(visible);
- 	}
- 
  	/**
  	 * Creates a command group with a single command member.
--- 88,91 ----
***************
*** 187,190 ****
--- 143,186 ----
  	}
  
+ 	protected void addInternal(AbstractCommand command) {
+ 		this.memberList.add(new SimpleGroupMember(this, command));
+ 	}
+ 
+ 	protected void addLazyInternal(String commandId) {
+ 		this.memberList.add(new LazyGroupMember(this, commandId));
+ 	}
+ 
+ 	protected void addSeparatorInternal() {
+ 		this.memberList.add(new SeparatorGroupMember());
+ 	}
+ 
+ 	protected void addGlueInternal() {
+ 		this.memberList.add(new GlueGroupMember());
+ 	}
+ 
+ 	public void setCommandRegistry(CommandRegistry registry) {
+ 		if (!ObjectUtils.nullSafeEquals(this.commandRegistry, registry)) {
+ 
+ 			//@TODO should groups listen to command registration events if
+ 			// they've
+ 			//got lazy members that haven't been instantiated? Or are
+ 			// targetable
+ 			//commands lightweight enough?
+ 			if (logger.isDebugEnabled()) {
+ 				logger.debug("Setting registry " + registry + " for command group '" + getId() + "'");
+ 			}
+ 			this.commandRegistry = registry;
+ 		}
+ 	}
+ 
+ 	public void setEnabled(boolean enabled) {
+ 		super.setEnabled(enabled);
+ 	}
+ 
+ 	public void setVisible(boolean visible) {
+ 		super.setVisible(visible);
+ 		getMemberList().setContainersVisible(visible);
+ 	}
+ 
  	protected CommandRegistry getCommandRegistry() {
  		return commandRegistry;
***************
*** 231,238 ****
  			return;
  		}
- 
  		ExpansionPointGroupMember expansionPoint = getMemberList().getExpansionPoint();
  		GroupMember member = expansionPoint.getMemberFor(command.getId());
- 
  		if (member != null) {
  			expansionPoint.remove(member);
--- 227,232 ----

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/factory
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14426/src/org/springframework/richclient/factory

Modified Files:
	DefaultMenuFactory.java MenuFactory.java 
Log Message:
polishing

Index: MenuFactory.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/factory/MenuFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MenuFactory.java	10 Jul 2004 07:02:20 -0000	1.1
--- MenuFactory.java	28 Oct 2004 16:08:16 -0000	1.2
***************
*** 10,13 ****
--- 10,14 ----
  import javax.swing.JCheckBoxMenuItem;
  import javax.swing.JMenu;
+ import javax.swing.JMenuBar;
  import javax.swing.JMenuItem;
  import javax.swing.JPopupMenu;
***************
*** 27,30 ****
--- 28,33 ----
  
      public JPopupMenu createPopupMenu();
+     
+     public JMenuBar createMenuBar();
  
  }
\ No newline at end of file

Index: DefaultMenuFactory.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/factory/DefaultMenuFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultMenuFactory.java	15 Oct 2004 22:18:21 -0000	1.3
--- DefaultMenuFactory.java	28 Oct 2004 16:08:15 -0000	1.4
***************
*** 10,13 ****
--- 10,14 ----
  import javax.swing.JCheckBoxMenuItem;
  import javax.swing.JMenu;
+ import javax.swing.JMenuBar;
  import javax.swing.JMenuItem;
  import javax.swing.JPopupMenu;
***************
*** 44,47 ****
--- 45,52 ----
          return new JPopupMenu();
      }
+     
+     public JMenuBar createMenuBar() {
+     	return new JMenuBar();
+     }
  
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14426/src/org/springframework/richclient/command/support

Modified Files:
	SimpleGroupContainerPopulator.java 
	ButtonBarGroupContainerPopulator.java 
Log Message:
polishing

Index: ButtonBarGroupContainerPopulator.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support/ButtonBarGroupContainerPopulator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ButtonBarGroupContainerPopulator.java	15 Oct 2004 22:18:20 -0000	1.3
--- ButtonBarGroupContainerPopulator.java	28 Oct 2004 16:08:16 -0000	1.4
***************
*** 29,93 ****
  import com.jgoodies.forms.layout.Size;
  
! public class ButtonBarGroupContainerPopulator extends
!         SimpleGroupContainerPopulator {
!     private Size minimumSize;
  
!     private ButtonBarBuilder builder;
  
!     private List buttons = new ArrayList();
  
!     public ButtonBarGroupContainerPopulator() {
!         super(new JPanel());
!         builder = new ButtonBarBuilder((JPanel)getControl());
!     }
  
!     public void setMinimumButtonSize(Size minimumSize) {
!         this.minimumSize = minimumSize;
!     }
  
!     public JPanel getButtonBar() {
!         return builder.getPanel();
!     }
  
!     public void add(Component c) {
!         buttons.add(c);
!     }
  
!     public void addSeparator() {
!         buttons.add(CommandGroupFactoryBean.SEPARATOR_MEMBER_CODE);
!     }
  
!     public void onPopulated() {
!         builder.addGlue();
!         int length = buttons.size();
!         for (int i = 0; i < length; i++) {
!             int index = true ? i : length - 1 - i;
!             Object o = buttons.get(i);
!             if (o instanceof String
!                     && o == CommandGroupFactoryBean.SEPARATOR_MEMBER_CODE) {
!                 builder.addUnrelatedGap();
!             }
!             else if (o instanceof AbstractButton) {
!                 AbstractButton button = (AbstractButton)o;
!                 if (minimumSize != null) {
!                     addCustomGridded(button);
!                 }
!                 else {
!                     builder.addGridded(button);
!                 }
!                 if (i < buttons.size() - 1) {
!                     builder.addRelatedGap();
!                 }
!             }
!         }
!     }
  
!     private void addCustomGridded(AbstractButton button) {
!         builder.getLayout().appendColumn(new ColumnSpec(minimumSize));
!         builder.getLayout().addGroupedColumn(builder.getColumn());
!         button.putClientProperty("jgoodies.isNarrow", Boolean.TRUE);
!         builder.add(button);
!         builder.nextColumn();
!     }
  
  }
\ No newline at end of file
--- 29,91 ----
  import com.jgoodies.forms.layout.Size;
  
! public class ButtonBarGroupContainerPopulator extends SimpleGroupContainerPopulator {
! 	private Size minimumSize;
  
! 	private ButtonBarBuilder builder;
  
! 	private List buttons = new ArrayList();
  
! 	public ButtonBarGroupContainerPopulator() {
! 		super(new JPanel());
! 		builder = new ButtonBarBuilder((JPanel)getContainer());
! 	}
  
! 	public void setMinimumButtonSize(Size minimumSize) {
! 		this.minimumSize = minimumSize;
! 	}
  
! 	public JPanel getButtonBar() {
! 		return builder.getPanel();
! 	}
  
! 	public void add(Component c) {
! 		buttons.add(c);
! 	}
  
! 	public void addSeparator() {
! 		buttons.add(CommandGroupFactoryBean.SEPARATOR_MEMBER_CODE);
! 	}
  
! 	public void onPopulated() {
! 		builder.addGlue();
! 		int length = buttons.size();
! 		for (int i = 0; i < length; i++) {
! 			int index = true ? i : length - 1 - i;
! 			Object o = buttons.get(i);
! 			if (o instanceof String && o == CommandGroupFactoryBean.SEPARATOR_MEMBER_CODE) {
! 				builder.addUnrelatedGap();
! 			}
! 			else if (o instanceof AbstractButton) {
! 				AbstractButton button = (AbstractButton)o;
! 				if (minimumSize != null) {
! 					addCustomGridded(button);
! 				}
! 				else {
! 					builder.addGridded(button);
! 				}
! 				if (i < buttons.size() - 1) {
! 					builder.addRelatedGap();
! 				}
! 			}
! 		}
! 	}
  
! 	private void addCustomGridded(AbstractButton button) {
! 		builder.getLayout().appendColumn(new ColumnSpec(minimumSize));
! 		builder.getLayout().addGroupedColumn(builder.getColumn());
! 		button.putClientProperty("jgoodies.isNarrow", Boolean.TRUE);
! 		builder.add(button);
! 		builder.nextColumn();
! 	}
  
  }
\ No newline at end of file

Index: SimpleGroupContainerPopulator.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support/SimpleGroupContainerPopulator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleGroupContainerPopulator.java	11 Jul 2004 03:42:21 -0000	1.2
--- SimpleGroupContainerPopulator.java	28 Oct 2004 16:08:16 -0000	1.3
***************
*** 17,22 ****
  
  import java.awt.Component;
  
- import javax.swing.JComponent;
  import javax.swing.JMenu;
  import javax.swing.JPopupMenu;
--- 17,22 ----
  
  import java.awt.Component;
+ import java.awt.Container;
  
  import javax.swing.JMenu;
  import javax.swing.JPopupMenu;
***************
*** 27,61 ****
  
  public class SimpleGroupContainerPopulator implements GroupContainerPopulator {
!     private JComponent container;
  
!     public SimpleGroupContainerPopulator(JComponent container) {
!         this.container = container;
!     }
  
!     public JComponent getControl() {
!         return container;
!     }
  
!     public void add(Component c) {
!         container.add(c);
!     }
  
!     public void addSeparator() {
!         if (container instanceof JMenu) {
!             ((JMenu)container).addSeparator();
!         }
!         else if (container instanceof JPopupMenu) {
!             ((JPopupMenu)container).addSeparator();
!         }
!         else if (container instanceof JToolBar) {
!             ((JToolBar)container).addSeparator();
!         }
!         else {
!             container.add(new JSeparator(JSeparator.VERTICAL));
!         }
!     }
  
!     public void onPopulated() {
  
!     }
  }
\ No newline at end of file
--- 27,61 ----
  
  public class SimpleGroupContainerPopulator implements GroupContainerPopulator {
! 	private Container container;
  
! 	public SimpleGroupContainerPopulator(Container container) {
! 		this.container = container;
! 	}
  
! 	public Container getContainer() {
! 		return container;
! 	}
  
! 	public void add(Component c) {
! 		container.add(c);
! 	}
  
! 	public void addSeparator() {
! 		if (container instanceof JMenu) {
! 			((JMenu)container).addSeparator();
! 		}
! 		else if (container instanceof JPopupMenu) {
! 			((JPopupMenu)container).addSeparator();
! 		}
! 		else if (container instanceof JToolBar) {
! 			((JToolBar)container).addSeparator();
! 		}
! 		else {
! 			container.add(new JSeparator(JSeparator.VERTICAL));
! 		}
! 	}
  
! 	public void onPopulated() {
  
! 	}
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8208/src/org/springframework/richclient/command/config

Modified Files:
	CommandConfigurer.java CommandFaceDescriptor.java 
Added Files:
	DefaultCommandConfigurer.java 
Removed Files:
	ApplicationCommandConfigurer.java 
Log Message:
polishing command framework
- removed unecessary interfaces in CommandManager

--- NEW FILE: DefaultCommandConfigurer.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 * 
 * http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.command.config;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.richclient.application.Application;
import org.springframework.richclient.application.config.ApplicationObjectConfigurer;
import org.springframework.richclient.command.AbstractCommand;
import org.springframework.richclient.command.CommandServices;
import org.springframework.richclient.command.support.DefaultCommandServices;
import org.springframework.util.Assert;

/**
 * @author Keith Donald
 */
public class DefaultCommandConfigurer implements CommandConfigurer {
	private final Log logger = LogFactory.getLog(getClass());

	private CommandServices commandServices;

	private ApplicationObjectConfigurer objectConfigurer;

	public DefaultCommandConfigurer() {
	}

	public DefaultCommandConfigurer(CommandServices commandServices) {
		setCommandServices(commandServices);
	}

	public void setApplicationObjectConfigurer(ApplicationObjectConfigurer configurer) {
		this.objectConfigurer = configurer;
	}

	public void setCommandServices(CommandServices services) {
		this.commandServices = services;
	}

	public AbstractCommand configure(AbstractCommand command) {
		return configure(command, getObjectConfigurer());
	}

	protected ApplicationObjectConfigurer getObjectConfigurer() {
		if (objectConfigurer == null) {
			return Application.services();
		}
		return objectConfigurer;
	}

	public AbstractCommand configure(AbstractCommand command, ApplicationObjectConfigurer configurer) {
		command.setCommandServices(getCommandServices());
		Assert.state(!command.isAnonymous(), "A command must have an id to be auto configured");
		if (logger.isDebugEnabled()) {
			logger.debug("Configuring faces (aka visual appearance descriptors) for " + command);
		}
		CommandFaceDescriptor face = new CommandFaceDescriptor();
		command.setFaceDescriptor((CommandFaceDescriptor)configurer.configure(face, command.getId()));
		if (face.isBlank()) {
			face.setButtonLabelInfo("&" + command.getId());
		}
		return command;
	}

	protected CommandServices getCommandServices() {
		if (commandServices == null) {
			return DefaultCommandServices.instance();
		}
		return commandServices;
	}

}
Index: CommandFaceDescriptor.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/config/CommandFaceDescriptor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CommandFaceDescriptor.java	22 Oct 2004 21:28:16 -0000	1.7
--- CommandFaceDescriptor.java	28 Oct 2004 15:43:19 -0000	1.8
***************
*** 36,249 ****
   * @author Keith Donald
   */
! public class CommandFaceDescriptor extends AbstractPropertyChangePublisher
!         implements DescribedElement, VisualizedElement,
!         CommandLabelConfigurable, DescriptionConfigurable,
!         CommandIconConfigurable {
  
!     public static final String BUTTON_LABEL_INFO_PROPERTY = "buttonLabelInfo";
  
!     public static final String BUTTON_ICON_INFO_PROPERTY = "iconInfo";
  
!     public static final String BUTTON_LARGE_ICON_INFO_PROPETY = "largeIconInfo";
  
!     public static final String BUTTON_ICON_PROPERTY = "iconInfo";
  
!     public static final String BUTTON_LARGE_ICON_PROPETY = "largeIconInfo";
  
!     private String caption;
  
!     private String description;
  
!     private CommandButtonLabelInfo labelInfo;
  
!     private CommandButtonIconInfo iconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
  
!     private CommandButtonIconInfo largeIconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
  
!     public CommandFaceDescriptor(String encodedLabel) {
!         this(encodedLabel, null, null);
!     }
  
!     public CommandFaceDescriptor(String encodedLabel, Icon icon, String caption) {
!         this.labelInfo = LabelInfoFactory.createButtonLabelInfo(encodedLabel);
!         if (icon != null) {
!             this.iconInfo = new CommandButtonIconInfo(icon);
!         }
!         this.caption = caption;
!     }
  
!     public CommandFaceDescriptor() {
!         this(LabelInfoFactory.BLANK_BUTTON_LABEL);
!     }
  
!     public CommandFaceDescriptor(CommandButtonLabelInfo labelInfo) {
!         Assert.notNull(labelInfo, "The labelInfo property is required");
!         this.labelInfo = labelInfo;
!     }
  
!     public boolean isBlank() {
!         return labelInfo == LabelInfoFactory.BLANK_BUTTON_LABEL;
!     }
  
!     public String getText() {
!         return labelInfo.getText();
!     }
  
!     public String getDisplayName() {
!         return getText();
!     }
  
!     public String getCaption() {
!         return caption;
!     }
  
!     public String getDescription() {
!         return description;
!     }
  
!     public int getMnemonic() {
!         return labelInfo.getMnemonic();
!     }
  
!     public int getMnemonicIndex() {
!         return labelInfo.getMnemonicIndex();
!     }
  
!     public Image getImage() {
!         return iconInfo.getImage();
!     }
  
!     public Icon getIcon() {
!         return iconInfo.getIcon();
!     }
  
!     public Icon getLargeIcon() {
!         return largeIconInfo.getIcon();
!     }
  
!     public KeyStroke getAccelerator() {
!         return labelInfo.getAccelerator();
!     }
  
!     protected CommandButtonLabelInfo getButtonLabelInfo() {
!         return labelInfo;
!     }
  
!     protected CommandButtonIconInfo getButtonIconInfo() {
!         return iconInfo;
!     }
  
!     public void setCaption(String shortDescription) {
!         String old = this.caption;
!         this.caption = shortDescription;
!         firePropertyChange(DescribedElement.CAPTION_PROPERTY, old, this.caption);
!     }
  
!     public void setDescription(String longDescription) {
!         String old = this.description;
!         this.description = longDescription;
!         firePropertyChange(DescribedElement.DESCRIPTION_PROPERTY, old,
!                 this.description);
!     }
  
!     public void setButtonLabelInfo(String encodedLabelInfo) {
!         setLabelInfo(LabelInfoFactory.createButtonLabelInfo(encodedLabelInfo));
!     }
  
!     public void setLabelInfo(CommandButtonLabelInfo labelInfo) {
!         if (labelInfo == null) {
!             labelInfo = LabelInfoFactory.BLANK_BUTTON_LABEL;
!         }
!         CommandButtonLabelInfo old = this.labelInfo;
!         this.labelInfo = labelInfo;
!         firePropertyChange(BUTTON_LABEL_INFO_PROPERTY, old, this.labelInfo);
!     }
  
!     public void setIconInfo(CommandButtonIconInfo iconInfo) {
!         if (iconInfo == null) {
!             iconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
!         }
!         CommandButtonIconInfo old = this.iconInfo;
!         this.iconInfo = iconInfo;
!         firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, this.iconInfo);
!     }
  
!     public void setLargeIconInfo(CommandButtonIconInfo largeIconInfo) {
!         if (largeIconInfo == null) {
!             iconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
!         }
!         CommandButtonIconInfo old = this.largeIconInfo;
!         this.largeIconInfo = largeIconInfo;
!         firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, this.iconInfo);
!     }
  
!     public void setIcon(Icon icon) {
!         if (iconInfo == CommandButtonIconInfo.BLANK_ICON_INFO) {
!             if (icon != null) {
!                 setIconInfo(new CommandButtonIconInfo(icon));
!             }
!         }
!         else {
!             Icon old = iconInfo.getIcon();
!             this.iconInfo.setIcon(icon);
!             firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, icon);
!         }
!     }
  
!     public void setLargeIcon(Icon icon) {
!         if (largeIconInfo == CommandButtonIconInfo.BLANK_ICON_INFO) {
!             if (icon != null) {
!                 setLargeIconInfo(new CommandButtonIconInfo(icon));
!             }
!         }
!         else {
!             Icon old = largeIconInfo.getIcon();
!             this.largeIconInfo.setIcon(icon);
!             firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, icon);
!         }
!     }
  
!     public void configureLabel(AbstractButton button) {
!         labelInfo.configure(button);
!     }
  
!     public void configureIcon(AbstractButton button) {
!         configureIconInfo(button, false);
!     }
  
!     public void configureIconInfo(AbstractButton button, boolean useLargeIcons) {
!         if (useLargeIcons) {
!             largeIconInfo.configure(button);
!         }
!         else {
!             iconInfo.configure(button);
!         }
!     }
  
!     public void configure(AbstractButton button, AbstractCommand command,
!             CommandButtonConfigurer strategy) {
!         Assert.notNull(strategy, "The button configurer strategy is required");
!         strategy.configure(button, command, this);
!     }
  
!     public void configure(Action action) {
!         Assert.notNull(action, "The swing action to configure is required");
!         action.putValue(AbstractAction.NAME, getText());
!         action
!                 .putValue(AbstractAction.MNEMONIC_KEY, new Integer(
!                         getMnemonic()));
!         action.putValue(AbstractAction.SMALL_ICON, getIcon());
!         action.putValue("LargeIcon", getLargeIcon());
!         action.putValue(AbstractAction.ACCELERATOR_KEY, getAccelerator());
!         action.putValue(AbstractAction.SHORT_DESCRIPTION, caption);
!         action.putValue(AbstractAction.LONG_DESCRIPTION, description);
!     }
  
!     public String toString() {
!         return new ToStringCreator(this).append("caption", caption).append(
!                 "description", description)
!                 .append("buttonLabelInfo", labelInfo).append("buttonIconInfo",
!                         iconInfo).toString();
!     }
  
  }
\ No newline at end of file
--- 36,243 ----
   * @author Keith Donald
   */
! public class CommandFaceDescriptor extends AbstractPropertyChangePublisher implements DescribedElement,
! 		VisualizedElement, CommandLabelConfigurable, DescriptionConfigurable, CommandIconConfigurable {
  
! 	public static final String BUTTON_LABEL_INFO_PROPERTY = "buttonLabelInfo";
  
! 	public static final String BUTTON_ICON_INFO_PROPERTY = "iconInfo";
  
! 	public static final String BUTTON_LARGE_ICON_INFO_PROPETY = "largeIconInfo";
  
! 	public static final String BUTTON_ICON_PROPERTY = "iconInfo";
  
! 	public static final String BUTTON_LARGE_ICON_PROPETY = "largeIconInfo";
  
! 	public static final CommandFaceDescriptor BLANK_FACE_DESCRIPTOR = new CommandFaceDescriptor();
  
! 	private String caption;
  
! 	private String description;
  
! 	private CommandButtonLabelInfo labelInfo;
  
! 	private CommandButtonIconInfo iconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
  
! 	private CommandButtonIconInfo largeIconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
  
! 	public CommandFaceDescriptor(String encodedLabel) {
! 		this(encodedLabel, null, null);
! 	}
  
! 	public CommandFaceDescriptor(String encodedLabel, Icon icon, String caption) {
! 		this.labelInfo = LabelInfoFactory.createButtonLabelInfo(encodedLabel);
! 		if (icon != null) {
! 			this.iconInfo = new CommandButtonIconInfo(icon);
! 		}
! 		this.caption = caption;
! 	}
  
! 	public CommandFaceDescriptor() {
! 		this(LabelInfoFactory.BLANK_BUTTON_LABEL);
! 	}
  
! 	public CommandFaceDescriptor(CommandButtonLabelInfo labelInfo) {
! 		Assert.notNull(labelInfo, "The labelInfo property is required");
! 		this.labelInfo = labelInfo;
! 	}
  
! 	public boolean isBlank() {
! 		return labelInfo == LabelInfoFactory.BLANK_BUTTON_LABEL;
! 	}
  
! 	public String getText() {
! 		return labelInfo.getText();
! 	}
  
! 	public String getDisplayName() {
! 		return getText();
! 	}
  
! 	public String getCaption() {
! 		return caption;
! 	}
  
! 	public String getDescription() {
! 		return description;
! 	}
  
! 	public int getMnemonic() {
! 		return labelInfo.getMnemonic();
! 	}
  
! 	public int getMnemonicIndex() {
! 		return labelInfo.getMnemonicIndex();
! 	}
  
! 	public Image getImage() {
! 		return iconInfo.getImage();
! 	}
  
! 	public Icon getIcon() {
! 		return iconInfo.getIcon();
! 	}
  
! 	public Icon getLargeIcon() {
! 		return largeIconInfo.getIcon();
! 	}
  
! 	public KeyStroke getAccelerator() {
! 		return labelInfo.getAccelerator();
! 	}
  
! 	protected CommandButtonLabelInfo getButtonLabelInfo() {
! 		return labelInfo;
! 	}
  
! 	protected CommandButtonIconInfo getButtonIconInfo() {
! 		return iconInfo;
! 	}
  
! 	public void setCaption(String shortDescription) {
! 		String old = this.caption;
! 		this.caption = shortDescription;
! 		firePropertyChange(DescribedElement.CAPTION_PROPERTY, old, this.caption);
! 	}
  
! 	public void setDescription(String longDescription) {
! 		String old = this.description;
! 		this.description = longDescription;
! 		firePropertyChange(DescribedElement.DESCRIPTION_PROPERTY, old, this.description);
! 	}
  
! 	public void setButtonLabelInfo(String encodedLabelInfo) {
! 		setLabelInfo(LabelInfoFactory.createButtonLabelInfo(encodedLabelInfo));
! 	}
  
! 	public void setLabelInfo(CommandButtonLabelInfo labelInfo) {
! 		if (labelInfo == null) {
! 			labelInfo = LabelInfoFactory.BLANK_BUTTON_LABEL;
! 		}
! 		CommandButtonLabelInfo old = this.labelInfo;
! 		this.labelInfo = labelInfo;
! 		firePropertyChange(BUTTON_LABEL_INFO_PROPERTY, old, this.labelInfo);
! 	}
  
! 	public void setIconInfo(CommandButtonIconInfo iconInfo) {
! 		if (iconInfo == null) {
! 			iconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
! 		}
! 		CommandButtonIconInfo old = this.iconInfo;
! 		this.iconInfo = iconInfo;
! 		firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, this.iconInfo);
! 	}
  
! 	public void setLargeIconInfo(CommandButtonIconInfo largeIconInfo) {
! 		if (largeIconInfo == null) {
! 			iconInfo = CommandButtonIconInfo.BLANK_ICON_INFO;
! 		}
! 		CommandButtonIconInfo old = this.largeIconInfo;
! 		this.largeIconInfo = largeIconInfo;
! 		firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, this.iconInfo);
! 	}
  
! 	public void setIcon(Icon icon) {
! 		if (iconInfo == CommandButtonIconInfo.BLANK_ICON_INFO) {
! 			if (icon != null) {
! 				setIconInfo(new CommandButtonIconInfo(icon));
! 			}
! 		}
! 		else {
! 			Icon old = iconInfo.getIcon();
! 			this.iconInfo.setIcon(icon);
! 			firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, icon);
! 		}
! 	}
  
! 	public void setLargeIcon(Icon icon) {
! 		if (largeIconInfo == CommandButtonIconInfo.BLANK_ICON_INFO) {
! 			if (icon != null) {
! 				setLargeIconInfo(new CommandButtonIconInfo(icon));
! 			}
! 		}
! 		else {
! 			Icon old = largeIconInfo.getIcon();
! 			this.largeIconInfo.setIcon(icon);
! 			firePropertyChange(BUTTON_ICON_INFO_PROPERTY, old, icon);
! 		}
! 	}
  
! 	public void configureLabel(AbstractButton button) {
! 		labelInfo.configure(button);
! 	}
  
! 	public void configureIcon(AbstractButton button) {
! 		configureIconInfo(button, false);
! 	}
  
! 	public void configureIconInfo(AbstractButton button, boolean useLargeIcons) {
! 		if (useLargeIcons) {
! 			largeIconInfo.configure(button);
! 		}
! 		else {
! 			iconInfo.configure(button);
! 		}
! 	}
  
! 	public void configure(AbstractButton button, AbstractCommand command, CommandButtonConfigurer strategy) {
! 		Assert.notNull(strategy, "The button configurer strategy is required");
! 		strategy.configure(button, command, this);
! 	}
  
! 	public void configure(Action action) {
! 		Assert.notNull(action, "The swing action to configure is required");
! 		action.putValue(AbstractAction.NAME, getText());
! 		action.putValue(AbstractAction.MNEMONIC_KEY, new Integer(getMnemonic()));
! 		action.putValue(AbstractAction.SMALL_ICON, getIcon());
! 		action.putValue("LargeIcon", getLargeIcon());
! 		action.putValue(AbstractAction.ACCELERATOR_KEY, getAccelerator());
! 		action.putValue(AbstractAction.SHORT_DESCRIPTION, caption);
! 		action.putValue(AbstractAction.LONG_DESCRIPTION, description);
! 	}
! 
! 	public String toString() {
! 		return new ToStringCreator(this).append("caption", caption).append("description", description).append(
! 				"buttonLabelInfo", labelInfo).append("buttonIconInfo", iconInfo).toString();
! 	}
  
  }
\ No newline at end of file

--- ApplicationCommandConfigurer.java DELETED ---

Index: CommandConfigurer.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/config/CommandConfigurer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CommandConfigurer.java	10 Jul 2004 07:02:24 -0000	1.1
--- CommandConfigurer.java	28 Oct 2004 15:43:19 -0000	1.2
***************
*** 22,29 ****
   */
  public interface CommandConfigurer {
!     public AbstractCommand configure(AbstractCommand command);
! 
!     public AbstractCommand configure(AbstractCommand command,
!             String faceConfigurationKey);
! 
  }
\ No newline at end of file
--- 22,25 ----
   */
  public interface CommandConfigurer {
! 	public AbstractCommand configure(AbstractCommand command);
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8208/src/org/springframework/richclient/text

Modified Files:
	TextComponentPopup.java 
Log Message:
polishing command framework
- removed unecessary interfaces in CommandManager

Index: TextComponentPopup.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/text/TextComponentPopup.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TextComponentPopup.java	19 Oct 2004 13:17:47 -0000	1.4
--- TextComponentPopup.java	28 Oct 2004 15:43:18 -0000	1.5
***************
*** 128,133 ****
          for (int i = 0; i < COMMANDS.length; i++) {
              if (!commandManager.containsActionCommand(COMMANDS[i])) {
!                 commandManager.addNewCommand(new TargetableActionCommand(
!                         COMMANDS[i], null), COMMANDS[i]);
              }
          }
--- 128,133 ----
          for (int i = 0; i < COMMANDS.length; i++) {
              if (!commandManager.containsActionCommand(COMMANDS[i])) {
!                 commandManager.registerCommand(new TargetableActionCommand(
!                         COMMANDS[i], null));
              }
          }

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/application
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8208/src/org/springframework/richclient/application

Modified Files:
	ApplicationServices.java 
Log Message:
polishing command framework
- removed unecessary interfaces in CommandManager

Index: ApplicationServices.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/application/ApplicationServices.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ApplicationServices.java	25 Oct 2004 02:34:27 -0000	1.16
--- ApplicationServices.java	28 Oct 2004 15:43:33 -0000	1.17
***************
*** 35,45 ****
  import org.springframework.core.io.Resource;
  import org.springframework.core.io.ResourceLoader;
- import org.springframework.richclient.application.config.DefaultApplicationObjectConfigurer;
  import org.springframework.richclient.application.config.ApplicationObjectConfigurer;
  import org.springframework.richclient.application.support.BeanFactoryViewDescriptorRegistry;
  import org.springframework.richclient.application.support.DefaultPropertyEditorRegistry;
  import org.springframework.richclient.command.AbstractCommand;
- import org.springframework.richclient.command.config.ApplicationCommandConfigurer;
  import org.springframework.richclient.command.config.CommandConfigurer;
  import org.springframework.richclient.factory.ComponentFactory;
  import org.springframework.richclient.factory.DefaultComponentFactory;
--- 35,45 ----
  import org.springframework.core.io.Resource;
  import org.springframework.core.io.ResourceLoader;
  import org.springframework.richclient.application.config.ApplicationObjectConfigurer;
+ import org.springframework.richclient.application.config.DefaultApplicationObjectConfigurer;
  import org.springframework.richclient.application.support.BeanFactoryViewDescriptorRegistry;
  import org.springframework.richclient.application.support.DefaultPropertyEditorRegistry;
  import org.springframework.richclient.command.AbstractCommand;
  import org.springframework.richclient.command.config.CommandConfigurer;
+ import org.springframework.richclient.command.config.DefaultCommandConfigurer;
  import org.springframework.richclient.factory.ComponentFactory;
  import org.springframework.richclient.factory.DefaultComponentFactory;
***************
*** 65,441 ****
   * @author Keith Donald
   */
! public class ApplicationServices extends ApplicationObjectSupport implements
!         ApplicationObjectConfigurer, CommandConfigurer, ResourceLoader, MessageSource,
!         ImageSource, IconSource, RulesSource, FormComponentInterceptorFactory {
! 
!     public static final String IMAGE_SOURCE_BEAN_ID = "imageSource";
  
!     public static final String ICON_SOURCE_BEAN_ID = "iconSource";
  
!     public static final String COMPONENT_FACTORY_BEAN_ID = "componentFactory";
  
!     public static final String RULES_SOURCE_BEAN_ID = "rulesSource";
  
!     public static final String PROPERTY_EDITOR_REGISTRY_BEAN_ID = "propertyEditorRegistry";
  
!     public static final String OBJECT_CONFIGURER_BEAN_ID = "applicationObjectConfigurer";
  
!     public static final String COMMAND_CONFIGURER_BEAN_ID = "commandConfigurer";
  
!     public static final String LOOK_AND_FEEL_CONFIGURER_BEAN_ID = "lookAndFeelConfigurer";
  
!     public static final String FORM_INTERCEPTOR_FACTORY_BEAN_ID = "formComponentInterceptorFactory";
  
!     private final Log logger = LogFactory.getLog(getClass());
  
!     private ComponentFactory componentFactory;
  
!     private FormComponentInterceptorFactory formComponentInterceptorFactory;
  
!     private ApplicationObjectConfigurer objectConfigurer;
  
!     private CommandConfigurer commandConfigurer;
  
!     private ImageSource imageSource;
  
!     private IconSource iconSource;
  
!     private ViewDescriptorRegistry viewRegistry;
  
!     private RulesSource rulesSource;
  
!     private PropertyEditorRegistry propertyEditorRegistry;
  
!     private boolean lazyInit = true;
  
!     public void setLazyInit(boolean lazyInit) {
!         this.lazyInit = lazyInit;
!     }
  
!     public ComponentFactory getComponentFactory() {
!         if (componentFactory == null) {
!             initComponentFactory();
!         }
!         return componentFactory;
!     }
  
!     private void initComponentFactory() {
!         try {
!             this.componentFactory = (ComponentFactory)getApplicationContext()
!                     .getBean(COMPONENT_FACTORY_BEAN_ID, ComponentFactory.class);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger.info("No component factory bean found under name "
!                     + COMPONENT_FACTORY_BEAN_ID
!                     + "; creating using existing image source.");
!             DefaultComponentFactory f = new DefaultComponentFactory();
!             f.setApplicationContext(getApplicationContext());
!             this.componentFactory = f;
!         }
!         catch (IllegalArgumentException e) {
!             this.componentFactory = new DefaultComponentFactory();
!         }
!     }
  
!     public void setComponentFactory(ComponentFactory factory) {
!         this.componentFactory = factory;
!     }
  
!     public FormComponentInterceptorFactory getFormComponentInterceptorFactory() {
!         if (formComponentInterceptorFactory == null) {
!             initFormComponentInterceptorFactory();
!         }
!         return formComponentInterceptorFactory;
!     }
  
!     private void initFormComponentInterceptorFactory() {
!         try {
!             this.formComponentInterceptorFactory = (FormComponentInterceptorFactory)getApplicationContext()
!                     .getBean(FORM_INTERCEPTOR_FACTORY_BEAN_ID,
!                             FormComponentInterceptorFactory.class);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger.info("No bean named " + FORM_INTERCEPTOR_FACTORY_BEAN_ID
!                     + " found. Using empty interceptor.");
!             this.formComponentInterceptorFactory = new FormComponentInterceptorFactory() {
!                 public FormComponentInterceptor getInterceptor(
!                         FormModel formModel) {
!                     return null;
!                 }
!             };
!         }
!     }
  
!     public ApplicationObjectConfigurer getObjectConfigurer() {
!         if (objectConfigurer == null) {
!             initObjectConfigurer();
!         }
!         return objectConfigurer;
!     }
  
!     private void initObjectConfigurer() {
!         try {
!             this.objectConfigurer = (ApplicationObjectConfigurer)getApplicationContext()
!                     .getBean(OBJECT_CONFIGURER_BEAN_ID, ApplicationObjectConfigurer.class);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger.info("No object configurer found in context under name '"
!                     + OBJECT_CONFIGURER_BEAN_ID + "'; configuring defaults.");
!             this.objectConfigurer = new DefaultApplicationObjectConfigurer(
!                     getApplicationContext(), getImageSource(), getIconSource());
!         }
!     }
  
!     public void setObjectConfigurer(ApplicationObjectConfigurer objectConfigurer) {
!         this.objectConfigurer = objectConfigurer;
!     }
  
!     public CommandConfigurer getCommandConfigurer() {
!         if (commandConfigurer == null) {
!             initCommandConfigurer();
!         }
!         return commandConfigurer;
!     }
  
!     private void initCommandConfigurer() {
!         try {
!             this.commandConfigurer = (CommandConfigurer)getApplicationContext()
!                     .getBean(COMMAND_CONFIGURER_BEAN_ID,
!                             CommandConfigurer.class);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger.info("No command configurer found in context under name '"
!                     + COMMAND_CONFIGURER_BEAN_ID + "'; configuring defaults.");
!             this.commandConfigurer = new ApplicationCommandConfigurer();
!         }
!     }
  
!     public void setCommandConfigurer(CommandConfigurer commandConfigurer) {
!         this.commandConfigurer = commandConfigurer;
!     }
  
!     public ImageSource getImageSource() {
!         if (imageSource == null) {
!             initImageSource();
!         }
!         return imageSource;
!     }
  
!     private void initImageSource() {
!         try {
!             this.imageSource = (ImageSource)getApplicationContext().getBean(
!                     IMAGE_SOURCE_BEAN_ID, ImageSource.class);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger.info("No image source bean found in context under name '"
!                     + IMAGE_SOURCE_BEAN_ID + "'; configuring defaults.");
!             this.imageSource = new DefaultImageSource(new HashMap());
!         }
!     }
  
!     public void setImageSource(ImageSource imageSource) {
!         this.imageSource = imageSource;
!     }
  
!     public IconSource getIconSource() {
!         if (iconSource == null) {
!             initIconSource();
!         }
!         return iconSource;
!     }
  
!     public void setIconSource(IconSource iconSource) {
!         this.iconSource = iconSource;
!     }
  
!     private void initIconSource() {
!         try {
!             this.iconSource = (IconSource)getApplicationContext().getBean(
!                     ICON_SOURCE_BEAN_ID, IconSource.class);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger.info("No icon source bean found under name "
!                     + ICON_SOURCE_BEAN_ID
!                     + "; creating using existing image source.");
!             this.iconSource = new DefaultIconSource(getImageSource());
!         }
!     }
  
!     public ViewDescriptorRegistry getViewDescriptorRegistry() {
!         if (viewRegistry == null) {
!             initViewRegistry();
!         }
!         return viewRegistry;
!     }
  
!     private void initViewRegistry() {
!         BeanFactoryViewDescriptorRegistry r = new BeanFactoryViewDescriptorRegistry();
!         r.setApplicationContext(getApplicationContext());
!         this.viewRegistry = r;
!     }
  
!     public void setViewRegistry(ViewDescriptorRegistry registry) {
!         this.viewRegistry = registry;
!     }
  
!     public RulesSource getRulesSource() {
!         if (rulesSource == null) {
!             initRulesSource();
!         }
!         return rulesSource;
!     }
  
!     private void initRulesSource() {
!         try {
!             this.rulesSource = (RulesSource)getApplicationContext().getBean(
!                     RULES_SOURCE_BEAN_ID, RulesSource.class);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger.info("No rule source found in context under name '"
!                     + RULES_SOURCE_BEAN_ID + "'; configuring defaults.");
!             this.rulesSource = new DefaultRulesSource();
!         }
!         catch (IllegalArgumentException e) {
!             this.rulesSource = new DefaultRulesSource();
!         }
!     }
  
!     public void setRulesSource(RulesSource rulesSource) {
!         this.rulesSource = rulesSource;
!     }
  
!     public PropertyEditorRegistry getPropertyEditorRegistry() {
!         if (propertyEditorRegistry == null) {
!             initPropertyEditorRegistry();
!         }
!         return propertyEditorRegistry;
!     }
  
!     private void initPropertyEditorRegistry() {
!         try {
!             this.propertyEditorRegistry = (PropertyEditorRegistry)getApplicationContext()
!                     .getBean(PROPERTY_EDITOR_REGISTRY_BEAN_ID,
!                             PropertyEditorRegistry.class);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger.info("No rule source found in context under name '"
!                     + PROPERTY_EDITOR_REGISTRY_BEAN_ID
!                     + "'; configuring defaults.");
!             this.propertyEditorRegistry = new DefaultPropertyEditorRegistry();
!         }
!     }
  
!     public void setPropertyEditorRegistry(PropertyEditorRegistry preReg) {
!         this.propertyEditorRegistry = preReg;
!     }
  
!     public FormComponentInterceptor getInterceptor(FormModel formModel) {
!         return getFormComponentInterceptorFactory().getInterceptor(formModel);
!     }
  
!     protected void initApplicationContext() throws BeansException {
!         if (!lazyInit) {
!             initStandardServices();
!         }
!         initLookAndFeelConfigurer();
!     }
  
!     public void initStandardServices() {
!         getComponentFactory();
!         getObjectConfigurer();
!         getCommandConfigurer();
!         getImageSource();
!         getIconSource();
!         getViewDescriptorRegistry();
!         getRulesSource();
!         getPropertyEditorRegistry();
!     }
  
!     public void initLookAndFeelConfigurer() {
!         try {
!             getApplicationContext().getBean(LOOK_AND_FEEL_CONFIGURER_BEAN_ID);
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             logger
!                     .info("No look and feel configurer found in context under name '"
!                             + LOOK_AND_FEEL_CONFIGURER_BEAN_ID
!                             + "'; configuring defaults.");
!         }
!     }
  
!     public Object getBean(String beanName) {
!         return getApplicationContext().getBean(beanName);
!     }
  
!     public Object getBean(String beanName, Class requiredType) {
!         return getApplicationContext().getBean(beanName, requiredType);
!     }
  
!     public BeanFactory getBeanFactory() {
!         return getApplicationContext();
!     }
  
!     public MessageSourceAccessor getMessages() {
!         return getMessageSourceAccessor();
!     }
  
!     public String getMessage(MessageSourceResolvable resolvable, Locale locale)
!             throws NoSuchMessageException {
!         return getApplicationContext().getMessage(resolvable, locale);
!     }
  
!     public String getMessage(String code, Object[] args, Locale locale)
!             throws NoSuchMessageException {
!         return getApplicationContext().getMessage(code, args, locale);
!     }
  
!     public String getMessage(String code, Object[] args, String defaultMessage,
!             Locale locale) {
!         return getApplicationContext().getMessage(code, args, defaultMessage,
!                 locale);
!     }
  
!     public Image getImage(String key) {
!         return getImageSource().getImage(key);
!     }
  
!     public AwtImageResource getImageResource(String key) {
!         return getImageSource().getImageResource(key);
!     }
  
!     public Icon getIcon(String key) {
!         return getIconSource().getIcon(key);
!     }
  
!     public Resource getResource(String location) {
!         if (location.startsWith(AwtImageResource.RESOURCE_PREFIX)) {
!             return getImageResource(location
!                     .substring(AwtImageResource.RESOURCE_PREFIX.length()));
!         }
!         else {
!             return getApplicationContext().getResource(location);
!         }
!     }
  
!     public PropertyConstraint getRules(Class beanClass, String propertyName) {
!         return getRulesSource().getRules(beanClass, propertyName);
!     }
  
!     public Rules getRules(Class bean) {
!         return getRulesSource().getRules(bean);
!     }
  
!     public Object configure(Object applicationObject, String objectName) {
!         return getObjectConfigurer().configure(applicationObject, objectName);
!     }
  
!     public AbstractCommand configure(AbstractCommand command) {
!         return getCommandConfigurer().configure(command);
!     }
  
!     public AbstractCommand configure(AbstractCommand command,
!             String faceDescriptorId) {
!         return getCommandConfigurer().configure(command, faceDescriptorId);
!     }
  
  }
\ No newline at end of file
--- 65,417 ----
   * @author Keith Donald
   */
! public class ApplicationServices extends ApplicationObjectSupport implements ApplicationObjectConfigurer,
! 		CommandConfigurer, ResourceLoader, MessageSource, ImageSource, IconSource, RulesSource,
! 		FormComponentInterceptorFactory {
  
! 	public static final String IMAGE_SOURCE_BEAN_ID = "imageSource";
  
! 	public static final String ICON_SOURCE_BEAN_ID = "iconSource";
  
! 	public static final String COMPONENT_FACTORY_BEAN_ID = "componentFactory";
  
! 	public static final String RULES_SOURCE_BEAN_ID = "rulesSource";
  
! 	public static final String PROPERTY_EDITOR_REGISTRY_BEAN_ID = "propertyEditorRegistry";
  
! 	public static final String OBJECT_CONFIGURER_BEAN_ID = "applicationObjectConfigurer";
  
! 	public static final String COMMAND_CONFIGURER_BEAN_ID = "commandConfigurer";
  
! 	public static final String LOOK_AND_FEEL_CONFIGURER_BEAN_ID = "lookAndFeelConfigurer";
  
! 	public static final String FORM_INTERCEPTOR_FACTORY_BEAN_ID = "formComponentInterceptorFactory";
  
! 	private final Log logger = LogFactory.getLog(getClass());
  
! 	private ComponentFactory componentFactory;
  
! 	private FormComponentInterceptorFactory formComponentInterceptorFactory;
  
! 	private ApplicationObjectConfigurer objectConfigurer;
  
! 	private CommandConfigurer commandConfigurer;
  
! 	private ImageSource imageSource;
  
! 	private IconSource iconSource;
  
! 	private ViewDescriptorRegistry viewRegistry;
  
! 	private RulesSource rulesSource;
  
! 	private PropertyEditorRegistry propertyEditorRegistry;
  
! 	private boolean lazyInit = true;
  
! 	public void setLazyInit(boolean lazyInit) {
! 		this.lazyInit = lazyInit;
! 	}
  
! 	public ComponentFactory getComponentFactory() {
! 		if (componentFactory == null) {
! 			initComponentFactory();
! 		}
! 		return componentFactory;
! 	}
  
! 	private void initComponentFactory() {
! 		try {
! 			this.componentFactory = (ComponentFactory)getApplicationContext().getBean(COMPONENT_FACTORY_BEAN_ID,
! 					ComponentFactory.class);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No component factory bean found under name " + COMPONENT_FACTORY_BEAN_ID
! 					+ "; creating using existing image source.");
! 			DefaultComponentFactory f = new DefaultComponentFactory();
! 			f.setApplicationContext(getApplicationContext());
! 			this.componentFactory = f;
! 		}
! 		catch (IllegalArgumentException e) {
! 			this.componentFactory = new DefaultComponentFactory();
! 		}
! 	}
  
! 	public void setComponentFactory(ComponentFactory factory) {
! 		this.componentFactory = factory;
! 	}
  
! 	public FormComponentInterceptorFactory getFormComponentInterceptorFactory() {
! 		if (formComponentInterceptorFactory == null) {
! 			initFormComponentInterceptorFactory();
! 		}
! 		return formComponentInterceptorFactory;
! 	}
  
! 	private void initFormComponentInterceptorFactory() {
! 		try {
! 			this.formComponentInterceptorFactory = (FormComponentInterceptorFactory)getApplicationContext().getBean(
! 					FORM_INTERCEPTOR_FACTORY_BEAN_ID, FormComponentInterceptorFactory.class);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No bean named " + FORM_INTERCEPTOR_FACTORY_BEAN_ID + " found. Using empty interceptor.");
! 			this.formComponentInterceptorFactory = new FormComponentInterceptorFactory() {
! 				public FormComponentInterceptor getInterceptor(FormModel formModel) {
! 					return null;
! 				}
! 			};
! 		}
! 	}
  
! 	public ApplicationObjectConfigurer getObjectConfigurer() {
! 		if (objectConfigurer == null) {
! 			initObjectConfigurer();
! 		}
! 		return objectConfigurer;
! 	}
  
! 	private void initObjectConfigurer() {
! 		try {
! 			this.objectConfigurer = (ApplicationObjectConfigurer)getApplicationContext().getBean(OBJECT_CONFIGURER_BEAN_ID,
! 					ApplicationObjectConfigurer.class);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No object configurer found in context under name '" + OBJECT_CONFIGURER_BEAN_ID
! 					+ "'; configuring defaults.");
! 			this.objectConfigurer = new DefaultApplicationObjectConfigurer(getApplicationContext(), getImageSource(),
! 					getIconSource());
! 		}
! 	}
  
! 	public void setObjectConfigurer(ApplicationObjectConfigurer objectConfigurer) {
! 		this.objectConfigurer = objectConfigurer;
! 	}
  
! 	public CommandConfigurer getCommandConfigurer() {
! 		if (commandConfigurer == null) {
! 			initCommandConfigurer();
! 		}
! 		return commandConfigurer;
! 	}
  
! 	private void initCommandConfigurer() {
! 		try {
! 			this.commandConfigurer = (CommandConfigurer)getApplicationContext().getBean(COMMAND_CONFIGURER_BEAN_ID,
! 					CommandConfigurer.class);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No command configurer found in context under name '" + COMMAND_CONFIGURER_BEAN_ID
! 					+ "'; configuring defaults.");
! 			this.commandConfigurer = new DefaultCommandConfigurer();
! 		}
! 	}
  
! 	public void setCommandConfigurer(CommandConfigurer commandConfigurer) {
! 		this.commandConfigurer = commandConfigurer;
! 	}
  
! 	public ImageSource getImageSource() {
! 		if (imageSource == null) {
! 			initImageSource();
! 		}
! 		return imageSource;
! 	}
  
! 	private void initImageSource() {
! 		try {
! 			this.imageSource = (ImageSource)getApplicationContext().getBean(IMAGE_SOURCE_BEAN_ID, ImageSource.class);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No image source bean found in context under name '" + IMAGE_SOURCE_BEAN_ID
! 					+ "'; configuring defaults.");
! 			this.imageSource = new DefaultImageSource(new HashMap());
! 		}
! 	}
  
! 	public void setImageSource(ImageSource imageSource) {
! 		this.imageSource = imageSource;
! 	}
  
! 	public IconSource getIconSource() {
! 		if (iconSource == null) {
! 			initIconSource();
! 		}
! 		return iconSource;
! 	}
  
! 	public void setIconSource(IconSource iconSource) {
! 		this.iconSource = iconSource;
! 	}
  
! 	private void initIconSource() {
! 		try {
! 			this.iconSource = (IconSource)getApplicationContext().getBean(ICON_SOURCE_BEAN_ID, IconSource.class);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No icon source bean found under name " + ICON_SOURCE_BEAN_ID
! 					+ "; creating using existing image source.");
! 			this.iconSource = new DefaultIconSource(getImageSource());
! 		}
! 	}
  
! 	public ViewDescriptorRegistry getViewDescriptorRegistry() {
! 		if (viewRegistry == null) {
! 			initViewRegistry();
! 		}
! 		return viewRegistry;
! 	}
  
! 	private void initViewRegistry() {
! 		BeanFactoryViewDescriptorRegistry r = new BeanFactoryViewDescriptorRegistry();
! 		r.setApplicationContext(getApplicationContext());
! 		this.viewRegistry = r;
! 	}
  
! 	public void setViewRegistry(ViewDescriptorRegistry registry) {
! 		this.viewRegistry = registry;
! 	}
  
! 	public RulesSource getRulesSource() {
! 		if (rulesSource == null) {
! 			initRulesSource();
! 		}
! 		return rulesSource;
! 	}
  
! 	private void initRulesSource() {
! 		try {
! 			this.rulesSource = (RulesSource)getApplicationContext().getBean(RULES_SOURCE_BEAN_ID, RulesSource.class);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No rule source found in context under name '" + RULES_SOURCE_BEAN_ID + "'; configuring defaults.");
! 			this.rulesSource = new DefaultRulesSource();
! 		}
! 		catch (IllegalArgumentException e) {
! 			this.rulesSource = new DefaultRulesSource();
! 		}
! 	}
  
! 	public void setRulesSource(RulesSource rulesSource) {
! 		this.rulesSource = rulesSource;
! 	}
  
! 	public PropertyEditorRegistry getPropertyEditorRegistry() {
! 		if (propertyEditorRegistry == null) {
! 			initPropertyEditorRegistry();
! 		}
! 		return propertyEditorRegistry;
! 	}
  
! 	private void initPropertyEditorRegistry() {
! 		try {
! 			this.propertyEditorRegistry = (PropertyEditorRegistry)getApplicationContext().getBean(
! 					PROPERTY_EDITOR_REGISTRY_BEAN_ID, PropertyEditorRegistry.class);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No rule source found in context under name '" + PROPERTY_EDITOR_REGISTRY_BEAN_ID
! 					+ "'; configuring defaults.");
! 			this.propertyEditorRegistry = new DefaultPropertyEditorRegistry();
! 		}
! 	}
  
! 	public void setPropertyEditorRegistry(PropertyEditorRegistry preReg) {
! 		this.propertyEditorRegistry = preReg;
! 	}
  
! 	public FormComponentInterceptor getInterceptor(FormModel formModel) {
! 		return getFormComponentInterceptorFactory().getInterceptor(formModel);
! 	}
  
! 	protected void initApplicationContext() throws BeansException {
! 		if (!lazyInit) {
! 			initStandardServices();
! 		}
! 		initLookAndFeelConfigurer();
! 	}
  
! 	public void initStandardServices() {
! 		getComponentFactory();
! 		getObjectConfigurer();
! 		getCommandConfigurer();
! 		getImageSource();
! 		getIconSource();
! 		getViewDescriptorRegistry();
! 		getRulesSource();
! 		getPropertyEditorRegistry();
! 	}
  
! 	public void initLookAndFeelConfigurer() {
! 		try {
! 			getApplicationContext().getBean(LOOK_AND_FEEL_CONFIGURER_BEAN_ID);
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			logger.info("No look and feel configurer found in context under name '" + LOOK_AND_FEEL_CONFIGURER_BEAN_ID
! 					+ "'; configuring defaults.");
! 		}
! 	}
  
! 	public Object getBean(String beanName) {
! 		return getApplicationContext().getBean(beanName);
! 	}
  
! 	public Object getBean(String beanName, Class requiredType) {
! 		return getApplicationContext().getBean(beanName, requiredType);
! 	}
  
! 	public BeanFactory getBeanFactory() {
! 		return getApplicationContext();
! 	}
  
! 	public MessageSourceAccessor getMessages() {
! 		return getMessageSourceAccessor();
! 	}
  
! 	public String getMessage(MessageSourceResolvable resolvable, Locale locale) throws NoSuchMessageException {
! 		return getApplicationContext().getMessage(resolvable, locale);
! 	}
  
! 	public String getMessage(String code, Object[] args, Locale locale) throws NoSuchMessageException {
! 		return getApplicationContext().getMessage(code, args, locale);
! 	}
  
! 	public String getMessage(String code, Object[] args, String defaultMessage, Locale locale) {
! 		return getApplicationContext().getMessage(code, args, defaultMessage, locale);
! 	}
  
! 	public Image getImage(String key) {
! 		return getImageSource().getImage(key);
! 	}
  
! 	public AwtImageResource getImageResource(String key) {
! 		return getImageSource().getImageResource(key);
! 	}
  
! 	public Icon getIcon(String key) {
! 		return getIconSource().getIcon(key);
! 	}
  
! 	public Resource getResource(String location) {
! 		if (location.startsWith(AwtImageResource.RESOURCE_PREFIX)) {
! 			return getImageResource(location.substring(AwtImageResource.RESOURCE_PREFIX.length()));
! 		}
! 		else {
! 			return getApplicationContext().getResource(location);
! 		}
! 	}
  
! 	public PropertyConstraint getRules(Class beanClass, String propertyName) {
! 		return getRulesSource().getRules(beanClass, propertyName);
! 	}
  
! 	public Rules getRules(Class bean) {
! 		return getRulesSource().getRules(bean);
! 	}
  
! 	public Object configure(Object applicationObject, String objectName) {
! 		return getObjectConfigurer().configure(applicationObject, objectName);
! 	}
  
! 	public AbstractCommand configure(AbstractCommand command) {
! 		return getCommandConfigurer().configure(command);
! 	}
  
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8208/src/org/springframework/richclient/command/support

Modified Files:
	DefaultCommandManager.java CommandFaceButtonManager.java 
Log Message:
polishing command framework
- removed unecessary interfaces in CommandManager

Index: CommandFaceButtonManager.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support/CommandFaceButtonManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CommandFaceButtonManager.java	22 Oct 2004 22:02:58 -0000	1.1
--- CommandFaceButtonManager.java	28 Oct 2004 15:43:34 -0000	1.2
***************
*** 36,203 ****
  
  public class CommandFaceButtonManager implements PropertyChangeListener {
!     private ReferenceQueue queue = new ReferenceQueue();
  
!     private Set buttons = new HashSet(6);
  
!     private AbstractCommand command;
  
!     private String faceDescriptorId;
  
!     private CommandFaceDescriptor faceDescriptor;
  
!     private CommandFaceDescriptorRegistry faceDescriptorRegistry;
  
!     private static class ManagedButton {
!         private WeakReference buttonHolder;
  
!         private CommandButtonConfigurer buttonConfigurer;
  
!         public ManagedButton(AbstractButton button,
!                 CommandButtonConfigurer buttonConfigurer, ReferenceQueue queue) {
!             this.buttonHolder = new WeakReference(button, queue);
!             this.buttonConfigurer = buttonConfigurer;
!         }
  
!         public AbstractButton getButton() {
!             return (AbstractButton)buttonHolder.get();
!         }
  
!         public boolean equals(Object o) {
!             return ObjectUtils.nullSafeEquals(getButton(), ((ManagedButton)o)
!                     .getButton());
!         }
  
!         public int hashCode() {
!             return getButton().hashCode();
!         }
!     }
  
!     public CommandFaceButtonManager(AbstractCommand command,
!             String faceDescriptorKey) {
!         Assert.notNull(command,
!                 "The command to manage buttons for cannot be null");
!         Assert
!                 .hasText(faceDescriptorKey,
!                         "The face descriptor key is required");
!         this.command = command;
!         this.faceDescriptorId = faceDescriptorKey;
!     }
  
!     public CommandFaceButtonManager(AbstractCommand command,
!             CommandFaceDescriptor faceDescriptor) {
!         this.command = command;
!         setFaceDescriptor(faceDescriptor);
!     }
  
!     public CommandFaceDescriptor getFaceDescriptor() {
!         return faceDescriptor;
!     }
  
!     public void setFaceDescriptor(CommandFaceDescriptor faceDescriptor) {
!         Assert
!                 .notNull(faceDescriptor,
!                         "The face descriptor for managing command button appearance is required");
!         if (!ObjectUtils.nullSafeEquals(this.faceDescriptor, faceDescriptor)) {
!             if (this.faceDescriptor != null) {
!                 this.faceDescriptor.removePropertyChangeListener(this);
!             }
!             this.faceDescriptor = faceDescriptor;
!             this.faceDescriptor.addPropertyChangeListener(this);
!         }
!     }
  
!     public boolean isFaceSet() {
!         return this.faceDescriptor != null;
!     }
  
!     public void attachAndConfigure(AbstractButton button,
!             CommandButtonConfigurer strategy) {
!         Assert
!                 .notNull(button,
!                         "The button to attach and configure is required");
!         Assert.notNull(strategy,
!                 "The button configuration strategy is required");
!         cleanUp();
!         ManagedButton managedButton = new ManagedButton(button, strategy, queue);
!         if (buttons.add(managedButton)) {
!             configure(button, strategy);
!         }
!     }
  
!     private void cleanUp() {
!         Reference reference;
!         while ((reference = this.queue.poll()) != null) {
!             buttons.remove(reference.get());
!         }
!     }
  
!     protected void configure(AbstractButton button,
!             CommandButtonConfigurer strategy) {
!         if (this.faceDescriptor == null) {
!             this.faceDescriptor = getFaceDescriptor(faceDescriptorId);
!         }
!         this.faceDescriptor.configure(button, command, strategy);
!     }
  
!     protected CommandFaceDescriptor getFaceDescriptor(String faceDescriptorKey) {
!         return command.getFaceDescriptorRegistry().getFaceDescriptor(command,
!                 faceDescriptorKey);
!     }
  
!     public void detach(AbstractButton button) {
!         buttons.remove(button);
!     }
  
!     public void detachAll() {
!         buttons.clear();
!     }
  
!     public boolean isAttachedTo(AbstractButton button) {
!         return buttons.contains(button);
!     }
  
!     public Iterator iterator() {
!         return new ButtonIterator(buttons.iterator());
!     }
  
!     private static class ButtonIterator implements Iterator {
!         private Iterator it;
  
!         public ButtonIterator(Iterator it) {
!             this.it = it;
!         }
  
!         public boolean hasNext() {
!             return it.hasNext();
!         }
  
!         public Object next() {
!             ManagedButton mb = ((ManagedButton)it.next());
!             return mb.getButton();
!         }
  
!         public void remove() {
!             throw new UnsupportedOperationException();
!         }
!     };
  
!     public void propertyChange(PropertyChangeEvent e) {
!         Iterator it = buttons.iterator();
!         while (it.hasNext()) {
!             ManagedButton mb = (ManagedButton)it.next();
!             Assert.notNull(mb, "Managed button reference cannot be null");
!             if (mb.getButton() == null) {
!                 it.remove();
!             }
!             else {
!                 configure(mb.getButton(), mb.buttonConfigurer);
!             }
!         }
!     }
  
!     public String toString() {
!         return new ToStringCreator(this).append("commandId", command.getId())
!                 .append("faceDescriptor", faceDescriptor).toString();
!     }
  
  }
\ No newline at end of file
--- 36,194 ----
  
  public class CommandFaceButtonManager implements PropertyChangeListener {
! 	private ReferenceQueue queue = new ReferenceQueue();
  
! 	private Set buttons = new HashSet(6);
  
! 	private AbstractCommand command;
  
! 	private String faceDescriptorId;
  
! 	private CommandFaceDescriptor faceDescriptor;
  
! 	private CommandFaceDescriptorRegistry faceDescriptorRegistry;
  
! 	private static class ManagedButton {
! 		private WeakReference buttonHolder;
  
! 		private CommandButtonConfigurer buttonConfigurer;
  
! 		public ManagedButton(AbstractButton button, CommandButtonConfigurer buttonConfigurer, ReferenceQueue queue) {
! 			this.buttonHolder = new WeakReference(button, queue);
! 			this.buttonConfigurer = buttonConfigurer;
! 		}
  
! 		public AbstractButton getButton() {
! 			return (AbstractButton)buttonHolder.get();
! 		}
  
! 		public boolean equals(Object o) {
! 			return ObjectUtils.nullSafeEquals(getButton(), ((ManagedButton)o).getButton());
! 		}
  
! 		public int hashCode() {
! 			return getButton().hashCode();
! 		}
! 	}
  
! 	public CommandFaceButtonManager(AbstractCommand command, String faceDescriptorKey) {
! 		Assert.notNull(command, "The command to manage buttons for cannot be null");
! 		Assert.hasText(faceDescriptorKey, "The face descriptor key is required");
! 		this.command = command;
! 		this.faceDescriptorId = faceDescriptorKey;
! 	}
  
! 	public CommandFaceButtonManager(AbstractCommand command, CommandFaceDescriptor faceDescriptor) {
! 		this.command = command;
! 		setFaceDescriptor(faceDescriptor);
! 	}
  
! 	public void setFaceDescriptor(CommandFaceDescriptor faceDescriptor) {
! 		Assert.notNull(faceDescriptor, "The face descriptor for managing command button appearance is required");
! 		if (!ObjectUtils.nullSafeEquals(this.faceDescriptor, faceDescriptor)) {
! 			if (this.faceDescriptor != null) {
! 				this.faceDescriptor.removePropertyChangeListener(this);
! 			}
! 			this.faceDescriptor = faceDescriptor;
! 			this.faceDescriptor.addPropertyChangeListener(this);
! 			propertyChange(null);
! 		}
! 	}
  
! 	public CommandFaceDescriptor getFaceDescriptor() {
! 		if (this.faceDescriptor == null) {
! 			setFaceDescriptor(getFaceDescriptor(this.faceDescriptorId));
! 		}
! 		return faceDescriptor;
! 	}
  
! 	private CommandFaceDescriptor getFaceDescriptor(String faceDescriptorId) {
! 		if (command.getFaceDescriptorRegistry() != null) {
! 			return command.getFaceDescriptorRegistry().getFaceDescriptor(command, faceDescriptorId);
! 		}
! 		else {
! 			return CommandFaceDescriptor.BLANK_FACE_DESCRIPTOR;
! 		}
! 	}
  
! 	public boolean isFaceConfigured() {
! 		return this.faceDescriptor != null && this.faceDescriptor != CommandFaceDescriptor.BLANK_FACE_DESCRIPTOR;
! 	}
  
! 	public void attachAndConfigure(AbstractButton button, CommandButtonConfigurer strategy) {
! 		Assert.notNull(button, "The button to attach and configure is required");
! 		Assert.notNull(strategy, "The button configuration strategy is required");
! 		cleanUp();
! 		ManagedButton managedButton = new ManagedButton(button, strategy, queue);
! 		if (buttons.add(managedButton)) {
! 			configure(button, strategy);
! 		}
! 	}
  
! 	private void cleanUp() {
! 		Reference reference;
! 		while ((reference = this.queue.poll()) != null) {
! 			buttons.remove(reference.get());
! 		}
! 	}
  
! 	protected void configure(AbstractButton button, CommandButtonConfigurer strategy) {
! 		getFaceDescriptor().configure(button, command, strategy);
! 	}
  
! 	public void detach(AbstractButton button) {
! 		buttons.remove(button);
! 	}
  
! 	public void detachAll() {
! 		buttons.clear();
! 	}
  
! 	public boolean isAttachedTo(AbstractButton button) {
! 		return buttons.contains(button);
! 	}
  
! 	public Iterator iterator() {
! 		return new ButtonIterator(buttons.iterator());
! 	}
  
! 	private static class ButtonIterator implements Iterator {
! 		private Iterator it;
  
! 		public ButtonIterator(Iterator it) {
! 			this.it = it;
! 		}
  
! 		public boolean hasNext() {
! 			return it.hasNext();
! 		}
  
! 		public Object next() {
! 			ManagedButton mb = ((ManagedButton)it.next());
! 			return mb.getButton();
! 		}
  
! 		public void remove() {
! 			throw new UnsupportedOperationException();
! 		}
! 	};
  
! 	public void propertyChange(PropertyChangeEvent e) {
! 		Iterator it = buttons.iterator();
! 		while (it.hasNext()) {
! 			ManagedButton mb = (ManagedButton)it.next();
! 			Assert.notNull(mb, "Managed button reference cannot be null");
! 			if (mb.getButton() == null) {
! 				it.remove();
! 			}
! 			else {
! 				configure(mb.getButton(), mb.buttonConfigurer);
! 			}
! 		}
! 	}
  
! 	public String toString() {
! 		return new ToStringCreator(this).append("commandId", command.getId()).append("faceDescriptor", faceDescriptor)
! 				.append("attachedButtonCount", buttons.size()).toString();
! 	}
  
  }
\ No newline at end of file

Index: DefaultCommandManager.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support/DefaultCommandManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DefaultCommandManager.java	28 Oct 2004 06:12:43 -0000	1.8
--- DefaultCommandManager.java	28 Oct 2004 15:43:34 -0000	1.9
***************
*** 19,22 ****
--- 19,25 ----
  import org.apache.commons.logging.LogFactory;
  import org.springframework.beans.BeansException;
+ import org.springframework.beans.factory.BeanFactory;
+ import org.springframework.beans.factory.BeanFactoryAware;
+ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
  import org.springframework.beans.factory.config.BeanPostProcessor;
  import org.springframework.richclient.command.AbstractCommand;
***************
*** 32,39 ****
  import org.springframework.richclient.command.ExclusiveCommandGroup;
  import org.springframework.richclient.command.TargetableActionCommand;
- import org.springframework.richclient.command.config.ApplicationCommandConfigurer;
  import org.springframework.richclient.command.config.CommandButtonConfigurer;
  import org.springframework.richclient.command.config.CommandConfigurer;
  import org.springframework.richclient.command.config.CommandFaceDescriptor;
  import org.springframework.richclient.factory.ButtonFactory;
  import org.springframework.richclient.factory.MenuFactory;
--- 35,42 ----
  import org.springframework.richclient.command.ExclusiveCommandGroup;
  import org.springframework.richclient.command.TargetableActionCommand;
  import org.springframework.richclient.command.config.CommandButtonConfigurer;
  import org.springframework.richclient.command.config.CommandConfigurer;
  import org.springframework.richclient.command.config.CommandFaceDescriptor;
+ import org.springframework.richclient.command.config.DefaultCommandConfigurer;
  import org.springframework.richclient.factory.ButtonFactory;
  import org.springframework.richclient.factory.MenuFactory;
***************
*** 43,54 ****
   * @author Keith Donald
   */
! public class DefaultCommandManager implements CommandManager, BeanPostProcessor {
  	private final Log logger = LogFactory.getLog(getClass());
  
  	private DefaultCommandRegistry commandRegistry = new DefaultCommandRegistry();
  
  	private CommandServices commandServices = DefaultCommandServices.instance();
  
! 	private CommandConfigurer commandConfigurer = new ApplicationCommandConfigurer(this);
  
  	public DefaultCommandManager() {
--- 46,59 ----
   * @author Keith Donald
   */
! public class DefaultCommandManager implements CommandManager, BeanPostProcessor, BeanFactoryAware {
  	private final Log logger = LogFactory.getLog(getClass());
  
+ 	private BeanFactory beanFactory;
+ 
  	private DefaultCommandRegistry commandRegistry = new DefaultCommandRegistry();
  
  	private CommandServices commandServices = DefaultCommandServices.instance();
  
! 	private CommandConfigurer commandConfigurer = new DefaultCommandConfigurer(this);
  
  	public DefaultCommandManager() {
***************
*** 73,76 ****
--- 78,85 ----
  	}
  
+ 	public void setBeanFactory(BeanFactory beanFactory) {
+ 		this.beanFactory = beanFactory;
+ 	}
+ 
  	public ButtonFactory getButtonFactory() {
  		return commandServices.getButtonFactory();
***************
*** 97,103 ****
  	}
  
! 	public CommandFaceDescriptor getFaceDescriptor(AbstractCommand command, String faceDescriptorKey) {
! 		// TODO
! 		return null;
  	}
  
--- 106,127 ----
  	}
  
! 	public CommandFaceDescriptor getFaceDescriptor(AbstractCommand command, String faceDescriptorId) {
! 		if (beanFactory == null) {
! 			return CommandFaceDescriptor.BLANK_FACE_DESCRIPTOR;
! 		}
! 		else {
! 			try {
! 				return (CommandFaceDescriptor)beanFactory.getBean(command.getId() + "." + faceDescriptorId,
! 						CommandFaceDescriptor.class);
! 			}
! 			catch (NoSuchBeanDefinitionException e) {
! 				try {
! 					return (CommandFaceDescriptor)beanFactory.getBean(faceDescriptorId, CommandFaceDescriptor.class);
! 				}
! 				catch (NoSuchBeanDefinitionException ex) {
! 					return CommandFaceDescriptor.BLANK_FACE_DESCRIPTOR;
! 				}
! 			}
! 		}
  	}
  
***************
*** 118,149 ****
  	}
  
- 	/**
- 	 * Adds a new command to this manager's registry; also configures the
- 	 * command on behalf of the caller.
- 	 * 
- 	 * @param command
- 	 *            the new command to be configured and registered
- 	 */
- 	public void addNewCommand(AbstractCommand command) {
- 		addNewCommand(command, command.getId());
- 	}
- 
- 	/**
- 	 * Adds a new command to this manager's registry; also configures the
- 	 * command on behalf of the caller. Configures the command's face (visual
- 	 * appearance) using the provided face configuration key, which delegates to
- 	 * a configured ObjectConfigurer.
- 	 * 
- 	 * @param command
- 	 * @param faceDescriptorKey
- 	 */
- 	public void addNewCommand(AbstractCommand command, String faceDescriptorKey) {
- 		if (logger.isDebugEnabled()) {
- 			logger.debug("Configuring and adding new command '" + command.getId() + "'");
- 		}
- 		configure(command, faceDescriptorKey);
- 		registerCommand(command);
- 	}
- 
  	public void addCommandInterceptor(String commandId, ActionCommandInterceptor interceptor) {
  		getActionCommand(commandId).addCommandInterceptor(interceptor);
--- 142,145 ----
***************
*** 155,158 ****
--- 151,158 ----
  
  	public void registerCommand(AbstractCommand command) {
+ 		if (logger.isDebugEnabled()) {
+ 			logger.debug("Configuring and registering new command '" + command.getId() + "'");
+ 		}
+ 		configure(command);
  		commandRegistry.registerCommand(command);
  	}
***************
*** 173,177 ****
  		Assert.notNull(commandId, "Registered targetable action commands must have an id.");
  		TargetableActionCommand newCommand = new TargetableActionCommand(commandId, delegate);
- 		configure(newCommand);
  		registerCommand(newCommand);
  		return newCommand;
--- 173,176 ----
***************
*** 181,185 ****
  		Assert.notNull(groupId, "Registered command groups must have an id.");
  		CommandGroup newGroup = new CommandGroupFactoryBean(groupId, this.commandRegistry, this, members).getCommandGroup();
! 		addNewCommand(newGroup);
  		return newGroup;
  	}
--- 180,184 ----
  		Assert.notNull(groupId, "Registered command groups must have an id.");
  		CommandGroup newGroup = new CommandGroupFactoryBean(groupId, this.commandRegistry, this, members).getCommandGroup();
! 		registerCommand(newGroup);
  		return newGroup;
  	}
***************
*** 189,193 ****
  		CommandGroupFactoryBean newGroupFactory = new CommandGroupFactoryBean(groupId, this.commandRegistry, this, members);
  		newGroupFactory.setExclusive(true);
! 		addNewCommand(newGroupFactory.getCommandGroup());
  		return (ExclusiveCommandGroup)newGroupFactory.getCommandGroup();
  	}
--- 188,192 ----
  		CommandGroupFactoryBean newGroupFactory = new CommandGroupFactoryBean(groupId, this.commandRegistry, this, members);
  		newGroupFactory.setExclusive(true);
! 		registerCommand(newGroupFactory.getCommandGroup());
  		return (ExclusiveCommandGroup)newGroupFactory.getCommandGroup();
  	}
***************
*** 197,209 ****
  	}
  
- 	public AbstractCommand configure(AbstractCommand command, String faceDescriptorKey) {
- 		return commandConfigurer.configure(command, faceDescriptorKey);
- 	}
- 
  	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
  		if (bean instanceof CommandGroupFactoryBean) {
  			CommandGroupFactoryBean factory = (CommandGroupFactoryBean)bean;
! 			CommandGroup group = factory.getCommandGroup();
! 			addNewCommand(group);
  		}
  		else if (bean instanceof AbstractCommand) {
--- 196,203 ----
  	}
  
  	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
  		if (bean instanceof CommandGroupFactoryBean) {
  			CommandGroupFactoryBean factory = (CommandGroupFactoryBean)bean;
! 			registerCommand(factory.getCommandGroup());
  		}
  		else if (bean instanceof AbstractCommand) {

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/binding/form/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8208/src/org/springframework/binding/form/support

Modified Files:
	AbstractFormModel.java 
Log Message:
polishing command framework
- removed unecessary interfaces in CommandManager

Index: AbstractFormModel.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/binding/form/support/AbstractFormModel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AbstractFormModel.java	15 Oct 2004 22:18:27 -0000	1.11
--- AbstractFormModel.java	28 Oct 2004 15:43:34 -0000	1.12
***************
*** 21,26 ****
  import java.util.Set;
  
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  import org.springframework.beans.BeanUtils;
  import org.springframework.binding.MutablePropertyAccessStrategy;
--- 21,24 ----
***************
*** 40,258 ****
   * @author Oliver Hutchison
   */
! public abstract class AbstractFormModel extends AbstractPropertyChangePublisher
!         implements NestableFormModel {
! 
!     protected final Log logger = LogFactory.getLog(getClass());
! 
!     private NestingFormModel parent;
  
!     private RulesSource rulesSource;
  
!     private boolean bufferChanges = true;
  
!     private boolean enabled = true;
  
!     private MutablePropertyAccessStrategy domainObjectAccessStrategy;
  
!     private Set commitListeners;
  
!     protected AbstractFormModel() {
!     }
  
!     protected AbstractFormModel(
!             MutablePropertyAccessStrategy domainObjectAccessStrategy) {
!         this.domainObjectAccessStrategy = domainObjectAccessStrategy;
!     }
  
!     public Object getFormObject() {
!         return getPropertyAccessStrategy().getDomainObject();
!     }
  
!     public void setFormObject(Object formObject) {
!         if (formObject == null) {
!             handleSetNullFormObject();
!         }
!         else {
!             getFormObjectHolder().setValue(formObject);
!         }
!     }
  
!     protected void handleSetNullFormObject() {
!         if (logger.isInfoEnabled()) {
!             logger
!                     .info("New form object value is null; resetting to a new fresh object instance and disabling form");
!         }
!         reset();
!         setEnabled(false);
!     }
  
!     public ValueModel getFormObjectHolder() {
!         return getPropertyAccessStrategy().getDomainObjectHolder();
!     }
  
!     protected Class getFormObjectClass() {
!         return getPropertyAccessStrategy().getDomainObject().getClass();
!     }
  
!     public NestingFormModel getParent() {
!         return parent;
!     }
  
!     public void setParent(NestingFormModel parent) {
!         this.parent = parent;
!     }
  
!     public RulesSource getRulesSource() {
!         return rulesSource;
!     }
  
!     public void setRulesSource(RulesSource rulesSource) {
!         this.rulesSource = rulesSource;
!     }
  
!     public boolean getBufferChangesDefault() {
!         return bufferChanges;
!     }
  
!     public void setBufferChangesDefault(boolean bufferChanges) {
!         this.bufferChanges = bufferChanges;
!     }
  
!     public boolean isEnabled() {
!         return enabled;
!     }
  
!     public void setEnabled(boolean enabled) {
!         if (hasChanged(this.enabled, enabled)) {
!             this.enabled = enabled;
!             handleEnabledChange();
!             firePropertyChange("enabled", !this.enabled, enabled);
!         }
!     }
  
!     protected void handleEnabledChange() {
!     }
  
!     public String getDisplayValue(String formPropertyPath) {
!         ValueModel valueModel = getDisplayValueModel(formPropertyPath);
!         assertValueModelNotNull(valueModel, formPropertyPath);
!         Object o = valueModel.getValue();
!         if (o == null) { return ""; }
!         return String.valueOf(o);
!     }
  
!     public Object getValue(String formPropertyPath) {
!         return getRequiredValueModel(formPropertyPath).getValue();
!     }
  
!     public void addFormObjectChangeListener(ValueChangeListener listener) {
!         getFormObjectHolder().addValueChangeListener(listener);
!     }
  
!     public void removeFormObjectChangeListener(ValueChangeListener listener) {
!         getFormObjectHolder().removeValueChangeListener(listener);
!     }
  
!     public void addFormValueChangeListener(String formPropertyPath,
!             ValueChangeListener listener) {
!         getRequiredValueModel(formPropertyPath)
!                 .addValueChangeListener(listener);
!     }
  
!     public void removeFormValueChangeListener(String formPropertyPath,
!             ValueChangeListener listener) {
!         getRequiredValueModel(formPropertyPath).removeValueChangeListener(
!                 listener);
!     }
  
!     public void addFormPropertyChangeListener(String formPropertyPath,
!             PropertyChangeListener listener) {
!         BoundValueModel valueModel = (BoundValueModel)getRequiredValueModel(formPropertyPath);
!         valueModel.addPropertyChangeListener(BoundValueModel.VALUE_PROPERTY,
!                 listener);
!     }
  
!     public void removeFormPropertyChangeListener(String formPropertyPath,
!             PropertyChangeListener listener) {
!         BoundValueModel valueModel = (BoundValueModel)getRequiredValueModel(formPropertyPath);
!         valueModel.removePropertyChangeListener(BoundValueModel.VALUE_PROPERTY,
!                 listener);
!     }
  
!     protected ValueModel getRequiredValueModel(String formPropertyPath) {
!         ValueModel valueModel = getValueModel(formPropertyPath);
!         assertValueModelNotNull(valueModel, formPropertyPath);
!         return valueModel;
!     }
  
!     protected ValueModel unwrap(ValueModel valueModel) {
!         if (valueModel instanceof ValueModelWrapper) {
!             return ((ValueModelWrapper)valueModel).getInnerMostValueModel();
!         }
!         else {
!             return valueModel;
!         }
!     }
  
!     private void assertValueModelNotNull(ValueModel valueModel,
!             String formProperty) {
!         Assert
!                 .isTrue(
!                         valueModel != null,
!                         "The property '"
!                                 + formProperty
!                                 + "' has not been added to this form model (or to any parents.)");
!     }
  
!     public MutablePropertyAccessStrategy getPropertyAccessStrategy() {
!         return domainObjectAccessStrategy;
!     }
  
!     public void setPropertyAccessStrategy(
!             MutablePropertyAccessStrategy domainObjectAccessStrategy) {
!         this.domainObjectAccessStrategy = domainObjectAccessStrategy;
!     }
  
!     public PropertyMetadataAccessStrategy getMetadataAccessStrategy() {
!         return domainObjectAccessStrategy.getMetadataAccessStrategy();
!     }
  
!     public void addCommitListener(CommitListener listener) {
!         getOrCreateCommitListeners().add(listener);
!     }
  
!     public void removeCommitListener(CommitListener listener) {
!         getOrCreateCommitListeners().remove(listener);
!     }
  
!     private Set getOrCreateCommitListeners() {
!         if (this.commitListeners == null) {
!             this.commitListeners = new LinkedHashSet(6);
!         }
!         return commitListeners;
!     }
  
!     protected boolean preEditCommit() {
!         if (commitListeners == null) { return true; }
!         Object formObject = getFormObject();
!         for (Iterator i = commitListeners.iterator(); i.hasNext();) {
!             CommitListener l = (CommitListener)i.next();
!             if (!l.preEditCommitted(formObject)) { return false; }
!         }
!         return true;
!     }
  
!     protected void postEditCommit() {
!         if (commitListeners == null) { return; }
!         Object formObject = getFormObject();
!         for (Iterator i = commitListeners.iterator(); i.hasNext();) {
!             CommitListener l = (CommitListener)i.next();
!             l.postEditCommitted(formObject);
!         }
!     }
  
!     public void reset() {
!         getFormObjectHolder().setValue(
!                 BeanUtils.instantiateClass(getFormObjectClass()));
!     }
  }
\ No newline at end of file
--- 38,243 ----
   * @author Oliver Hutchison
   */
! public abstract class AbstractFormModel extends AbstractPropertyChangePublisher implements NestableFormModel {
! 	private NestingFormModel parent;
  
! 	private RulesSource rulesSource;
  
! 	private boolean bufferChanges = true;
  
! 	private boolean enabled = true;
  
! 	private MutablePropertyAccessStrategy domainObjectAccessStrategy;
  
! 	private Set commitListeners;
  
! 	protected AbstractFormModel() {
! 	}
  
! 	protected AbstractFormModel(MutablePropertyAccessStrategy domainObjectAccessStrategy) {
! 		this.domainObjectAccessStrategy = domainObjectAccessStrategy;
! 	}
  
! 	public Object getFormObject() {
! 		return getPropertyAccessStrategy().getDomainObject();
! 	}
  
! 	public void setFormObject(Object formObject) {
! 		if (formObject == null) {
! 			handleSetNullFormObject();
! 		}
! 		else {
! 			getFormObjectHolder().setValue(formObject);
! 		}
! 	}
  
! 	protected void handleSetNullFormObject() {
! 		if (logger.isInfoEnabled()) {
! 			logger.info("New form object value is null; resetting to a new fresh object instance and disabling form");
! 		}
! 		reset();
! 		setEnabled(false);
! 	}
  
! 	public ValueModel getFormObjectHolder() {
! 		return getPropertyAccessStrategy().getDomainObjectHolder();
! 	}
  
! 	protected Class getFormObjectClass() {
! 		return getPropertyAccessStrategy().getDomainObject().getClass();
! 	}
  
! 	public NestingFormModel getParent() {
! 		return parent;
! 	}
  
! 	public void setParent(NestingFormModel parent) {
! 		this.parent = parent;
! 	}
  
! 	public RulesSource getRulesSource() {
! 		return rulesSource;
! 	}
  
! 	public void setRulesSource(RulesSource rulesSource) {
! 		this.rulesSource = rulesSource;
! 	}
  
! 	public boolean getBufferChangesDefault() {
! 		return bufferChanges;
! 	}
  
! 	public void setBufferChangesDefault(boolean bufferChanges) {
! 		this.bufferChanges = bufferChanges;
! 	}
  
! 	public boolean isEnabled() {
! 		return enabled;
! 	}
  
! 	public void setEnabled(boolean enabled) {
! 		if (hasChanged(this.enabled, enabled)) {
! 			this.enabled = enabled;
! 			handleEnabledChange();
! 			firePropertyChange("enabled", !this.enabled, enabled);
! 		}
! 	}
  
! 	protected void handleEnabledChange() {
! 	}
  
! 	public String getDisplayValue(String formPropertyPath) {
! 		ValueModel valueModel = getDisplayValueModel(formPropertyPath);
! 		assertValueModelNotNull(valueModel, formPropertyPath);
! 		Object o = valueModel.getValue();
! 		if (o == null) {
! 			return "";
! 		}
! 		return String.valueOf(o);
! 	}
  
! 	public Object getValue(String formPropertyPath) {
! 		return getRequiredValueModel(formPropertyPath).getValue();
! 	}
  
! 	public void addFormObjectChangeListener(ValueChangeListener listener) {
! 		getFormObjectHolder().addValueChangeListener(listener);
! 	}
  
! 	public void removeFormObjectChangeListener(ValueChangeListener listener) {
! 		getFormObjectHolder().removeValueChangeListener(listener);
! 	}
  
! 	public void addFormValueChangeListener(String formPropertyPath, ValueChangeListener listener) {
! 		getRequiredValueModel(formPropertyPath).addValueChangeListener(listener);
! 	}
  
! 	public void removeFormValueChangeListener(String formPropertyPath, ValueChangeListener listener) {
! 		getRequiredValueModel(formPropertyPath).removeValueChangeListener(listener);
! 	}
  
! 	public void addFormPropertyChangeListener(String formPropertyPath, PropertyChangeListener listener) {
! 		BoundValueModel valueModel = (BoundValueModel)getRequiredValueModel(formPropertyPath);
! 		valueModel.addPropertyChangeListener(BoundValueModel.VALUE_PROPERTY, listener);
! 	}
  
! 	public void removeFormPropertyChangeListener(String formPropertyPath, PropertyChangeListener listener) {
! 		BoundValueModel valueModel = (BoundValueModel)getRequiredValueModel(formPropertyPath);
! 		valueModel.removePropertyChangeListener(BoundValueModel.VALUE_PROPERTY, listener);
! 	}
  
! 	protected ValueModel getRequiredValueModel(String formPropertyPath) {
! 		ValueModel valueModel = getValueModel(formPropertyPath);
! 		assertValueModelNotNull(valueModel, formPropertyPath);
! 		return valueModel;
! 	}
  
! 	protected ValueModel unwrap(ValueModel valueModel) {
! 		if (valueModel instanceof ValueModelWrapper) {
! 			return ((ValueModelWrapper)valueModel).getInnerMostValueModel();
! 		}
! 		else {
! 			return valueModel;
! 		}
! 	}
  
! 	private void assertValueModelNotNull(ValueModel valueModel, String formProperty) {
! 		Assert.isTrue(valueModel != null, "The property '" + formProperty
! 				+ "' has not been added to this form model (or to any parents.)");
! 	}
  
! 	public MutablePropertyAccessStrategy getPropertyAccessStrategy() {
! 		return domainObjectAccessStrategy;
! 	}
  
! 	public void setPropertyAccessStrategy(MutablePropertyAccessStrategy domainObjectAccessStrategy) {
! 		this.domainObjectAccessStrategy = domainObjectAccessStrategy;
! 	}
  
! 	public PropertyMetadataAccessStrategy getMetadataAccessStrategy() {
! 		return domainObjectAccessStrategy.getMetadataAccessStrategy();
! 	}
  
! 	public void addCommitListener(CommitListener listener) {
! 		getOrCreateCommitListeners().add(listener);
! 	}
  
! 	public void removeCommitListener(CommitListener listener) {
! 		getOrCreateCommitListeners().remove(listener);
! 	}
  
! 	private Set getOrCreateCommitListeners() {
! 		if (this.commitListeners == null) {
! 			this.commitListeners = new LinkedHashSet(6);
! 		}
! 		return commitListeners;
! 	}
  
! 	protected boolean preEditCommit() {
! 		if (commitListeners == null) {
! 			return true;
! 		}
! 		Object formObject = getFormObject();
! 		for (Iterator i = commitListeners.iterator(); i.hasNext();) {
! 			CommitListener l = (CommitListener)i.next();
! 			if (!l.preEditCommitted(formObject)) {
! 				return false;
! 			}
! 		}
! 		return true;
! 	}
  
! 	protected void postEditCommit() {
! 		if (commitListeners == null) {
! 			return;
! 		}
! 		Object formObject = getFormObject();
! 		for (Iterator i = commitListeners.iterator(); i.hasNext();) {
! 			CommitListener l = (CommitListener)i.next();
! 			l.postEditCommitted(formObject);
! 		}
! 	}
  
! 	public void reset() {
! 		getFormObjectHolder().setValue(BeanUtils.instantiateClass(getFormObjectClass()));
! 	}
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8208/src/org/springframework/richclient/command

Modified Files:
	CommandManager.java AbstractCommand.java 
Log Message:
polishing command framework
- removed unecessary interfaces in CommandManager

Index: CommandManager.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/CommandManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CommandManager.java	20 Oct 2004 21:43:16 -0000	1.4
--- CommandManager.java	28 Oct 2004 15:43:19 -0000	1.5
***************
*** 24,31 ****
  public interface CommandManager extends CommandServices, CommandRegistry,
          CommandFaceDescriptorRegistry, CommandConfigurer, CommandFactory {
-     public void addNewCommand(AbstractCommand command);
- 
-     public void addNewCommand(AbstractCommand command, String faceDescriptorKey);
- 
      public void addCommandInterceptor(String commandId,
              ActionCommandInterceptor interceptor);
--- 24,27 ----

Index: AbstractCommand.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/AbstractCommand.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** AbstractCommand.java	22 Oct 2004 22:02:57 -0000	1.13
--- AbstractCommand.java	28 Oct 2004 15:43:33 -0000	1.14
***************
*** 28,33 ****
  import javax.swing.event.SwingPropertyChangeSupport;
  
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  import org.springframework.beans.factory.BeanNameAware;
  import org.springframework.beans.factory.InitializingBean;
--- 28,31 ----
***************
*** 44,462 ****
  import org.springframework.richclient.factory.LabelInfoFactory;
  import org.springframework.richclient.factory.MenuFactory;
- import org.springframework.util.Assert;
  import org.springframework.util.CachingMapTemplate;
  import org.springframework.util.StringUtils;
  import org.springframework.util.ToStringCreator;
  
! public abstract class AbstractCommand extends AbstractPropertyChangePublisher
!         implements InitializingBean, BeanNameAware, Guarded {
! 
!     protected final Log logger = LogFactory.getLog(getClass());
! 
!     public static final String ENABLED_PROPERTY_NAME = "enabled";
  
!     public static final String VISIBLE_PROPERTY_NAME = "visible";
  
!     private static final String DEFAULT_FACE_DESCRIPTOR_ID = "default";
  
!     private String id;
  
!     private String defaultFaceDescriptorId = DEFAULT_FACE_DESCRIPTOR_ID;
  
!     private boolean enabled = true;
  
!     private boolean visible = true;
  
!     private Map faceButtonManagers;
  
!     private CommandServices commandServices;
  
!     private CommandFaceDescriptorRegistry faceDescriptorRegistry;
  
!     private SwingPropertyChangeSupport pcs;
  
!     protected AbstractCommand() {
!     }
  
!     protected AbstractCommand(String id) {
!         this(id, (CommandFaceDescriptor)null);
!     }
  
!     protected AbstractCommand(String id, String encodedLabel) {
!         this(id, new CommandFaceDescriptor(encodedLabel));
!     }
  
!     protected AbstractCommand(String id, String encodedLabel, Icon icon,
!             String caption) {
!         this(id, new CommandFaceDescriptor(encodedLabel, icon, caption));
!     }
  
!     protected AbstractCommand(String id, CommandFaceDescriptor faceDescriptor) {
!         super();
!         setId(id);
!         if (faceDescriptor != null) {
!             setFaceDescriptor(faceDescriptor);
!         }
!     }
  
!     protected AbstractCommand(String id, Map faceDescriptors) {
!         super();
!         setId(id);
!         setFaceDescriptors(faceDescriptors);
!     }
  
!     public String getId() {
!         return this.id;
!     }
  
!     protected void setId(String id) {
!         if (!StringUtils.hasText(id)) {
!             id = null;
!         }
!         this.id = id;
!     }
  
!     public void setBeanName(String name) {
!         if (getId() == null) {
!             setId(name);
!         }
!     }
  
!     public void setFaceDescriptor(CommandFaceDescriptor faceDescriptor) {
!         setFaceDescriptor(getDefaultFaceDescriptorId(), faceDescriptor);
!     }
  
!     public void setFaceDescriptor(String faceDescriptorId,
!             CommandFaceDescriptor faceDescriptor) {
!         getButtonManager(faceDescriptorId).setFaceDescriptor(faceDescriptor);
!     }
  
!     public void setFaceDescriptors(Map faceDescriptors) {
!         Iterator it = faceDescriptors.entrySet().iterator();
!         while (it.hasNext()) {
!             Map.Entry entry = (Map.Entry)it.next();
!             String faceDescriptorId = (String)entry.getKey();
!             CommandFaceDescriptor faceDescriptor = (CommandFaceDescriptor)entry
!                     .getValue();
!             setFaceDescriptor(faceDescriptorId, faceDescriptor);
!         }
!     }
  
!     public String getDefaultFaceDescriptorId() {
!         if (!StringUtils.hasText(defaultFaceDescriptorId)) { return DEFAULT_FACE_DESCRIPTOR_ID; }
!         return defaultFaceDescriptorId;
!     }
  
!     public void setDefaultFaceDescriptorId(String defaultFaceDescriptorKey) {
!         this.defaultFaceDescriptorId = defaultFaceDescriptorKey;
!     }
  
!     protected CommandFaceDescriptor getFaceDescriptor() {
!         return getDefaultButtonManager().getFaceDescriptor();
!     }
  
!     public boolean isFaceConfigured() {
!         return getDefaultButtonManager().isFaceSet();
!     }
  
!     public String getText() {
!         if (isFaceConfigured()) { return getFaceDescriptor().getText(); }
!         return LabelInfoFactory.BLANK_BUTTON_LABEL.getText();
!     }
  
!     public int getMnemonic() {
!         if (isFaceConfigured()) { return getFaceDescriptor().getMnemonic(); }
!         return LabelInfoFactory.BLANK_BUTTON_LABEL.getMnemonic();
!     }
  
!     public int getMnemonicIndex() {
!         if (isFaceConfigured()) { return getFaceDescriptor().getMnemonicIndex(); }
!         return LabelInfoFactory.BLANK_BUTTON_LABEL.getMnemonicIndex();
!     }
  
!     public KeyStroke getAccelerator() {
!         if (isFaceConfigured()) { return getFaceDescriptor().getAccelerator(); }
!         return LabelInfoFactory.BLANK_BUTTON_LABEL.getAccelerator();
!     }
  
!     public void setLabel(String encodedLabel) {
!         getOrCreateFaceDescriptor().setButtonLabelInfo(encodedLabel);
!     }
  
!     public void setLabel(CommandButtonLabelInfo label) {
!         getOrCreateFaceDescriptor().setLabelInfo(label);
!     }
  
!     public void setCaption(String shortDescription) {
!         getOrCreateFaceDescriptor().setCaption(shortDescription);
!     }
  
!     public void setIcon(Icon icon) {
!         getOrCreateFaceDescriptor().setIcon(icon);
!     }
  
!     public void setIconInfo(CommandButtonIconInfo iconInfo) {
!         getOrCreateFaceDescriptor().setIconInfo(iconInfo);
!     }
  
!     private CommandFaceDescriptor getOrCreateFaceDescriptor() {
!         if (!isFaceConfigured()) {
!             if (logger.isInfoEnabled()) {
!                 logger
!                         .info("Lazily instantiating default face descriptor on behalf of caller to prevent npe; "
!                                 + "command is being configured manually, right?");
!             }
!             setFaceDescriptor(new CommandFaceDescriptor());
!         }
!         return getFaceDescriptor();
!     }
  
!     public void setCommandServices(CommandServices services) {
!         this.commandServices = services;
!     }
  
!     public CommandFaceDescriptorRegistry getFaceDescriptorRegistry() {
!         Assert.state(faceDescriptorRegistry != null,
!                 "The faceDescriptorRegistry property is not set");
!         return faceDescriptorRegistry;
!     }
  
!     public void setFaceDescriptorRegistry(
!             CommandFaceDescriptorRegistry faceDescriptorRegistry) {
!         this.faceDescriptorRegistry = faceDescriptorRegistry;
!     }
  
!     protected CommandServices getCommandServices() {
!         if (commandServices == null) { return DefaultCommandServices.instance(); }
!         return this.commandServices;
!     }
  
!     public void afterPropertiesSet() {
!         if (getId() == null) {
!             logger
!                     .info("Command "
!                             + this
!                             + " has no set id; note: anonymous commands cannot be used in registries.");
!         }
!         if (this instanceof ActionCommand && !isFaceConfigured()) {
!             logger
!                     .warn("The face descriptor property is not yet set for action command '"
!                             + getId()
!                             + "'; command won't render correctly until this is configured");
!         }
!     }
  
!     public boolean isEnabled() {
!         return this.enabled;
!     }
  
!     public void setEnabled(boolean enabled) {
!         if (hasChanged(this.enabled, enabled)) {
!             this.enabled = enabled;
!             Iterator it = buttonIterator();
!             while (it.hasNext()) {
!                 AbstractButton button = (AbstractButton)it.next();
!                 button.setEnabled(enabled);
!             }
!             firePropertyChange(ENABLED_PROPERTY_NAME, !enabled, enabled);
!         }
!     }
  
!     protected final Iterator buttonIterator() {
!         return getDefaultButtonManager().iterator();
!     }
  
!     public boolean isAnonymous() {
!         return id == null;
!     }
  
!     public boolean isVisible() {
!         return this.visible;
!     }
  
!     public void setVisible(boolean value) {
!         if (visible != value) {
!             this.visible = value;
!             for (Iterator it = buttonIterator(); it.hasNext();) {
!                 AbstractButton button = (AbstractButton)it.next();
!                 button.setVisible(visible);
!             }
!             firePropertyChange(VISIBLE_PROPERTY_NAME, !visible, visible);
!         }
!     }
  
!     public final AbstractButton createButton() {
!         return createButton(getDefaultFaceDescriptorId(), getButtonFactory(),
!                 getDefaultButtonConfigurer());
!     }
  
!     public final AbstractButton createButton(String faceDescriptorId) {
!         return createButton(faceDescriptorId, getButtonFactory(),
!                 getDefaultButtonConfigurer());
!     }
  
!     public final AbstractButton createButton(ButtonFactory buttonFactory) {
!         return createButton(getDefaultFaceDescriptorId(), buttonFactory,
!                 getDefaultButtonConfigurer());
!     }
  
!     public final AbstractButton createButton(String faceDescriptorId,
!             ButtonFactory buttonFactory) {
!         return createButton(faceDescriptorId, buttonFactory,
!                 getDefaultButtonConfigurer());
!     }
  
!     public final AbstractButton createButton(ButtonFactory buttonFactory,
!             CommandButtonConfigurer buttonConfigurer) {
!         return createButton(getDefaultFaceDescriptorId(), buttonFactory,
!                 buttonConfigurer);
!     }
  
!     public AbstractButton createButton(String faceDescriptorId,
!             ButtonFactory buttonFactory,
!             CommandButtonConfigurer buttonConfigurer) {
!         JButton button = buttonFactory.createButton();
!         attach(button, buttonConfigurer);
!         return button;
!     }
  
!     public final JMenuItem createMenuItem() {
!         return createMenuItem(getDefaultFaceDescriptorId(), getMenuFactory(),
!                 getMenuItemButtonConfigurer());
!     }
  
!     public final JMenuItem createMenuItem(String faceDescriptorId) {
!         return createMenuItem(faceDescriptorId, getMenuFactory(),
!                 getMenuItemButtonConfigurer());
!     }
  
!     public final JMenuItem createMenuItem(MenuFactory menuFactory) {
!         return createMenuItem(getDefaultFaceDescriptorId(), menuFactory,
!                 getMenuItemButtonConfigurer());
!     }
  
!     public final JMenuItem createMenuItem(String faceDescriptorId,
!             MenuFactory menuFactory) {
!         return createMenuItem(faceDescriptorId, menuFactory,
!                 getMenuItemButtonConfigurer());
!     }
  
!     public final JMenuItem createMenuItem(MenuFactory menuFactory,
!             CommandButtonConfigurer buttonConfigurer) {
!         return createMenuItem(getDefaultFaceDescriptorId(), menuFactory,
!                 buttonConfigurer);
!     }
  
!     public JMenuItem createMenuItem(String faceDescriptorId,
!             MenuFactory menuFactory, CommandButtonConfigurer buttonConfigurer) {
!         JMenuItem menuItem = menuFactory.createMenuItem();
!         attach(menuItem, buttonConfigurer);
!         return menuItem;
!     }
  
!     public void attach(AbstractButton button) {
!         attach(button, getDefaultFaceDescriptorId(), getCommandServices()
!                 .getDefaultButtonConfigurer());
!     }
  
!     public void attach(AbstractButton button, CommandButtonConfigurer configurer) {
!         attach(button, getDefaultFaceDescriptorId(), configurer);
!     }
  
!     public void attach(AbstractButton button, String faceDescriptorId,
!             CommandButtonConfigurer configurer) {
!         getButtonManager(faceDescriptorId).attachAndConfigure(button,
!                 configurer);
!         onButtonAttached(button);
!     }
  
!     protected void onButtonAttached(AbstractButton button) {
!         if (logger.isDebugEnabled()) {
!             logger.debug("Configuring newly attached button for command '"
!                     + getId() + "' enabled=" + isEnabled() + ", visible="
!                     + isVisible());
!         }
!         button.setEnabled(isEnabled());
!         button.setVisible(isVisible());
!     }
  
!     public void detach(AbstractButton button) {
!         if (getDefaultButtonManager().isAttachedTo(button)) {
!             getDefaultButtonManager().detach(button);
!             onButtonDetached();
!         }
!     }
  
!     public boolean isAttached(AbstractButton b) {
!         return getDefaultButtonManager().isAttachedTo(b);
!     }
  
!     protected void onButtonDetached() {
  
!     }
  
!     private CommandFaceButtonManager getDefaultButtonManager() {
!         return getButtonManager(getDefaultFaceDescriptorId());
!     }
  
!     private CommandFaceButtonManager getButtonManager(String faceDescriptorId) {
!         if (this.faceButtonManagers == null) {
!             this.faceButtonManagers = new CachingMapTemplate() {
!                 protected Object create(Object key) {
!                     return new CommandFaceButtonManager(AbstractCommand.this,
!                             (String)key);
!                 }
!             };
!         }
!         CommandFaceButtonManager m = (CommandFaceButtonManager)this.faceButtonManagers
!                 .get(faceDescriptorId);
!         return m;
!     }
  
!     protected CommandButtonConfigurer getDefaultButtonConfigurer() {
!         return getCommandServices().getDefaultButtonConfigurer();
!     }
  
!     protected CommandButtonConfigurer getToolBarButtonConfigurer() {
!         return getCommandServices().getToolBarButtonConfigurer();
!     }
  
!     protected CommandButtonConfigurer getMenuItemButtonConfigurer() {
!         return getCommandServices().getMenuItemButtonConfigurer();
!     }
  
!     protected ButtonFactory getButtonFactory() {
!         return getCommandServices().getButtonFactory();
!     }
  
!     protected MenuFactory getMenuFactory() {
!         return getCommandServices().getMenuFactory();
!     }
  
!     public boolean requestFocusIn(Container container) {
!         AbstractButton button = getButtonIn(container);
!         if (button != null) {
!             return button.requestFocusInWindow();
!         }
!         else {
!             return false;
!         }
!     }
  
!     public AbstractButton getButtonIn(Container container) {
!         Iterator it = buttonIterator();
!         while (it.hasNext()) {
!             AbstractButton button = (AbstractButton)it.next();
!             if (SwingUtilities.isDescendingFrom(button, container)) { return button; }
!         }
!         return null;
!     }
  
!     public String toString() {
!         return new ToStringCreator(this).append("id", getId()).append(
!                 "enabled", enabled).append("visible", visible).append(
!                 "defaultFaceDescriptorKey", defaultFaceDescriptorId)
!                 .toString();
!     }
  
  }
\ No newline at end of file
--- 42,436 ----
  import org.springframework.richclient.factory.LabelInfoFactory;
  import org.springframework.richclient.factory.MenuFactory;
  import org.springframework.util.CachingMapTemplate;
  import org.springframework.util.StringUtils;
  import org.springframework.util.ToStringCreator;
  
! public abstract class AbstractCommand extends AbstractPropertyChangePublisher implements InitializingBean,
! 		BeanNameAware, Guarded {
  
! 	public static final String ENABLED_PROPERTY_NAME = "enabled";
  
! 	public static final String VISIBLE_PROPERTY_NAME = "visible";
  
! 	private static final String DEFAULT_FACE_DESCRIPTOR_ID = "default";
  
! 	private String id;
  
! 	private String defaultFaceDescriptorId = DEFAULT_FACE_DESCRIPTOR_ID;
  
! 	private boolean enabled = true;
  
! 	private boolean visible = true;
  
! 	private Map faceButtonManagers;
  
! 	private CommandServices commandServices;
  
! 	private CommandFaceDescriptorRegistry faceDescriptorRegistry;
  
! 	private SwingPropertyChangeSupport pcs;
  
! 	protected AbstractCommand() {
! 	}
  
! 	protected AbstractCommand(String id) {
! 		this(id, (CommandFaceDescriptor)null);
! 	}
  
! 	protected AbstractCommand(String id, String encodedLabel) {
! 		this(id, new CommandFaceDescriptor(encodedLabel));
! 	}
  
! 	protected AbstractCommand(String id, String encodedLabel, Icon icon, String caption) {
! 		this(id, new CommandFaceDescriptor(encodedLabel, icon, caption));
! 	}
  
! 	protected AbstractCommand(String id, CommandFaceDescriptor faceDescriptor) {
! 		super();
! 		setId(id);
! 		if (faceDescriptor != null) {
! 			setFaceDescriptor(faceDescriptor);
! 		}
! 	}
  
! 	protected AbstractCommand(String id, Map faceDescriptors) {
! 		super();
! 		setId(id);
! 		setFaceDescriptors(faceDescriptors);
! 	}
  
! 	public String getId() {
! 		return this.id;
! 	}
  
! 	protected void setId(String id) {
! 		if (!StringUtils.hasText(id)) {
! 			id = null;
! 		}
! 		this.id = id;
! 	}
  
! 	public void setBeanName(String name) {
! 		if (getId() == null) {
! 			setId(name);
! 		}
! 	}
  
! 	public void setFaceDescriptor(CommandFaceDescriptor faceDescriptor) {
! 		setFaceDescriptor(getDefaultFaceDescriptorId(), faceDescriptor);
! 	}
  
! 	public void setFaceDescriptor(String faceDescriptorId, CommandFaceDescriptor faceDescriptor) {
! 		getButtonManager(faceDescriptorId).setFaceDescriptor(faceDescriptor);
! 	}
  
! 	public void setFaceDescriptors(Map faceDescriptors) {
! 		Iterator it = faceDescriptors.entrySet().iterator();
! 		while (it.hasNext()) {
! 			Map.Entry entry = (Map.Entry)it.next();
! 			String faceDescriptorId = (String)entry.getKey();
! 			CommandFaceDescriptor faceDescriptor = (CommandFaceDescriptor)entry.getValue();
! 			setFaceDescriptor(faceDescriptorId, faceDescriptor);
! 		}
! 	}
  
! 	public void setDefaultFaceDescriptorId(String defaultFaceDescriptorId) {
! 		this.defaultFaceDescriptorId = defaultFaceDescriptorId;
! 	}
  
! 	public void setFaceDescriptorRegistry(CommandFaceDescriptorRegistry faceDescriptorRegistry) {
! 		this.faceDescriptorRegistry = faceDescriptorRegistry;
! 	}
  
! 	public void setCommandServices(CommandServices services) {
! 		this.commandServices = services;
! 	}
  
! 	public void setLabel(String encodedLabel) {
! 		getOrCreateFaceDescriptor().setButtonLabelInfo(encodedLabel);
! 	}
  
! 	public void setLabel(CommandButtonLabelInfo label) {
! 		getOrCreateFaceDescriptor().setLabelInfo(label);
! 	}
  
! 	public void setCaption(String shortDescription) {
! 		getOrCreateFaceDescriptor().setCaption(shortDescription);
! 	}
  
! 	public void setIcon(Icon icon) {
! 		getOrCreateFaceDescriptor().setIcon(icon);
! 	}
  
! 	public void setIconInfo(CommandButtonIconInfo iconInfo) {
! 		getOrCreateFaceDescriptor().setIconInfo(iconInfo);
! 	}
  
! 	public void afterPropertiesSet() {
! 		if (getId() == null) {
! 			logger.info("Command " + this + " has no set id; note: anonymous commands cannot be used in registries.");
! 		}
! 		if (this instanceof ActionCommand && !isFaceConfigured()) {
! 			logger.warn("The face descriptor property is not yet set for action command '" + getId()
! 					+ "'; command won't render correctly until this is configured");
! 		}
! 	}
  
! 	private CommandFaceDescriptor getOrCreateFaceDescriptor() {
! 		if (!isFaceConfigured()) {
! 			if (logger.isInfoEnabled()) {
! 				logger.info("Lazily instantiating default face descriptor on behalf of caller to prevent npe; "
! 						+ "command is being configured manually, right?");
! 			}
! 			setFaceDescriptor(new CommandFaceDescriptor());
! 		}
! 		return getFaceDescriptor();
! 	}
  
! 	public String getDefaultFaceDescriptorId() {
! 		if (!StringUtils.hasText(defaultFaceDescriptorId)) {
! 			return DEFAULT_FACE_DESCRIPTOR_ID;
! 		}
! 		return defaultFaceDescriptorId;
! 	}
  
! 	protected CommandFaceDescriptor getFaceDescriptor() {
! 		return getDefaultButtonManager().getFaceDescriptor();
! 	}
  
! 	public boolean isFaceConfigured() {
! 		return getDefaultButtonManager().isFaceConfigured();
! 	}
  
! 	public String getText() {
! 		if (isFaceConfigured()) {
! 			return getFaceDescriptor().getText();
! 		}
! 		return LabelInfoFactory.BLANK_BUTTON_LABEL.getText();
! 	}
  
! 	public int getMnemonic() {
! 		if (isFaceConfigured()) {
! 			return getFaceDescriptor().getMnemonic();
! 		}
! 		return LabelInfoFactory.BLANK_BUTTON_LABEL.getMnemonic();
! 	}
  
! 	public int getMnemonicIndex() {
! 		if (isFaceConfigured()) {
! 			return getFaceDescriptor().getMnemonicIndex();
! 		}
! 		return LabelInfoFactory.BLANK_BUTTON_LABEL.getMnemonicIndex();
! 	}
  
! 	public KeyStroke getAccelerator() {
! 		if (isFaceConfigured()) {
! 			return getFaceDescriptor().getAccelerator();
! 		}
! 		return LabelInfoFactory.BLANK_BUTTON_LABEL.getAccelerator();
! 	}
  
! 	public CommandFaceDescriptorRegistry getFaceDescriptorRegistry() {
! 		return faceDescriptorRegistry;
! 	}
  
! 	protected CommandServices getCommandServices() {
! 		if (commandServices == null) {
! 			return DefaultCommandServices.instance();
! 		}
! 		return this.commandServices;
! 	}
  
! 	public boolean isEnabled() {
! 		return this.enabled;
! 	}
  
! 	public void setEnabled(boolean enabled) {
! 		if (hasChanged(this.enabled, enabled)) {
! 			this.enabled = enabled;
! 			Iterator it = buttonIterator();
! 			while (it.hasNext()) {
! 				AbstractButton button = (AbstractButton)it.next();
! 				button.setEnabled(enabled);
! 			}
! 			firePropertyChange(ENABLED_PROPERTY_NAME, !enabled, enabled);
! 		}
! 	}
  
! 	protected final Iterator buttonIterator() {
! 		return getDefaultButtonManager().iterator();
! 	}
  
! 	public boolean isAnonymous() {
! 		return id == null;
! 	}
  
! 	public boolean isVisible() {
! 		return this.visible;
! 	}
  
! 	public void setVisible(boolean value) {
! 		if (visible != value) {
! 			this.visible = value;
! 			for (Iterator it = buttonIterator(); it.hasNext();) {
! 				AbstractButton button = (AbstractButton)it.next();
! 				button.setVisible(visible);
! 			}
! 			firePropertyChange(VISIBLE_PROPERTY_NAME, !visible, visible);
! 		}
! 	}
  
! 	public final AbstractButton createButton() {
! 		return createButton(getDefaultFaceDescriptorId(), getButtonFactory(), getDefaultButtonConfigurer());
! 	}
  
! 	public final AbstractButton createButton(String faceDescriptorId) {
! 		return createButton(faceDescriptorId, getButtonFactory(), getDefaultButtonConfigurer());
! 	}
  
! 	public final AbstractButton createButton(ButtonFactory buttonFactory) {
! 		return createButton(getDefaultFaceDescriptorId(), buttonFactory, getDefaultButtonConfigurer());
! 	}
  
! 	public final AbstractButton createButton(String faceDescriptorId, ButtonFactory buttonFactory) {
! 		return createButton(faceDescriptorId, buttonFactory, getDefaultButtonConfigurer());
! 	}
  
! 	public final AbstractButton createButton(ButtonFactory buttonFactory, CommandButtonConfigurer buttonConfigurer) {
! 		return createButton(getDefaultFaceDescriptorId(), buttonFactory, buttonConfigurer);
! 	}
  
! 	public AbstractButton createButton(String faceDescriptorId, ButtonFactory buttonFactory,
! 			CommandButtonConfigurer buttonConfigurer) {
! 		JButton button = buttonFactory.createButton();
! 		attach(button, buttonConfigurer);
! 		return button;
! 	}
  
! 	public final JMenuItem createMenuItem() {
! 		return createMenuItem(getDefaultFaceDescriptorId(), getMenuFactory(), getMenuItemButtonConfigurer());
! 	}
  
! 	public final JMenuItem createMenuItem(String faceDescriptorId) {
! 		return createMenuItem(faceDescriptorId, getMenuFactory(), getMenuItemButtonConfigurer());
! 	}
  
! 	public final JMenuItem createMenuItem(MenuFactory menuFactory) {
! 		return createMenuItem(getDefaultFaceDescriptorId(), menuFactory, getMenuItemButtonConfigurer());
! 	}
  
! 	public final JMenuItem createMenuItem(String faceDescriptorId, MenuFactory menuFactory) {
! 		return createMenuItem(faceDescriptorId, menuFactory, getMenuItemButtonConfigurer());
! 	}
  
! 	public final JMenuItem createMenuItem(MenuFactory menuFactory, CommandButtonConfigurer buttonConfigurer) {
! 		return createMenuItem(getDefaultFaceDescriptorId(), menuFactory, buttonConfigurer);
! 	}
  
! 	public JMenuItem createMenuItem(String faceDescriptorId, MenuFactory menuFactory,
! 			CommandButtonConfigurer buttonConfigurer) {
! 		JMenuItem menuItem = menuFactory.createMenuItem();
! 		attach(menuItem, buttonConfigurer);
! 		return menuItem;
! 	}
  
! 	public void attach(AbstractButton button) {
! 		attach(button, getDefaultFaceDescriptorId(), getCommandServices().getDefaultButtonConfigurer());
! 	}
  
! 	public void attach(AbstractButton button, CommandButtonConfigurer configurer) {
! 		attach(button, getDefaultFaceDescriptorId(), configurer);
! 	}
  
! 	public void attach(AbstractButton button, String faceDescriptorId, CommandButtonConfigurer configurer) {
! 		getButtonManager(faceDescriptorId).attachAndConfigure(button, configurer);
! 		onButtonAttached(button);
! 	}
  
! 	protected void onButtonAttached(AbstractButton button) {
! 		if (logger.isDebugEnabled()) {
! 			logger.debug("Configuring newly attached button for command '" + getId() + "' enabled=" + isEnabled()
! 					+ ", visible=" + isVisible());
! 		}
! 		button.setEnabled(isEnabled());
! 		button.setVisible(isVisible());
! 	}
  
! 	public void detach(AbstractButton button) {
! 		if (getDefaultButtonManager().isAttachedTo(button)) {
! 			getDefaultButtonManager().detach(button);
! 			onButtonDetached();
! 		}
! 	}
  
! 	public boolean isAttached(AbstractButton b) {
! 		return getDefaultButtonManager().isAttachedTo(b);
! 	}
  
! 	protected void onButtonDetached() {
! 		// default no op, subclasses may override
! 	}
  
! 	private CommandFaceButtonManager getDefaultButtonManager() {
! 		return getButtonManager(getDefaultFaceDescriptorId());
! 	}
  
! 	private CommandFaceButtonManager getButtonManager(String faceDescriptorId) {
! 		if (this.faceButtonManagers == null) {
! 			this.faceButtonManagers = new CachingMapTemplate() {
! 				protected Object create(Object key) {
! 					return new CommandFaceButtonManager(AbstractCommand.this, (String)key);
! 				}
! 			};
! 		}
! 		CommandFaceButtonManager m = (CommandFaceButtonManager)this.faceButtonManagers.get(faceDescriptorId);
! 		return m;
! 	}
  
! 	protected CommandButtonConfigurer getDefaultButtonConfigurer() {
! 		return getCommandServices().getDefaultButtonConfigurer();
! 	}
  
! 	protected CommandButtonConfigurer getToolBarButtonConfigurer() {
! 		return getCommandServices().getToolBarButtonConfigurer();
! 	}
  
! 	protected CommandButtonConfigurer getMenuItemButtonConfigurer() {
! 		return getCommandServices().getMenuItemButtonConfigurer();
! 	}
  
! 	protected ButtonFactory getButtonFactory() {
! 		return getCommandServices().getButtonFactory();
! 	}
  
! 	protected MenuFactory getMenuFactory() {
! 		return getCommandServices().getMenuFactory();
! 	}
  
! 	public boolean requestFocusIn(Container container) {
! 		AbstractButton button = getButtonIn(container);
! 		if (button != null) {
! 			return button.requestFocusInWindow();
! 		}
! 		else {
! 			return false;
! 		}
! 	}
  
! 	public AbstractButton getButtonIn(Container container) {
! 		Iterator it = buttonIterator();
! 		while (it.hasNext()) {
! 			AbstractButton button = (AbstractButton)it.next();
! 			if (SwingUtilities.isDescendingFrom(button, container)) {
! 				return button;
! 			}
! 		}
! 		return null;
! 	}
  
! 	public String toString() {
! 		return new ToStringCreator(this).append("id", getId()).append("enabled", enabled).append("visible", visible)
! 				.append("defaultFaceDescriptorId", defaultFaceDescriptorId).toString();
! 	}
  
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13101/src/org/springframework/richclient/command/support

Modified Files:
	DefaultCommandServices.java DefaultCommandManager.java 
Log Message:
command polishing per david's requests (JIDE software lead!)

Index: DefaultCommandServices.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support/DefaultCommandServices.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DefaultCommandServices.java	19 Oct 2004 13:17:46 -0000	1.3
--- DefaultCommandServices.java	28 Oct 2004 06:12:43 -0000	1.4
***************
*** 32,35 ****
--- 32,36 ----
  import org.springframework.richclient.factory.MenuFactory;
  import org.springframework.richclient.image.ArrowIcon;
+ import org.springframework.util.Assert;
  
  /**
***************
*** 38,135 ****
  public class DefaultCommandServices implements CommandServices {
  
!     private static final CommandServices INSTANCE = new DefaultCommandServices();
  
!     private static final ArrowIcon PULL_DOWN_ICON = new ArrowIcon(
!             ArrowIcon.Direction.DOWN, 3, SystemColor.BLACK);
  
!     private ButtonFactory buttonFactory = new DefaultButtonFactory();
  
!     private MenuFactory menuFactory = new DefaultMenuFactory();
  
!     private CommandButtonConfigurer defaultButtonConfigurer = new DefaultButtonConfigurer();
  
!     private CommandButtonConfigurer toolBarButtonConfigurer = new DefaultButtonConfigurer() {
!         public void configure(AbstractButton button, AbstractCommand command,
!                 CommandFaceDescriptor faceDescriptor) {
!             super.configure(button, command, faceDescriptor);
!             if (button.getIcon() != null) {
!                 button.setText("");
!             }
!             button.setMargin(new Insets(2, 5, 2, 5));
!         }
!     };
  
!     private CommandButtonConfigurer menuItemButtonConfigurer = new DefaultButtonConfigurer() {
!         public void configure(AbstractButton button, AbstractCommand command,
!                 CommandFaceDescriptor faceDescriptor) {
!             super.configure(button, command, faceDescriptor);
!             button.setToolTipText(null);
!         }
!     };
  
!     private CommandButtonConfigurer pullDownMenuButtonConfigurer = new DefaultButtonConfigurer() {
!         public void configure(AbstractButton button, AbstractCommand command,
!                 CommandFaceDescriptor faceDescriptor) {
!             super.configure(button, command, faceDescriptor);
!             button.setIcon(PULL_DOWN_ICON);
!             button.setHorizontalTextPosition(SwingConstants.LEADING);
!         }
!     };
  
!     public static final CommandServices instance() {
!         return INSTANCE;
!     }
  
!     public void setButtonFactory(ButtonFactory buttonFactory) {
!         this.buttonFactory = buttonFactory;
!     }
  
!     public void setMenuFactory(MenuFactory menuFactory) {
!         this.menuFactory = menuFactory;
!     }
  
!     public void setDefaultButtonConfigurer(
!             CommandButtonConfigurer defaultButtonConfigurer) {
!         this.defaultButtonConfigurer = defaultButtonConfigurer;
!     }
  
!     public void setToolBarButtonConfigurer(
!             CommandButtonConfigurer toolBarButtonConfigurer) {
!         this.toolBarButtonConfigurer = toolBarButtonConfigurer;
!     }
  
!     public void setMenuItemButtonConfigurer(
!             CommandButtonConfigurer menuItemButtonConfigurer) {
!         this.menuItemButtonConfigurer = menuItemButtonConfigurer;
!     }
  
!     public void setPullDownMenuButtonConfigurer(
!             CommandButtonConfigurer pullDownMenuButtonConfigurer) {
!         this.pullDownMenuButtonConfigurer = pullDownMenuButtonConfigurer;
!     }
  
!     public ButtonFactory getButtonFactory() {
!         return buttonFactory;
!     }
  
!     public MenuFactory getMenuFactory() {
!         return menuFactory;
!     }
  
!     public CommandButtonConfigurer getDefaultButtonConfigurer() {
!         return defaultButtonConfigurer;
!     }
  
!     public CommandButtonConfigurer getToolBarButtonConfigurer() {
!         return toolBarButtonConfigurer;
!     }
  
!     public CommandButtonConfigurer getMenuItemButtonConfigurer() {
!         return menuItemButtonConfigurer;
!     }
  
!     public CommandButtonConfigurer getPullDownMenuButtonConfigurer() {
!         return pullDownMenuButtonConfigurer;
!     }
  
  }
\ No newline at end of file
--- 39,161 ----
  public class DefaultCommandServices implements CommandServices {
  
! 	private static DefaultCommandServices INSTANCE = new DefaultCommandServices();
  
! 	private static final ArrowIcon PULL_DOWN_ICON = new ArrowIcon(ArrowIcon.Direction.DOWN, 3, SystemColor.BLACK);
  
! 	private ButtonFactory buttonFactory = DefaultButtonFactory.instance();
  
! 	private MenuFactory menuFactory = DefaultMenuFactory.instance();
  
! 	private CommandButtonConfigurer defaultButtonConfigurer;
  
! 	private CommandButtonConfigurer toolBarButtonConfigurer;
  
! 	private CommandButtonConfigurer menuItemButtonConfigurer;
  
! 	private CommandButtonConfigurer pullDownMenuButtonConfigurer;
  
! 	public static DefaultCommandServices instance() {
! 		return INSTANCE;
! 	}
  
! 	public static void load(DefaultCommandServices instance) {
! 		Assert.notNull(instance, "The sole default command services instance is required");
! 		INSTANCE = instance;
! 	}
  
! 	public void setButtonFactory(ButtonFactory buttonFactory) {
! 		this.buttonFactory = buttonFactory;
! 	}
  
! 	public void setMenuFactory(MenuFactory menuFactory) {
! 		this.menuFactory = menuFactory;
! 	}
  
! 	public void setDefaultButtonConfigurer(CommandButtonConfigurer defaultButtonConfigurer) {
! 		this.defaultButtonConfigurer = defaultButtonConfigurer;
! 	}
  
! 	public void setToolBarButtonConfigurer(CommandButtonConfigurer toolBarButtonConfigurer) {
! 		this.toolBarButtonConfigurer = toolBarButtonConfigurer;
! 	}
  
! 	public void setMenuItemButtonConfigurer(CommandButtonConfigurer menuItemButtonConfigurer) {
! 		this.menuItemButtonConfigurer = menuItemButtonConfigurer;
! 	}
  
! 	public void setPullDownMenuButtonConfigurer(CommandButtonConfigurer pullDownMenuButtonConfigurer) {
! 		this.pullDownMenuButtonConfigurer = pullDownMenuButtonConfigurer;
! 	}
  
! 	public ButtonFactory getButtonFactory() {
! 		return buttonFactory;
! 	}
  
! 	public MenuFactory getMenuFactory() {
! 		return menuFactory;
! 	}
  
! 	public CommandButtonConfigurer getDefaultButtonConfigurer() {
! 		if (defaultButtonConfigurer == null) {
! 			defaultButtonConfigurer = createDefaultButtonConfigurer();
! 		}
! 		return defaultButtonConfigurer;
! 	}
  
! 	public CommandButtonConfigurer getToolBarButtonConfigurer() {
! 		if (toolBarButtonConfigurer == null) {
! 			toolBarButtonConfigurer = createToolBarButtonConfigurer();
! 		}
! 		return toolBarButtonConfigurer;
! 	}
  
! 	public CommandButtonConfigurer getMenuItemButtonConfigurer() {
! 		if (menuItemButtonConfigurer == null) {
! 			menuItemButtonConfigurer = createMenuItemButtonConfigurer();
! 		}
! 		return menuItemButtonConfigurer;
! 	}
! 
! 	public CommandButtonConfigurer getPullDownMenuButtonConfigurer() {
! 		if (pullDownMenuButtonConfigurer == null) {
! 			pullDownMenuButtonConfigurer = createPullDownMenuButtonConfigurer();
! 		}
! 		return pullDownMenuButtonConfigurer;
! 	}
! 
! 	protected CommandButtonConfigurer createDefaultButtonConfigurer() {
! 		return new DefaultButtonConfigurer();
! 	}
! 
! 	protected CommandButtonConfigurer createToolBarButtonConfigurer() {
! 		return new DefaultButtonConfigurer() {
! 			public void configure(AbstractButton button, AbstractCommand command, CommandFaceDescriptor faceDescriptor) {
! 				super.configure(button, command, faceDescriptor);
! 				if (button.getIcon() != null) {
! 					button.setText("");
! 				}
! 				button.setMargin(new Insets(2, 5, 2, 5));
! 			}
! 		};
! 	}
! 
! 	protected CommandButtonConfigurer createMenuItemButtonConfigurer() {
! 		return new DefaultButtonConfigurer() {
! 			public void configure(AbstractButton button, AbstractCommand command, CommandFaceDescriptor faceDescriptor) {
! 				super.configure(button, command, faceDescriptor);
! 				button.setToolTipText(null);
! 			}
! 		};
! 	}
! 
! 	protected CommandButtonConfigurer createPullDownMenuButtonConfigurer() {
! 		return new DefaultButtonConfigurer() {
! 			public void configure(AbstractButton button, AbstractCommand command, CommandFaceDescriptor faceDescriptor) {
! 				super.configure(button, command, faceDescriptor);
! 				button.setIcon(PULL_DOWN_ICON);
! 				button.setHorizontalTextPosition(SwingConstants.LEADING);
! 			}
! 		};
! 	}
  
  }
\ No newline at end of file

Index: DefaultCommandManager.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/support/DefaultCommandManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DefaultCommandManager.java	20 Oct 2004 21:43:16 -0000	1.7
--- DefaultCommandManager.java	28 Oct 2004 06:12:43 -0000	1.8
***************
*** 29,32 ****
--- 29,33 ----
  import org.springframework.richclient.command.CommandRegistry;
  import org.springframework.richclient.command.CommandRegistryListener;
+ import org.springframework.richclient.command.CommandServices;
  import org.springframework.richclient.command.ExclusiveCommandGroup;
  import org.springframework.richclient.command.TargetableActionCommand;
***************
*** 43,267 ****
   */
  public class DefaultCommandManager implements CommandManager, BeanPostProcessor {
!     private final Log logger = LogFactory.getLog(getClass());
! 
!     private DefaultCommandRegistry commandRegistry = new DefaultCommandRegistry();
! 
!     private ButtonFactory buttonFactory;
! 
!     private MenuFactory menuFactory;
! 
!     private CommandConfigurer commandConfigurer = new ApplicationCommandConfigurer(
!             this);
! 
!     private CommandButtonConfigurer defaultButtonConfigurer;
! 
!     private CommandButtonConfigurer toolBarButtonConfigurer;
  
!     private CommandButtonConfigurer menuItemButtonConfigurer;
  
!     private CommandButtonConfigurer pullDownMenuButtonConfigurer;
  
!     public DefaultCommandManager() {
!         this(null);
!     }
  
!     public DefaultCommandManager(CommandRegistry parent) {
!         setParent(parent);
!     }
  
!     public void setParent(CommandRegistry parent) {
!         this.commandRegistry.setParent(parent);
!     }
  
!     public void setButtonFactory(ButtonFactory buttonFactory) {
!         this.buttonFactory = buttonFactory;
!     }
  
!     public void setMenuFactory(MenuFactory menuFactory) {
!         this.menuFactory = menuFactory;
!     }
  
!     public ButtonFactory getButtonFactory() {
!         if (buttonFactory == null) { return DefaultCommandServices.instance()
!                 .getButtonFactory(); }
!         return buttonFactory;
!     }
  
!     public MenuFactory getMenuFactory() {
!         if (menuFactory == null) { return DefaultCommandServices.instance()
!                 .getMenuFactory(); }
!         return menuFactory;
!     }
  
!     public CommandFaceDescriptor getFaceDescriptor(AbstractCommand command,
!             String faceDescriptorKey) {
!         return null;
!     }
  
!     public void setToolBarButtonConfigurer(CommandButtonConfigurer configurer) {
!         this.toolBarButtonConfigurer = configurer;
!     }
  
!     public void setMenuItemButtonConfigurer(CommandButtonConfigurer configurer) {
!         this.menuItemButtonConfigurer = configurer;
!     }
  
!     public CommandButtonConfigurer getDefaultButtonConfigurer() {
!         return DefaultCommandServices.instance().getDefaultButtonConfigurer();
!     }
  
!     public CommandButtonConfigurer getToolBarButtonConfigurer() {
!         if (toolBarButtonConfigurer == null) { return DefaultCommandServices
!                 .instance().getToolBarButtonConfigurer(); }
!         return toolBarButtonConfigurer;
!     }
  
!     public CommandButtonConfigurer getMenuItemButtonConfigurer() {
!         if (menuItemButtonConfigurer == null) { return DefaultCommandServices
!                 .instance().getMenuItemButtonConfigurer(); }
!         return menuItemButtonConfigurer;
!     }
  
!     public CommandButtonConfigurer getPullDownMenuButtonConfigurer() {
!         if (pullDownMenuButtonConfigurer == null) { return DefaultCommandServices
!                 .instance().getPullDownMenuButtonConfigurer(); }
!         return pullDownMenuButtonConfigurer;
!     }
  
!     public ActionCommand getActionCommand(String commandId) {
!         return commandRegistry.getActionCommand(commandId);
!     }
  
!     public CommandGroup getCommandGroup(String groupId) {
!         return commandRegistry.getCommandGroup(groupId);
!     }
  
!     public boolean containsCommandGroup(String groupId) {
!         return commandRegistry.containsCommandGroup(groupId);
!     }
  
!     public boolean containsActionCommand(String commandId) {
!         return commandRegistry.containsActionCommand(commandId);
!     }
  
!     /**
!      * Adds a new command to this manager's registry; also configures the
!      * command on behalf of the caller.
!      * 
!      * @param command
!      *            the new command to be configured and registered
!      */
!     public void addNewCommand(AbstractCommand command) {
!         addNewCommand(command, command.getId());
!     }
  
!     /**
!      * Adds a new command to this manager's registry; also configures the
!      * command on behalf of the caller. Configures the command's face (visual
!      * appearance) using the provided face configuration key, which delegates to
!      * a configured ObjectConfigurer.
!      * 
!      * @param command
!      * @param faceDescriptorKey
!      */
!     public void addNewCommand(AbstractCommand command, String faceDescriptorKey) {
!         if (logger.isDebugEnabled()) {
!             logger.debug("Configuring and adding new command '"
!                     + command.getId() + "'");
!         }
!         configure(command, faceDescriptorKey);
!         registerCommand(command);
!     }
  
!     public void addCommandInterceptor(String commandId,
!             ActionCommandInterceptor interceptor) {
!         getActionCommand(commandId).addCommandInterceptor(interceptor);
!     }
  
!     public void removeCommandInterceptor(String commandId,
!             ActionCommandInterceptor interceptor) {
!         getActionCommand(commandId).removeCommandInterceptor(interceptor);
!     }
  
!     public void registerCommand(AbstractCommand command) {
!         commandRegistry.registerCommand(command);
!     }
  
!     public void setTargetableActionCommandExecutor(String commandId,
!             ActionCommandExecutor executor) {
!         commandRegistry.setTargetableActionCommandExecutor(commandId, executor);
!     }
  
!     public void addCommandRegistryListener(CommandRegistryListener l) {
!         this.commandRegistry.addCommandRegistryListener(l);
!     }
  
!     public void removeCommandRegistryListener(CommandRegistryListener l) {
!         this.commandRegistry.removeCommandRegistryListener(l);
!     }
  
!     public TargetableActionCommand createTargetableActionCommand(
!             String commandId, ActionCommandExecutor delegate) {
!         Assert.notNull(commandId,
!                 "Registered targetable action commands must have an id.");
!         TargetableActionCommand newCommand = new TargetableActionCommand(
!                 commandId, delegate);
!         configure(newCommand);
!         registerCommand(newCommand);
!         return newCommand;
!     }
  
!     public CommandGroup createCommandGroup(String groupId, Object[] members) {
!         Assert.notNull(groupId, "Registered command groups must have an id.");
!         CommandGroup newGroup = new CommandGroupFactoryBean(groupId,
!                 this.commandRegistry, this, members).getCommandGroup();
!         addNewCommand(newGroup);
!         return newGroup;
!     }
  
!     public ExclusiveCommandGroup createExclusiveCommandGroup(String groupId,
!             Object[] members) {
!         Assert.notNull(groupId,
!                 "Registered exclusive command groups must have an id.");
!         CommandGroupFactoryBean newGroupFactory = new CommandGroupFactoryBean(
!                 groupId, this.commandRegistry, this, members);
!         newGroupFactory.setExclusive(true);
!         addNewCommand(newGroupFactory.getCommandGroup());
!         return (ExclusiveCommandGroup)newGroupFactory.getCommandGroup();
!     }
  
!     public AbstractCommand configure(AbstractCommand command) {
!         return commandConfigurer.configure(command);
!     }
  
!     public AbstractCommand configure(AbstractCommand command,
!             String faceDescriptorKey) {
!         return commandConfigurer.configure(command, faceDescriptorKey);
!     }
  
!     public Object postProcessAfterInitialization(Object bean, String beanName)
!             throws BeansException {
!         if (bean instanceof CommandGroupFactoryBean) {
!             CommandGroupFactoryBean factory = (CommandGroupFactoryBean)bean;
!             CommandGroup group = factory.getCommandGroup();
!             addNewCommand(group);
!         }
!         else if (bean instanceof AbstractCommand) {
!             registerCommand((AbstractCommand)bean);
!         }
!         return bean;
!     }
  
!     public Object postProcessBeforeInitialization(Object bean, String beanName)
!             throws BeansException {
!         if (bean instanceof CommandGroupFactoryBean) {
!             CommandGroupFactoryBean factory = (CommandGroupFactoryBean)bean;
!             factory.setCommandRegistry(commandRegistry);
!         }
!         else if (bean instanceof AbstractCommand) {
!             configure((AbstractCommand)bean);
!         }
!         return bean;
!     }
  
  }
\ No newline at end of file
--- 44,226 ----
   */
  public class DefaultCommandManager implements CommandManager, BeanPostProcessor {
! 	private final Log logger = LogFactory.getLog(getClass());
  
! 	private DefaultCommandRegistry commandRegistry = new DefaultCommandRegistry();
  
! 	private CommandServices commandServices = DefaultCommandServices.instance();
  
! 	private CommandConfigurer commandConfigurer = new ApplicationCommandConfigurer(this);
  
! 	public DefaultCommandManager() {
  
! 	}
  
! 	public DefaultCommandManager(CommandRegistry parent) {
! 		setParent(parent);
! 	}
  
! 	public DefaultCommandManager(CommandServices commandServices) {
! 		setCommandServices(commandServices);
! 	}
  
! 	public void setCommandServices(CommandServices commandServices) {
! 		Assert.notNull(commandServices, "A command services implementation is required");
! 		this.commandServices = commandServices;
! 	}
  
! 	public void setParent(CommandRegistry parent) {
! 		commandRegistry.setParent(parent);
! 	}
  
! 	public ButtonFactory getButtonFactory() {
! 		return commandServices.getButtonFactory();
! 	}
  
! 	public MenuFactory getMenuFactory() {
! 		return commandServices.getMenuFactory();
! 	}
  
! 	public CommandButtonConfigurer getDefaultButtonConfigurer() {
! 		return commandServices.getDefaultButtonConfigurer();
! 	}
  
! 	public CommandButtonConfigurer getToolBarButtonConfigurer() {
! 		return commandServices.getToolBarButtonConfigurer();
! 	}
  
! 	public CommandButtonConfigurer getMenuItemButtonConfigurer() {
! 		return commandServices.getMenuItemButtonConfigurer();
! 	}
  
! 	public CommandButtonConfigurer getPullDownMenuButtonConfigurer() {
! 		return commandServices.getPullDownMenuButtonConfigurer();
! 	}
  
! 	public CommandFaceDescriptor getFaceDescriptor(AbstractCommand command, String faceDescriptorKey) {
! 		// TODO
! 		return null;
! 	}
  
! 	public ActionCommand getActionCommand(String commandId) {
! 		return commandRegistry.getActionCommand(commandId);
! 	}
  
! 	public CommandGroup getCommandGroup(String groupId) {
! 		return commandRegistry.getCommandGroup(groupId);
! 	}
  
! 	public boolean containsCommandGroup(String groupId) {
! 		return commandRegistry.containsCommandGroup(groupId);
! 	}
  
! 	public boolean containsActionCommand(String commandId) {
! 		return commandRegistry.containsActionCommand(commandId);
! 	}
  
! 	/**
! 	 * Adds a new command to this manager's registry; also configures the
! 	 * command on behalf of the caller.
! 	 * 
! 	 * @param command
! 	 *            the new command to be configured and registered
! 	 */
! 	public void addNewCommand(AbstractCommand command) {
! 		addNewCommand(command, command.getId());
! 	}
  
! 	/**
! 	 * Adds a new command to this manager's registry; also configures the
! 	 * command on behalf of the caller. Configures the command's face (visual
! 	 * appearance) using the provided face configuration key, which delegates to
! 	 * a configured ObjectConfigurer.
! 	 * 
! 	 * @param command
! 	 * @param faceDescriptorKey
! 	 */
! 	public void addNewCommand(AbstractCommand command, String faceDescriptorKey) {
! 		if (logger.isDebugEnabled()) {
! 			logger.debug("Configuring and adding new command '" + command.getId() + "'");
! 		}
! 		configure(command, faceDescriptorKey);
! 		registerCommand(command);
! 	}
  
! 	public void addCommandInterceptor(String commandId, ActionCommandInterceptor interceptor) {
! 		getActionCommand(commandId).addCommandInterceptor(interceptor);
! 	}
  
! 	public void removeCommandInterceptor(String commandId, ActionCommandInterceptor interceptor) {
! 		getActionCommand(commandId).removeCommandInterceptor(interceptor);
! 	}
  
! 	public void registerCommand(AbstractCommand command) {
! 		commandRegistry.registerCommand(command);
! 	}
  
! 	public void setTargetableActionCommandExecutor(String commandId, ActionCommandExecutor executor) {
! 		commandRegistry.setTargetableActionCommandExecutor(commandId, executor);
! 	}
  
! 	public void addCommandRegistryListener(CommandRegistryListener l) {
! 		this.commandRegistry.addCommandRegistryListener(l);
! 	}
  
! 	public void removeCommandRegistryListener(CommandRegistryListener l) {
! 		this.commandRegistry.removeCommandRegistryListener(l);
! 	}
  
! 	public TargetableActionCommand createTargetableActionCommand(String commandId, ActionCommandExecutor delegate) {
! 		Assert.notNull(commandId, "Registered targetable action commands must have an id.");
! 		TargetableActionCommand newCommand = new TargetableActionCommand(commandId, delegate);
! 		configure(newCommand);
! 		registerCommand(newCommand);
! 		return newCommand;
! 	}
  
! 	public CommandGroup createCommandGroup(String groupId, Object[] members) {
! 		Assert.notNull(groupId, "Registered command groups must have an id.");
! 		CommandGroup newGroup = new CommandGroupFactoryBean(groupId, this.commandRegistry, this, members).getCommandGroup();
! 		addNewCommand(newGroup);
! 		return newGroup;
! 	}
  
! 	public ExclusiveCommandGroup createExclusiveCommandGroup(String groupId, Object[] members) {
! 		Assert.notNull(groupId, "Registered exclusive command groups must have an id.");
! 		CommandGroupFactoryBean newGroupFactory = new CommandGroupFactoryBean(groupId, this.commandRegistry, this, members);
! 		newGroupFactory.setExclusive(true);
! 		addNewCommand(newGroupFactory.getCommandGroup());
! 		return (ExclusiveCommandGroup)newGroupFactory.getCommandGroup();
! 	}
  
! 	public AbstractCommand configure(AbstractCommand command) {
! 		return commandConfigurer.configure(command);
! 	}
  
! 	public AbstractCommand configure(AbstractCommand command, String faceDescriptorKey) {
! 		return commandConfigurer.configure(command, faceDescriptorKey);
! 	}
  
! 	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
! 		if (bean instanceof CommandGroupFactoryBean) {
! 			CommandGroupFactoryBean factory = (CommandGroupFactoryBean)bean;
! 			CommandGroup group = factory.getCommandGroup();
! 			addNewCommand(group);
! 		}
! 		else if (bean instanceof AbstractCommand) {
! 			registerCommand((AbstractCommand)bean);
! 		}
! 		return bean;
! 	}
  
! 	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
! 		if (bean instanceof CommandGroupFactoryBean) {
! 			CommandGroupFactoryBean factory = (CommandGroupFactoryBean)bean;
! 			factory.setCommandRegistry(commandRegistry);
! 		}
! 		else if (bean instanceof AbstractCommand) {
! 			configure((AbstractCommand)bean);
! 		}
! 		return bean;
! 	}
  
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/application/support
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13101/src/org/springframework/richclient/application/support

Modified Files:
	ApplicationWindowCommandManager.java 
	DefaultApplicationWindow.java 
Log Message:
command polishing per david's requests (JIDE software lead!)

Index: ApplicationWindowCommandManager.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/application/support/ApplicationWindowCommandManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ApplicationWindowCommandManager.java	20 Oct 2004 21:43:15 -0000	1.1
--- ApplicationWindowCommandManager.java	28 Oct 2004 06:12:42 -0000	1.2
***************
*** 14,48 ****
  import org.springframework.richclient.command.ActionCommand;
  import org.springframework.richclient.command.CommandRegistry;
  import org.springframework.richclient.command.support.DefaultCommandManager;
  
  public class ApplicationWindowCommandManager extends DefaultCommandManager {
!     private List sharedCommands;
  
!     public ApplicationWindowCommandManager() {
!         super();
!     }
  
!     public ApplicationWindowCommandManager(CommandRegistry parent) {
!         super(parent);
!     }
  
!     public void setSharedCommandIds(String[] sharedCommandIds) {
!         if (sharedCommandIds.length == 0) {
!             sharedCommands = Collections.EMPTY_LIST;
!         }
!         else {
!             this.sharedCommands = new ArrayList(sharedCommandIds.length);
!             for (int i = 0; i < sharedCommandIds.length; i++) {
!                 ActionCommand globalCommand = createTargetableActionCommand(
!                         sharedCommandIds[i], null);
!                 sharedCommands.add(globalCommand);
!             }
!         }
!     }
  
!     public Iterator getSharedCommands() {
!         if (sharedCommands == null) { return Collections.EMPTY_LIST.iterator(); }
!         return sharedCommands.iterator();
!     }
  
  }
\ No newline at end of file
--- 14,54 ----
  import org.springframework.richclient.command.ActionCommand;
  import org.springframework.richclient.command.CommandRegistry;
+ import org.springframework.richclient.command.CommandServices;
  import org.springframework.richclient.command.support.DefaultCommandManager;
  
  public class ApplicationWindowCommandManager extends DefaultCommandManager {
! 	private List sharedCommands;
  
! 	public ApplicationWindowCommandManager() {
! 		super();
! 	}
  
! 	public ApplicationWindowCommandManager(CommandRegistry parent) {
! 		super(parent);
! 	}
  
! 	public ApplicationWindowCommandManager(CommandServices commandServices) {
! 		super(commandServices);
! 	}
  
! 	public void setSharedCommandIds(String[] sharedCommandIds) {
! 		if (sharedCommandIds.length == 0) {
! 			sharedCommands = Collections.EMPTY_LIST;
! 		}
! 		else {
! 			this.sharedCommands = new ArrayList(sharedCommandIds.length);
! 			for (int i = 0; i < sharedCommandIds.length; i++) {
! 				ActionCommand globalCommand = createTargetableActionCommand(sharedCommandIds[i], null);
! 				sharedCommands.add(globalCommand);
! 			}
! 		}
! 	}
! 
! 	public Iterator getSharedCommands() {
! 		if (sharedCommands == null) {
! 			return Collections.EMPTY_LIST.iterator();
! 		}
! 		return sharedCommands.iterator();
! 	}
  
  }
\ No newline at end of file

Index: DefaultApplicationWindow.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/application/support/DefaultApplicationWindow.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DefaultApplicationWindow.java	25 Oct 2004 05:52:19 -0000	1.9
--- DefaultApplicationWindow.java	28 Oct 2004 06:12:43 -0000	1.10
***************
*** 24,28 ****
  import javax.swing.JComponent;
  import javax.swing.JFrame;
- import javax.swing.JToolBar;
  import javax.swing.WindowConstants;
  
--- 24,27 ----
***************
*** 32,38 ****
  import org.springframework.richclient.application.Application;
  import org.springframework.richclient.application.ApplicationPage;
- import org.springframework.richclient.application.PageDescriptor;
  import org.springframework.richclient.application.ApplicationServices;
  import org.springframework.richclient.application.ApplicationWindow;
  import org.springframework.richclient.application.PageListener;
  import org.springframework.richclient.application.ViewDescriptor;
--- 31,37 ----
  import org.springframework.richclient.application.Application;
  import org.springframework.richclient.application.ApplicationPage;
  import org.springframework.richclient.application.ApplicationServices;
  import org.springframework.richclient.application.ApplicationWindow;
+ import org.springframework.richclient.application.PageDescriptor;
  import org.springframework.richclient.application.PageListener;
  import org.springframework.richclient.application.ViewDescriptor;
***************
*** 50,291 ****
   */
  public class DefaultApplicationWindow implements ApplicationWindow {
!     protected Log logger = LogFactory.getLog(getClass());
  
!     private static final String DEFAULT_APPLICATION_PAGE_BEAN_ID = "defaultApplicationPagePrototype";
  
!     private int number;
  
!     private ApplicationWindowCommandManager commandManager;
  
!     private CommandGroup menuBarCommandGroup;
  
!     private CommandGroup toolBarCommandGroup;
  
!     private StatusBarCommandGroup statusBarCommandGroup;
  
!     private ApplicationWindowConfigurer windowConfigurer;
  
!     private JFrame control;
  
!     private ApplicationPage currentPage;
  
!     private WindowManager windowManager;
  
!     private ListenerListHelper pageListeners = new ListenerListHelper(
!             PageListener.class);
  
!     public DefaultApplicationWindow() {
!         this(Application.instance().getWindowManager().size());
!     }
  
!     public DefaultApplicationWindow(int number) {
!         this.number = number;
!         getAdvisor().onPreWindowOpen(getWindowConfigurer());
!         this.commandManager = getAdvisor().createWindowCommandManager();
!         this.menuBarCommandGroup = getAdvisor().getMenuBarCommandGroup();
!         this.toolBarCommandGroup = getAdvisor().getToolBarCommandGroup();
!         this.statusBarCommandGroup = getAdvisor().getStatusBarCommandGroup();
!         getAdvisor().onCommandsCreated(this);
!     }
  
!     public int getNumber() {
!         return number;
!     }
  
!     public ApplicationPage getPage() {
!         return currentPage;
!     }
  
!     protected ApplicationAdvisor getAdvisor() {
!         return Application.instance().getAdvisor();
!     }
  
!     protected ApplicationServices getServices() {
!         return Application.services();
!     }
  
!     protected ApplicationWindowConfigurer getWindowConfigurer() {
!         if (windowConfigurer == null) {
!             this.windowConfigurer = initWindowConfigurer();
!         }
!         return windowConfigurer;
!     }
  
!     protected ApplicationWindowConfigurer initWindowConfigurer() {
!         return new DefaultApplicationWindowConfigurer(this);
!     }
  
!     public CommandManager getCommandManager() {
!         return commandManager;
!     }
  
!     public Iterator getSharedCommands() {
!         return commandManager.getSharedCommands();
!     }
  
!     public CommandGroup getMenuBar() {
!         return menuBarCommandGroup;
!     }
  
!     public CommandGroup getToolBar() {
!         return toolBarCommandGroup;
!     }
  
!     public StatusBarCommandGroup getStatusBar() {
!         return statusBarCommandGroup;
!     }
  
!     public void setWindowManager(WindowManager windowManager) {
!         this.windowManager = windowManager;
!     }
  
!     public void showPage(String pageId) {
!         if (this.currentPage == null) {
!             this.currentPage = createPage(this, pageId);
!             initWindow();
!         }
!         else {
!             if (!currentPage.getId().equals(pageId)) {
!                 this.currentPage = createPage(this, pageId);
!                 updatePageControl();
!             }
!         }
!     }
  
!     protected final ApplicationPage createPage(ApplicationWindow window,
!             String pageDescriptorId) {
!         PageDescriptor descriptor = getPageDescriptor(pageDescriptorId);
!         return createPage(descriptor);
!     }
  
!     /**
!      * Factory method for creating the page area managed by this window.
!      * Subclasses may override to return a custom page implementation.
!      * 
!      * @param descriptor
!      *            The page descriptor
!      * @return The window's page
!      */
!     protected ApplicationPage createPage(PageDescriptor descriptor) {
!         try {
!             DefaultApplicationPage page = (DefaultApplicationPage)getServices()
!                     .getBean(DEFAULT_APPLICATION_PAGE_BEAN_ID,
!                             DefaultApplicationPage.class);
!             page.setApplicationWindow(this);
!             page.setDescriptor(descriptor);
!             return page;
!         }
!         catch (NoSuchBeanDefinitionException e) {
!             return new DefaultApplicationPage(this, descriptor);
!         }
  
!     }
  
!     protected PageDescriptor getPageDescriptor(
!             String pageDescriptorId) {
!         Object desc = getServices().getBean(pageDescriptorId);
!         if (desc instanceof PageDescriptor) {
!             return (PageDescriptor)desc;
!         }
!         else if (desc instanceof ViewDescriptor) {
!             return new SingleViewPageDescriptor((ViewDescriptor)desc);
!         }
!         else {
!             throw new IllegalArgumentException("Page id '" + pageDescriptorId
!                     + "' is not backed by an ApplicationPageDescriptor");
!         }
!     }
  
!     private void initWindow() {
!         initWindowControl();
!         getAdvisor().onWindowCreated(this);
!         getAdvisor().showIntroComponentIfNecessary(this);
!         this.control.setVisible(true);
!         getAdvisor().onWindowOpened(this);
!     }
  
!     protected void initWindowControl() {
!         this.control = createNewWindowControl();
!         ApplicationWindowConfigurer configurer = getWindowConfigurer();
!         control.setTitle(configurer.getTitle());
!         control.setIconImage(configurer.getImage());
!         control.setJMenuBar(menuBarCommandGroup.createMenuBar());
!         menuBarCommandGroup.setVisible(configurer.getShowMenuBar());
  
!         control.getContentPane().setLayout(new BorderLayout());
!         control.getContentPane().add(createToolBar(), BorderLayout.NORTH);
!         control.getContentPane().add(this.currentPage.getControl());
!         control.getContentPane().add(createStatusBar(), BorderLayout.SOUTH);
!         control.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
!         control.addWindowListener(new WindowAdapter() {
!             public void windowClosing(WindowEvent e) {
!                 close();
!             }
!         });
!         control.pack();
!         control.setSize(configurer.getInitialSize());
!         control.setLocationRelativeTo(null);
!     }
  
!     protected JFrame createNewWindowControl() {
!         return new JFrame();
!     }
  
!     protected void updatePageControl() {
!         control.getContentPane().remove(this.currentPage.getControl());
!         control.getContentPane().add(this.currentPage.getControl());
!         control.validate();
!     }
  
!     public JFrame getControl() {
!         return control;
!     }
  
!     public boolean isControlCreated() {
!         return control != null;
!     }
  
!     protected JComponent createToolBar() {
!         JToolBar toolBar = toolBarCommandGroup.createToolBar();
!         toolBarCommandGroup.setVisible(getWindowConfigurer().getShowToolBar());
!         return toolBar;
!     }
  
!     protected JComponent createStatusBar() {
!         JComponent statusBar = statusBarCommandGroup.getControl();
!         statusBarCommandGroup.setVisible(getWindowConfigurer()
!                 .getShowStatusBar());
!         return statusBar;
!     }
  
!     public void addPageListener(PageListener listener) {
!         this.pageListeners.add(listener);
!     }
  
!     public void removePageListener(PageListener listener) {
!         this.pageListeners.remove(PageListener.class);
!     }
  
!     public boolean close() {
!         boolean canClose = getAdvisor().onPreWindowClose(this);
!         if (canClose) {
!             currentPage.close();
!             control.dispose();
!             control = null;
!             if (windowManager != null) {
!                 windowManager.remove(this);
!             }
!             windowManager = null;
!         }
!         return canClose;
!     }
  
!     public void saveState(Memento memento) {
!         Rectangle bounds = this.control.getBounds();
!         memento.putInteger("x", bounds.x);
!         memento.putInteger("y", bounds.y);
!         memento.putInteger("width", bounds.width);
!         memento.putInteger("height", bounds.height);
!     }
  
  }
\ No newline at end of file
--- 49,285 ----
   */
  public class DefaultApplicationWindow implements ApplicationWindow {
! 	protected Log logger = LogFactory.getLog(getClass());
  
! 	private static final String DEFAULT_APPLICATION_PAGE_BEAN_ID = "defaultApplicationPagePrototype";
  
! 	private int number;
  
! 	private ApplicationWindowCommandManager commandManager;
  
! 	private CommandGroup menuBarCommandGroup;
  
! 	private CommandGroup toolBarCommandGroup;
  
! 	private StatusBarCommandGroup statusBarCommandGroup;
  
! 	private ApplicationWindowConfigurer windowConfigurer;
  
! 	private JFrame control;
  
! 	private ApplicationPage currentPage;
  
! 	private WindowManager windowManager;
  
! 	private ListenerListHelper pageListeners = new ListenerListHelper(PageListener.class);
  
! 	public DefaultApplicationWindow() {
! 		this(Application.instance().getWindowManager().size());
! 	}
  
! 	public DefaultApplicationWindow(int number) {
! 		this.number = number;
! 		getAdvisor().onPreWindowOpen(getWindowConfigurer());
! 		this.commandManager = getAdvisor().createWindowCommandManager();
! 		this.menuBarCommandGroup = getAdvisor().getMenuBarCommandGroup();
! 		this.toolBarCommandGroup = getAdvisor().getToolBarCommandGroup();
! 		this.statusBarCommandGroup = getAdvisor().getStatusBarCommandGroup();
! 		getAdvisor().onCommandsCreated(this);
! 	}
  
! 	public int getNumber() {
! 		return number;
! 	}
  
! 	public ApplicationPage getPage() {
! 		return currentPage;
! 	}
  
! 	protected ApplicationAdvisor getAdvisor() {
! 		return Application.instance().getAdvisor();
! 	}
  
! 	protected ApplicationServices getServices() {
! 		return Application.services();
! 	}
  
! 	protected ApplicationWindowConfigurer getWindowConfigurer() {
! 		if (windowConfigurer == null) {
! 			this.windowConfigurer = initWindowConfigurer();
! 		}
! 		return windowConfigurer;
! 	}
  
! 	protected ApplicationWindowConfigurer initWindowConfigurer() {
! 		return new DefaultApplicationWindowConfigurer(this);
! 	}
  
! 	public CommandManager getCommandManager() {
! 		return commandManager;
! 	}
  
! 	public Iterator getSharedCommands() {
! 		return commandManager.getSharedCommands();
! 	}
  
! 	public CommandGroup getMenuBar() {
! 		return menuBarCommandGroup;
! 	}
  
! 	public CommandGroup getToolBar() {
! 		return toolBarCommandGroup;
! 	}
  
! 	public StatusBarCommandGroup getStatusBar() {
! 		return statusBarCommandGroup;
! 	}
  
! 	public void setWindowManager(WindowManager windowManager) {
! 		this.windowManager = windowManager;
! 	}
  
! 	public void showPage(String pageId) {
! 		if (this.currentPage == null) {
! 			this.currentPage = createPage(this, pageId);
! 			initWindow();
! 		}
! 		else {
! 			if (!currentPage.getId().equals(pageId)) {
! 				this.currentPage = createPage(this, pageId);
! 				updatePageControl();
! 			}
! 		}
! 	}
  
! 	protected final ApplicationPage createPage(ApplicationWindow window, String pageDescriptorId) {
! 		PageDescriptor descriptor = getPageDescriptor(pageDescriptorId);
! 		return createPage(descriptor);
! 	}
  
! 	/**
! 	 * Factory method for creating the page area managed by this window.
! 	 * Subclasses may override to return a custom page implementation.
! 	 * 
! 	 * @param descriptor
! 	 *            The page descriptor
! 	 * @return The window's page
! 	 */
! 	protected ApplicationPage createPage(PageDescriptor descriptor) {
! 		try {
! 			DefaultApplicationPage page = (DefaultApplicationPage)getServices().getBean(DEFAULT_APPLICATION_PAGE_BEAN_ID,
! 					DefaultApplicationPage.class);
! 			page.setApplicationWindow(this);
! 			page.setDescriptor(descriptor);
! 			return page;
! 		}
! 		catch (NoSuchBeanDefinitionException e) {
! 			return new DefaultApplicationPage(this, descriptor);
! 		}
  
! 	}
  
! 	protected PageDescriptor getPageDescriptor(String pageDescriptorId) {
! 		Object desc = getServices().getBean(pageDescriptorId);
! 		if (desc instanceof PageDescriptor) {
! 			return (PageDescriptor)desc;
! 		}
! 		else if (desc instanceof ViewDescriptor) {
! 			return new SingleViewPageDescriptor((ViewDescriptor)desc);
! 		}
! 		else {
! 			throw new IllegalArgumentException("Page id '" + pageDescriptorId
! 					+ "' is not backed by an ApplicationPageDescriptor");
! 		}
! 	}
  
! 	private void initWindow() {
! 		initWindowControl();
! 		getAdvisor().onWindowCreated(this);
! 		getAdvisor().showIntroComponentIfNecessary(this);
! 		this.control.setVisible(true);
! 		getAdvisor().onWindowOpened(this);
! 	}
  
! 	protected void initWindowControl() {
! 		this.control = createNewWindowControl();
! 		ApplicationWindowConfigurer configurer = getWindowConfigurer();
! 		control.setTitle(configurer.getTitle());
! 		control.setIconImage(configurer.getImage());
! 		control.setJMenuBar(menuBarCommandGroup.createMenuBar());
! 		menuBarCommandGroup.setVisible(configurer.getShowMenuBar());
  
! 		control.getContentPane().setLayout(new BorderLayout());
! 		control.getContentPane().add(createToolBar(), BorderLayout.NORTH);
! 		control.getContentPane().add(this.currentPage.getControl());
! 		control.getContentPane().add(createStatusBar(), BorderLayout.SOUTH);
! 		control.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
! 		control.addWindowListener(new WindowAdapter() {
! 			public void windowClosing(WindowEvent e) {
! 				close();
! 			}
! 		});
! 		control.pack();
! 		control.setSize(configurer.getInitialSize());
! 		control.setLocationRelativeTo(null);
! 	}
  
! 	protected JFrame createNewWindowControl() {
! 		return new JFrame();
! 	}
  
! 	protected void updatePageControl() {
! 		control.getContentPane().remove(this.currentPage.getControl());
! 		control.getContentPane().add(this.currentPage.getControl());
! 		control.validate();
! 	}
  
! 	public JFrame getControl() {
! 		return control;
! 	}
  
! 	public boolean isControlCreated() {
! 		return control != null;
! 	}
  
! 	protected JComponent createToolBar() {
! 		JComponent toolBar = toolBarCommandGroup.createToolBar();
! 		toolBarCommandGroup.setVisible(getWindowConfigurer().getShowToolBar());
! 		return toolBar;
! 	}
  
! 	protected JComponent createStatusBar() {
! 		JComponent statusBar = statusBarCommandGroup.getControl();
! 		statusBarCommandGroup.setVisible(getWindowConfigurer().getShowStatusBar());
! 		return statusBar;
! 	}
  
! 	public void addPageListener(PageListener listener) {
! 		this.pageListeners.add(listener);
! 	}
  
! 	public void removePageListener(PageListener listener) {
! 		this.pageListeners.remove(PageListener.class);
! 	}
  
! 	public boolean close() {
! 		boolean canClose = getAdvisor().onPreWindowClose(this);
! 		if (canClose) {
! 			currentPage.close();
! 			control.dispose();
! 			control = null;
! 			if (windowManager != null) {
! 				windowManager.remove(this);
! 			}
! 			windowManager = null;
! 		}
! 		return canClose;
! 	}
  
! 	public void saveState(Memento memento) {
! 		Rectangle bounds = this.control.getBounds();
! 		memento.putInteger("x", bounds.x);
! 		memento.putInteger("y", bounds.y);
! 		memento.putInteger("width", bounds.width);
! 		memento.putInteger("height", bounds.height);
! 	}
  
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13101/src/org/springframework/richclient/command

Modified Files:
	CommandGroup.java 
Log Message:
command polishing per david's requests (JIDE software lead!)

Index: CommandGroup.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/command/CommandGroup.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CommandGroup.java	22 Oct 2004 22:01:44 -0000	1.7
--- CommandGroup.java	28 Oct 2004 06:12:43 -0000	1.8
***************
*** 446,455 ****
      }
  
!     public JToolBar createToolBar() {
          return createToolBar(getButtonFactory());
      }
  
!     public JToolBar createToolBar(ButtonFactory factory) {
!         JToolBar toolbar = createNewToolBar(getText());
          bindMembers(toolbar, toolbar, factory, getToolBarButtonConfigurer());
          toolbar.setEnabled(false);
--- 446,455 ----
      }
  
!     public JComponent createToolBar() {
          return createToolBar(getButtonFactory());
      }
  
!     public JComponent createToolBar(ButtonFactory factory) {
!         JComponent toolbar = createNewToolBar(getText());
          bindMembers(toolbar, toolbar, factory, getToolBarButtonConfigurer());
          toolbar.setEnabled(false);
***************
*** 463,472 ****
  
      public JMenuBar createMenuBar(MenuFactory factory) {
!         JMenuBar menubar = newMenuBar();
          bindMembers(menubar, menubar, factory, getMenuItemButtonConfigurer());
          return menubar;
      }
  
!     protected JToolBar createNewToolBar(String text) {
          JToolBar toolBar = new JToolBar(text);
          toolBar.setFloatable(false);
--- 463,472 ----
  
      public JMenuBar createMenuBar(MenuFactory factory) {
!         JMenuBar menubar = createNewMenuBar();
          bindMembers(menubar, menubar, factory, getMenuItemButtonConfigurer());
          return menubar;
      }
  
!     protected JComponent createNewToolBar(String text) {
          JToolBar toolBar = new JToolBar(text);
          toolBar.setFloatable(false);
***************
*** 477,481 ****
      }
  
!     protected JMenuBar newMenuBar() {
          return new JMenuBar();
      }
--- 477,481 ----
      }
  
!     protected JMenuBar createNewMenuBar() {
          return new JMenuBar();
      }

Update of /cvsroot/spring-rich-c/spring-richclient/test/org/springframework/richclient/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32348/test/org/springframework/richclient/layout

Modified Files:
	GridBagLayoutBuilderTests.java 
Log Message:
Fixed expansion problem with labels when put above or below a field

Index: GridBagLayoutBuilderTests.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/test/org/springframework/richclient/layout/GridBagLayoutBuilderTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GridBagLayoutBuilderTests.java	25 Oct 2004 21:51:32 -0000	1.1
--- GridBagLayoutBuilderTests.java	26 Oct 2004 23:21:23 -0000	1.2
***************
*** 44,56 ****
          final GridBagLayout layout = ((GridBagLayout)panel.getLayout());
  
!         check(layout.getConstraints(comps[0]), 0, 0, 1, 1);
!         check(layout.getConstraints(comps[1]), 1, 0, 2, 2);
!         check(layout.getConstraints(comps[2]), 3, 0, 1, 1);
!         check(layout.getConstraints(comps[3]), 0, 1, 1, 1);
!         check(layout.getConstraints(comps[4]), 3, 1, 1, 1);
!         check(layout.getConstraints(comps[5]), 0, 2, 1, 1);
!         check(layout.getConstraints(comps[6]), 1, 2, 1, 1);
!         check(layout.getConstraints(comps[7]), 2, 2, 1, 1);
!         check(layout.getConstraints(comps[8]), 3, 2, 1, 1);
      }
  
--- 44,56 ----
          final GridBagLayout layout = ((GridBagLayout)panel.getLayout());
  
!         check(layout.getConstraints(comps[0]), 0, 0, 1, 1, false, false);
!         check(layout.getConstraints(comps[1]), 1, 0, 2, 2, false, false);
!         check(layout.getConstraints(comps[2]), 3, 0, 1, 1, false, false);
!         check(layout.getConstraints(comps[3]), 0, 1, 1, 1, false, false);
!         check(layout.getConstraints(comps[4]), 3, 1, 1, 1, false, false);
!         check(layout.getConstraints(comps[5]), 0, 2, 1, 1, false, false);
!         check(layout.getConstraints(comps[6]), 1, 2, 1, 1, false, false);
!         check(layout.getConstraints(comps[7]), 2, 2, 1, 1, false, false);
!         check(layout.getConstraints(comps[8]), 3, 2, 1, 1, false, false);
      }
  
***************
*** 69,87 ****
          final GridBagLayout layout = ((GridBagLayout)panel.getLayout());
  
!         check(layout.getConstraints(comps[0]), 0, 0, 1, 1);
!         check(layout.getConstraints(comps[1]), 1, 0, 2, 1);
!         check(layout.getConstraints(comps[2]), 3, 0, 1, 1);
!         check(layout.getConstraints(comps[3]), 0, 1, 1, 1);
!         check(layout.getConstraints(comps[4]), 1, 1, 1, 1);
!         check(layout.getConstraints(comps[5]), 2, 1, 1, 1);
!         check(layout.getConstraints(comps[6]), 3, 1, 1, 1);
      }
  
      private void check(GridBagConstraints gbc, final int x, final int y,
!                        final int width, final int height) {
          assertEquals(x, gbc.gridx);
          assertEquals(y, gbc.gridy);
          assertEquals(width, gbc.gridwidth);
          assertEquals(height, gbc.gridheight);
      }
  
--- 69,90 ----
          final GridBagLayout layout = ((GridBagLayout)panel.getLayout());
  
!         check(layout.getConstraints(comps[0]), 0, 0, 1, 1, false, false);
!         check(layout.getConstraints(comps[1]), 1, 0, 2, 1, false, false);
!         check(layout.getConstraints(comps[2]), 3, 0, 1, 1, false, false);
!         check(layout.getConstraints(comps[3]), 0, 1, 1, 1, false, false);
!         check(layout.getConstraints(comps[4]), 1, 1, 1, 1, false, false);
!         check(layout.getConstraints(comps[5]), 2, 1, 1, 1, false, false);
!         check(layout.getConstraints(comps[6]), 3, 1, 1, 1, false, false);
      }
  
      private void check(GridBagConstraints gbc, final int x, final int y,
!                        final int width, final int height, boolean expandX,
!                        boolean expandY) {
          assertEquals(x, gbc.gridx);
          assertEquals(y, gbc.gridy);
          assertEquals(width, gbc.gridwidth);
          assertEquals(height, gbc.gridheight);
+         assertEquals(expandX, gbc.weightx > 0.0);
+         assertEquals(expandY, gbc.weighty > 0.0);
      }
  
***************
*** 90,94 ****
  
          builder.appendLabeledField(new JLabel("0"), new JLabel("3"),
!             LabelOrientation.TOP, 1, 2, true, false);
          builder.appendLabeledField(new JLabel("1"), new JLabel("2"),
              LabelOrientation.LEFT, 2, 1, true, false);
--- 93,97 ----
  
          builder.appendLabeledField(new JLabel("0"), new JLabel("3"),
!             LabelOrientation.TOP, 1, 2, true, true);
          builder.appendLabeledField(new JLabel("1"), new JLabel("2"),
              LabelOrientation.LEFT, 2, 1, true, false);
***************
*** 108,119 ****
          final GridBagLayout layout = ((GridBagLayout)panel.getLayout());
  
!         check(layout.getConstraints(comps[0]), 0, 0, 1, 1);
!         check(layout.getConstraints(comps[1]), 1, 0, 1, 1);
!         check(layout.getConstraints(comps[2]), 2, 0, 2, 1);
!         check(layout.getConstraints(comps[3]), 0, 1, 1, 2);
!         check(layout.getConstraints(comps[4]), 1, 1, 3, 1);
!         check(layout.getConstraints(comps[5]), 1, 2, 3, 1);
!         check(layout.getConstraints(comps[6]), 0, 3, 3, 1);
!         check(layout.getConstraints(comps[7]), 3, 3, 1, 1);
      }
  
--- 111,122 ----
          final GridBagLayout layout = ((GridBagLayout)panel.getLayout());
  
!         check(layout.getConstraints(comps[0]), 0, 0, 1, 1, true, false);
!         check(layout.getConstraints(comps[1]), 1, 0, 1, 1, false, false);
!         check(layout.getConstraints(comps[2]), 2, 0, 2, 1, true, false);
!         check(layout.getConstraints(comps[3]), 0, 1, 1, 2, true, true);
!         check(layout.getConstraints(comps[4]), 1, 1, 3, 1, true, false);
!         check(layout.getConstraints(comps[5]), 1, 2, 3, 1, true, false);
!         check(layout.getConstraints(comps[6]), 0, 3, 3, 1, true, false);
!         check(layout.getConstraints(comps[7]), 3, 3, 1, 1, false, false);
      }

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32348/src/org/springframework/richclient/layout

Modified Files:
	GridBagLayoutBuilder.java 
Log Message:
Fixed expansion problem with labels when put above or below a field

Index: GridBagLayoutBuilder.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/layout/GridBagLayoutBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GridBagLayoutBuilder.java	25 Oct 2004 21:51:32 -0000	1.4
--- GridBagLayoutBuilder.java	26 Oct 2004 23:21:19 -0000	1.5
***************
*** 376,380 ****
          else if (labelOrientation == LabelOrientation.TOP) {
              label.setHorizontalAlignment(JLabel.LEFT);
!             append(label, col, row, colSpan, 1, false, expandY, insets);
              append(field, col, row + 1, colSpan, rowSpan, expandX,
                  expandY, insets);
--- 376,380 ----
          else if (labelOrientation == LabelOrientation.TOP) {
              label.setHorizontalAlignment(JLabel.LEFT);
!             append(label, col, row, colSpan, 1, expandX, false, insets);
              append(field, col, row + 1, colSpan, rowSpan, expandX,
                  expandY, insets);
***************
*** 383,387 ****
              label.setHorizontalAlignment(JLabel.LEFT);
              append(field, col, row, colSpan, rowSpan, expandX, expandY, insets);
!             append(label, col, row + rowSpan, colSpan, 1, false, expandY,
                  insets);
          }
--- 383,387 ----
              label.setHorizontalAlignment(JLabel.LEFT);
              append(field, col, row, colSpan, rowSpan, expandX, expandY, insets);
!             append(label, col, row + rowSpan, colSpan, 1, expandX, false,
                  insets);
          }

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/wizard
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18258/src/org/springframework/richclient/wizard

Modified Files:
	WizardDialog.java 
Log Message:
minor polishing: bug fixes in wizard dialog related to lifecycle hooks (aboutToShow not called)

Index: WizardDialog.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/wizard/WizardDialog.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** WizardDialog.java	15 Oct 2004 22:18:23 -0000	1.9
--- WizardDialog.java	26 Oct 2004 22:20:42 -0000	1.10
***************
*** 38,260 ****
   * @author Keith Donald
   */
! public class WizardDialog extends TitledApplicationDialog implements
!         WizardContainer, MessageAreaChangeListener, PropertyChangeListener {
!     private static final String NEXT_MESSAGE_CODE = "wizard.next";
! 
!     private static final String BACK_MESSAGE_CODE = "wizard.back";
! 
!     private Wizard wizard;
! 
!     private ActionCommand nextCommand;
  
!     private ActionCommand backCommand;
  
!     private WizardPage currentPage;
  
!     private int largestPageWidth;
  
!     private int largestPageHeight;
  
!     public WizardDialog() {
!         this(null);
!     }
  
!     public WizardDialog(Wizard wizard) {
!         super();
!         setWizard(wizard);
!         setResizable(true);
!     }
  
!     public void setWizard(Wizard wizard) {
!         if (this.wizard != wizard) {
!             if (this.wizard != null) {
!                 this.wizard.setContainer(null);
!             }
!             this.wizard = wizard;
!             if (this.wizard != null) {
!                 this.wizard.setContainer(this);
!                 this.setTitle(wizard.getTitle());
!             }
!         }
!     }
  
!     protected String getFinishFaceConfigurationKey() {
!         return "finishCommand";
!     }
  
!     protected JComponent createTitledDialogContentPane() {
!         wizard.addPages();
!         createPageControls();
!         WizardPage startPage = wizard.getStartingPage();
!         Assert.notNull(startPage,
!                 "No starting page returned; unable to show wizard.");
!         JComponent control = startPage.getControl();
!         control.setPreferredSize(getLargestPageSize());
!         return control;
!     }
  
!     private Dimension getLargestPageSize() {
!         return new Dimension(largestPageWidth + UIConstants.ONE_SPACE,
!                 largestPageHeight + UIConstants.ONE_SPACE);
!     }
  
!     protected Object[] getCommandGroupMembers() {
!         if (!wizard.needsPreviousAndNextButtons()) { return super
!                 .getCommandGroupMembers(); }
  
!         nextCommand = new ActionCommand("nextCommand") {
!             public void doExecuteCommand() {
!                 onNext();
!             }
!         };
  
!         backCommand = new ActionCommand("backCommand") {
!             public void doExecuteCommand() {
!                 onBack();
!             }
!         };
!         backCommand.setEnabled(false);
  
!         return new AbstractCommand[] { backCommand, nextCommand,
!                 getFinishCommand(), getCancelCommand() };
!     }
  
!     protected void onAboutToShow() {
!         showPage(wizard.getStartingPage());
!         super.onAboutToShow();
!     }
  
!     /**
!      * Allow the wizard's pages to pre-create their page controls. This allows
!      * the wizard dialog to open to the correct size.
!      */
!     private void createPageControls() {
!         WizardPage[] pages = wizard.getPages();
!         for (int i = 0; i < pages.length; i++) {
!             JComponent c = pages[i].getControl();
!             GuiStandardUtils.attachDialogBorder(c);
!             Dimension size = c.getPreferredSize();
!             if (size.width > largestPageWidth) {
!                 largestPageWidth = size.width;
!             }
!             if (size.height > largestPageHeight) {
!                 largestPageHeight = size.height;
!             }
!         }
!     }
  
!     public void showPage(WizardPage page) {
!         if (currentPage == page) { return; }
!         if (currentPage != null) {
!             currentPage.removeMessageAreaChangeListener(this);
!             currentPage.removePropertyChangeListener(this);
!         }
!         page.onAboutToShow();
!         this.currentPage = page;
!         update();
!         this.currentPage.addMessageAreaChangeListener(this);
!         this.currentPage.addPropertyChangeListener(this);
!         setContentPane(page.getControl());
!         this.currentPage.setVisible(true);
!     }
  
!     public WizardPage getCurrentPage() {
!         return currentPage;
!     }
  
!     protected void onBack() {
!         WizardPage newPage = currentPage.getPreviousPage();
!         if (newPage == null || newPage == currentPage) { throw new IllegalStateException(
!                 "No such page."); }
!         showPage(newPage);
!     }
  
!     protected void onNext() {
!         WizardPage newPage = currentPage.getNextPage();
!         if (newPage == null || newPage == currentPage) { throw new IllegalStateException(
!                 "No such page."); }
!         showPage(newPage);
!     }
  
!     protected boolean onFinish() {
!         return wizard.performFinish();
!     }
  
!     protected void onCancel() {
!         if (wizard.performCancel()) {
!             super.onCancel();
!         }
!     }
  
!     /**
!      * Updates this dialog's controls to reflect the current page.
!      */
!     protected void update() {
!         if (!isControlCreated()) { throw new IllegalStateException(
!                 "Container controls not initialized - update not allowed."); }
  
!         // Update the title bar
!         updateTitleBar();
  
!         // Update the message line
!         updateMessage();
  
!         // Update the buttons
!         updateButtons();
!     }
  
!     /**
!      * Updates the title bar (title, description, and image) to reflect the
!      * state of the currently active page in this container.
!      */
!     protected void updateTitleBar() {
!         setTitleAreaText(currentPage.getTitle());
!         setTitleAreaImage(currentPage.getImage());
!         setDescription(currentPage.getDescription());
!     }
  
!     /**
!      * Updates the message (or error message) shown in the message line to
!      * reflect the state of the currently active page in this container.
!      */
!     protected void updateMessage() {
!         String errorMessage = currentPage.getErrorMessage();
!         if (StringUtils.hasText(errorMessage)) {
!             setErrorMessage(errorMessage);
!         }
!         else {
!             setMessage(currentPage.getMessage());
!         }
!     }
  
!     private void updateButtons() {
!         if (wizard.needsPreviousAndNextButtons()) {
!             backCommand.setEnabled(currentPage.getPreviousPage() != null);
!             nextCommand.setEnabled(canFlipToNextPage());
!         }
!         setFinishEnabled(wizard.canFinish());
!         if (canFlipToNextPage() && !wizard.canFinish()) {
!             registerDefaultCommand(nextCommand);
!         }
!         else {
!             registerDefaultCommand();
!         }
!     }
  
!     private boolean canFlipToNextPage() {
!         return currentPage.canFlipToNextPage();
!     }
  
!     public void messageUpdated(MessageAreaModel source) {
!         updateMessage();
!     }
  
!     public void propertyChange(PropertyChangeEvent e) {
!         if (DialogPage.PAGE_COMPLETE_PROPERTY.equals(e.getPropertyName())) {
!             updateButtons();
!         }
!         else if (DialogPage.DESCRIPTION_PROPERTY.equals(e.getPropertyName())) {
!             updateTitleBar();
!         }
!     }
  }
\ No newline at end of file
--- 38,259 ----
   * @author Keith Donald
   */
! public class WizardDialog extends TitledApplicationDialog implements WizardContainer, MessageAreaChangeListener,
! 		PropertyChangeListener {
! 	private static final String NEXT_MESSAGE_CODE = "wizard.next";
  
! 	private static final String BACK_MESSAGE_CODE = "wizard.back";
  
! 	private Wizard wizard;
  
! 	private ActionCommand nextCommand;
  
! 	private ActionCommand backCommand;
  
! 	private WizardPage currentPage;
  
! 	private int largestPageWidth;
  
! 	private int largestPageHeight;
  
! 	public WizardDialog() {
! 		this(null);
! 	}
  
! 	public WizardDialog(Wizard wizard) {
! 		super();
! 		setWizard(wizard);
! 		setResizable(true);
! 	}
  
! 	public void setWizard(Wizard wizard) {
! 		if (this.wizard != wizard) {
! 			if (this.wizard != null) {
! 				this.wizard.setContainer(null);
! 			}
! 			this.wizard = wizard;
! 			if (this.wizard != null) {
! 				this.wizard.setContainer(this);
! 				this.setTitle(wizard.getTitle());
! 			}
! 		}
! 	}
  
! 	protected String getFinishFaceConfigurationKey() {
! 		return "finishCommand";
! 	}
  
! 	protected JComponent createTitledDialogContentPane() {
! 		wizard.addPages();
! 		createPageControls();
! 		WizardPage startPage = wizard.getStartingPage();
! 		Assert.notNull(startPage, "No starting page returned; unable to show wizard.");
! 		JComponent control = startPage.getControl();
! 		control.setPreferredSize(getLargestPageSize());
! 		return control;
! 	}
  
! 	private Dimension getLargestPageSize() {
! 		return new Dimension(largestPageWidth + UIConstants.ONE_SPACE, largestPageHeight + UIConstants.ONE_SPACE);
! 	}
  
! 	protected Object[] getCommandGroupMembers() {
! 		if (!wizard.needsPreviousAndNextButtons()) {
! 			return super.getCommandGroupMembers();
! 		}
! 		nextCommand = new ActionCommand("nextCommand") {
! 			public void doExecuteCommand() {
! 				onNext();
! 			}
! 		};
! 		backCommand = new ActionCommand("backCommand") {
! 			public void doExecuteCommand() {
! 				onBack();
! 			}
! 		};
! 		backCommand.setEnabled(false);
! 		return new AbstractCommand[] { backCommand, nextCommand, getFinishCommand(), getCancelCommand() };
! 	}
  
! 	protected void onAboutToShow() {
! 		showPage(wizard.getStartingPage());
! 		super.onAboutToShow();
! 	}
  
! 	/**
! 	 * Allow the wizard's pages to pre-create their page controls. This allows
! 	 * the wizard dialog to open to the correct size.
! 	 */
! 	private void createPageControls() {
! 		WizardPage[] pages = wizard.getPages();
! 		for (int i = 0; i < pages.length; i++) {
! 			JComponent c = pages[i].getControl();
! 			GuiStandardUtils.attachDialogBorder(c);
! 			Dimension size = c.getPreferredSize();
! 			if (size.width > largestPageWidth) {
! 				largestPageWidth = size.width;
! 			}
! 			if (size.height > largestPageHeight) {
! 				largestPageHeight = size.height;
! 			}
! 		}
! 	}
  
! 	public void showPage(WizardPage page) {
! 		if (this.currentPage != page) {
! 			if (this.currentPage != null) {
! 				this.currentPage.removeMessageAreaChangeListener(this);
! 				this.currentPage.removePropertyChangeListener(this);
! 			}
! 			this.currentPage = page;
! 			this.currentPage.addMessageAreaChangeListener(this);
! 			this.currentPage.addPropertyChangeListener(this);
! 			updateDialog();
! 			setContentPane(page.getControl());
! 		}
! 		this.currentPage.onAboutToShow();
! 		this.currentPage.setVisible(true);
! 	}
  
! 	public WizardPage getCurrentPage() {
! 		return currentPage;
! 	}
  
! 	protected void onBack() {
! 		WizardPage newPage = currentPage.getPreviousPage();
! 		if (newPage == null || newPage == currentPage) {
! 			throw new IllegalStateException("No such page.");
! 		}
! 		showPage(newPage);
! 	}
  
! 	protected void onNext() {
! 		WizardPage newPage = currentPage.getNextPage();
! 		if (newPage == null || newPage == currentPage) {
! 			throw new IllegalStateException("No such page.");
! 		}
! 		showPage(newPage);
! 	}
  
! 	protected boolean onFinish() {
! 		return wizard.performFinish();
! 	}
  
! 	protected void onCancel() {
! 		if (wizard.performCancel()) {
! 			super.onCancel();
! 		}
! 	}
  
! 	/**
! 	 * Updates this dialog's controls to reflect the current page.
! 	 */
! 	protected void updateDialog() {
! 		if (!isControlCreated()) {
! 			throw new IllegalStateException("Container controls not initialized - update not allowed.");
! 		}
  
! 		// Update the title bar
! 		updateTitleBar();
  
! 		// Update the message line
! 		updateMessage();
  
! 		// Update the buttons
! 		updateButtons();
! 	}
  
! 	/**
! 	 * Updates the title bar (title, description, and image) to reflect the
! 	 * state of the currently active page in this container.
! 	 */
! 	protected void updateTitleBar() {
! 		setTitleAreaText(currentPage.getTitle());
! 		setTitleAreaImage(currentPage.getImage());
! 		setDescription(currentPage.getDescription());
! 	}
  
! 	/**
! 	 * Updates the message (or error message) shown in the message line to
! 	 * reflect the state of the currently active page in this container.
! 	 */
! 	protected void updateMessage() {
! 		String errorMessage = currentPage.getErrorMessage();
! 		if (StringUtils.hasText(errorMessage)) {
! 			setErrorMessage(errorMessage);
! 		}
! 		else {
! 			setMessage(currentPage.getMessage());
! 		}
! 	}
  
! 	private void updateButtons() {
! 		if (wizard.needsPreviousAndNextButtons()) {
! 			backCommand.setEnabled(currentPage.getPreviousPage() != null);
! 			nextCommand.setEnabled(canFlipToNextPage());
! 		}
! 		setFinishEnabled(wizard.canFinish());
! 		if (canFlipToNextPage() && !wizard.canFinish()) {
! 			registerDefaultCommand(nextCommand);
! 		}
! 		else {
! 			registerDefaultCommand();
! 		}
! 	}
  
! 	private boolean canFlipToNextPage() {
! 		return currentPage.canFlipToNextPage();
! 	}
  
! 	public void messageUpdated(MessageAreaModel source) {
! 		updateMessage();
! 	}
  
! 	public void propertyChange(PropertyChangeEvent e) {
! 		if (DialogPage.PAGE_COMPLETE_PROPERTY.equals(e.getPropertyName())) {
! 			updateButtons();
! 		}
! 		else if (DialogPage.DESCRIPTION_PROPERTY.equals(e.getPropertyName())) {
! 			updateTitleBar();
! 		}
! 	}
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/list
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18258/src/org/springframework/richclient/list

Modified Files:
	DynamicComboBoxListModel.java 
Log Message:
minor polishing: bug fixes in wizard dialog related to lifecycle hooks (aboutToShow not called)

Index: DynamicComboBoxListModel.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/list/DynamicComboBoxListModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DynamicComboBoxListModel.java	15 Oct 2004 22:18:22 -0000	1.6
--- DynamicComboBoxListModel.java	26 Oct 2004 22:20:44 -0000	1.7
***************
*** 30,157 ****
   * @author Keith Donald
   */
! public class DynamicComboBoxListModel extends ComboBoxListModel implements
!         ValueChangeListener {
!     private static final Log logger = LogFactory
!             .getLog(DynamicComboBoxListModel.class);
  
!     private ValueModel selectedItemHolder;
  
!     private ValueModel selectableItemsHolder;
  
!     public DynamicComboBoxListModel(ValueModel selectedItemHolder) {
!         this(selectedItemHolder, (ValueModel)null);
!     }
  
!     public DynamicComboBoxListModel(ValueModel selectedItemHolder, List items) {
!         this(selectedItemHolder, new ValueHolder(items));
!     }
  
!     public DynamicComboBoxListModel(final ValueModel selectedItemHolder,
!             ValueModel selectableItemsHolder) {
!         super();
!         this.selectedItemHolder = selectedItemHolder;
!         if (selectedItemHolder != null) {
!             selectedItemHolder
!                     .addValueChangeListener(new ValueChangeListener() {
!                         public void valueChanged() {
!                             if (logger.isDebugEnabled()) {
!                                 logger
!                                         .debug("Notifying combo box view selected value changed; new value is '"
!                                                 + selectedItemHolder.getValue()
!                                                 + "'");
!                             }
!                             //Thread.dumpStack();
!                             if (selectedItemHolder.getValue() == null) {
!                                 if (size() > 0 && get(0) != null) {
!                                     if (logger.isDebugEnabled()) {
!                                         logger
!                                                 .debug("Backing value model is null; Pre-setting initial value to first combo-box element "
!                                                         + get(0));
!                                     }
!                                     setSelectedItem(get(0));
!                                 }
!                             }
!                             else {
!                                 if (logger.isDebugEnabled()) {
!                                     logger
!                                             .debug("Firing contents change event; selected item may have changed");
!                                 }
!                                 fireContentsChanged(this, -1, -1);
!                                 if (logger.isDebugEnabled()) {
!                                     logger
!                                             .debug("Fired contents change event!");
!                                 }
!                             }
!                         }
!                     });
!         }
!         setSelectableItemsHolder(selectableItemsHolder);
!     }
  
!     public void setSelectableItemsHolder(ValueModel holder) {
!         if (this.selectableItemsHolder == holder) { return; }
!         if (this.selectableItemsHolder != null) {
!             holder.removeValueChangeListener(this);
!         }
!         this.selectableItemsHolder = holder;
!         if (this.selectableItemsHolder != null) {
!             doAdd(holder.getValue());
!             this.selectableItemsHolder.addValueChangeListener(this);
!         }
!     }
  
!     public Object getSelectedItem() {
!         if (selectedItemHolder != null) {
!             if (logger.isDebugEnabled()) {
!                 logger.debug("Returning selected item "
!                         + selectedItemHolder.getValue());
!             }
!             return selectedItemHolder.getValue();
!         }
!         else {
!             return super.getSelectedItem();
!         }
!     }
  
!     public void setSelectedItem(Object selectedItem) {
!         if (selectedItemHolder != null) {
!             if (logger.isDebugEnabled()) {
!                 logger.debug("Setting newly selected item on value holder to "
!                         + selectedItem);
!             }
!             selectedItemHolder.setValue(selectedItem);
!         }
!         else {
!             super.setSelectedItem(selectedItem);
!         }
!     }
  
!     public void valueChanged() {
!         if (logger.isDebugEnabled()) {
!             logger.debug("Backing collection of selectable items changed; "
!                     + "refreshing combo box with contents of new collection.");
!         }
!         doAdd(selectableItemsHolder.getValue());
!     }
  
!     private void doAdd(Object items) {
!         clear();
!         if (items != null) {
!             if (items instanceof Collection) {
!                 addAll((Collection)items);
!             }
!             else if (items instanceof Object[]) {
!                 Object[] itemsArray = (Object[])items;
!                 for (int i = 0; i < itemsArray.length; i++) {
!                     add(itemsArray[i]);
!                 }
!             }
!             else {
!                 throw new IllegalArgumentException(
!                         "selectableItemsHolder must hold a Collection or array");
!             }
!         }
!         sort();
!     }
  
  }
\ No newline at end of file
--- 30,146 ----
   * @author Keith Donald
   */
! public class DynamicComboBoxListModel extends ComboBoxListModel implements ValueChangeListener {
! 	private static final Log logger = LogFactory.getLog(DynamicComboBoxListModel.class);
  
! 	private ValueModel selectedItemHolder;
  
! 	private ValueModel selectableItemsHolder;
  
! 	public DynamicComboBoxListModel(ValueModel selectedItemHolder) {
! 		this(selectedItemHolder, (ValueModel)null);
! 	}
  
! 	public DynamicComboBoxListModel(ValueModel selectedItemHolder, List items) {
! 		this(selectedItemHolder, new ValueHolder(items));
! 	}
  
! 	public DynamicComboBoxListModel(final ValueModel selectedItemHolder, ValueModel selectableItemsHolder) {
! 		super();
! 		this.selectedItemHolder = selectedItemHolder;
! 		if (selectedItemHolder != null) {
! 			selectedItemHolder.addValueChangeListener(new ValueChangeListener() {
! 				public void valueChanged() {
! 					if (logger.isDebugEnabled()) {
! 						logger.debug("Notifying combo box view selected value changed; new value is '"
! 								+ selectedItemHolder.getValue() + "'");
! 					}
! 					if (selectedItemHolder.getValue() == null) {
! 						if (size() > 0 && get(0) != null) {
! 							if (logger.isDebugEnabled()) {
! 								logger.debug("Backing value model is null; Pre-setting initial value to first combo-box element "
! 										+ get(0));
! 							}
! 							setSelectedItem(get(0));
! 						}
! 					}
! 					else {
! 						if (logger.isDebugEnabled()) {
! 							logger.debug("Firing contents change event; selected item may have changed");
! 						}
! 						fireContentsChanged(this, -1, -1);
! 						if (logger.isDebugEnabled()) {
! 							logger.debug("Fired contents change event!");
! 						}
! 					}
! 				}
! 			});
! 		}
! 		setSelectableItemsHolder(selectableItemsHolder);
! 	}
  
! 	public void setSelectableItemsHolder(ValueModel holder) {
! 		if (this.selectableItemsHolder == holder) {
! 			return;
! 		}
! 		if (this.selectableItemsHolder != null) {
! 			holder.removeValueChangeListener(this);
! 		}
! 		this.selectableItemsHolder = holder;
! 		if (this.selectableItemsHolder != null) {
! 			doAdd(holder.getValue());
! 			this.selectableItemsHolder.addValueChangeListener(this);
! 		}
! 	}
  
! 	public Object getSelectedItem() {
! 		if (selectedItemHolder != null) {
! 			if (logger.isDebugEnabled()) {
! 				logger.debug("Returning selected item " + selectedItemHolder.getValue());
! 			}
! 			return selectedItemHolder.getValue();
! 		}
! 		else {
! 			return super.getSelectedItem();
! 		}
! 	}
  
! 	public void setSelectedItem(Object selectedItem) {
! 		if (selectedItemHolder != null) {
! 			if (logger.isDebugEnabled()) {
! 				logger.debug("Setting newly selected item on value holder to " + selectedItem);
! 			}
! 			selectedItemHolder.setValue(selectedItem);
! 		}
! 		else {
! 			super.setSelectedItem(selectedItem);
! 		}
! 	}
  
! 	public void valueChanged() {
! 		if (logger.isDebugEnabled()) {
! 			logger.debug("Backing collection of selectable items changed; "
! 					+ "refreshing combo box with contents of new collection.");
! 		}
! 		doAdd(selectableItemsHolder.getValue());
! 	}
  
! 	private void doAdd(Object items) {
! 		clear();
! 		if (items != null) {
! 			if (items instanceof Collection) {
! 				addAll((Collection)items);
! 			}
! 			else if (items instanceof Object[]) {
! 				Object[] itemsArray = (Object[])items;
! 				for (int i = 0; i < itemsArray.length; i++) {
! 					add(itemsArray[i]);
! 				}
! 			}
! 			else {
! 				throw new IllegalArgumentException("selectableItemsHolder must hold a Collection or array");
! 			}
! 		}
! 		sort();
! 	}
  
  }
\ No newline at end of file

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/form/builder
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4506/src/org/springframework/richclient/form/builder

Modified Files:
	GridBagLayoutFormBuilder.java 
Log Message:
Added appendLabeledField to GridBagLayoutBuilder

Index: GridBagLayoutFormBuilder.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/form/builder/GridBagLayoutFormBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GridBagLayoutFormBuilder.java	15 Oct 2004 22:18:18 -0000	1.3
--- GridBagLayoutFormBuilder.java	25 Oct 2004 21:51:31 -0000	1.4
***************
*** 16,84 ****
  package org.springframework.richclient.form.builder;
  
! import java.awt.GridBagLayout;
! import java.awt.Insets;
! 
! import javax.swing.JComponent;
! import javax.swing.JLabel;
! import javax.swing.JPanel;
! import javax.swing.SwingConstants;
  
- import org.springframework.enums.ShortCodedEnum;
  import org.springframework.richclient.factory.ComponentFactory;
  import org.springframework.richclient.forms.SwingFormModel;
  import org.springframework.richclient.layout.GridBagLayoutBuilder;
  import org.springframework.richclient.layout.LayoutBuilder;
  
  /**
!  * This provides an easy way to create panels using a {@link GridBagLayout}.
!  * <p />
!  * 
!  * Usage is:
!  * 
!  * <pre>
!  * GridBagLayoutBuilder builder = new GridBagLayoutBuilder();
!  * 
!  * builder.appendRightLabel(&quot;label.field1&quot;).appendField(field1);
!  * builder.appendRightLabel(&quot;label.field2&quot;).appendField(field2);
!  * builder.nextLine();
!  * 
!  * builder.appendRightLabel(&quot;label.field3&quot;).appendField(field3);
!  * // because &quot;field3&quot; is the last component on this line, but the panel has
!  * // 4 columns, &quot;field3&quot; will span 3 columns
!  * builder.nextLine();
!  * 
!  * // once everything's been put into the builder, ask it to build a panel
!  * // to use in the UI.
!  * JPanel panel = builder.getPanel();
!  * </pre>
!  * 
!  * @author Jim Moore
!  * @see #setAutoSpanLastComponent(boolean)
!  * @see #setShowGuidelines(boolean)
!  * @see #setComponentFactory(ComponentFactory)
   */
! public class GridBagLayoutFormBuilder extends AbstractFormBuilder implements
!         LayoutBuilder {
  
      private final GridBagLayoutBuilder builder;
  
-     public static final class LabelOrientation extends ShortCodedEnum {
-         public static final LabelOrientation TOP = new LabelOrientation(
-                 SwingConstants.TOP, "Top");
- 
-         public static final LabelOrientation BOTTOM = new LabelOrientation(
-                 SwingConstants.BOTTOM, "Bottom");
- 
-         public static final LabelOrientation LEFT = new LabelOrientation(
-                 SwingConstants.LEFT, "Left");
- 
-         public static final LabelOrientation RIGHT = new LabelOrientation(
-                 SwingConstants.RIGHT, "Right");
- 
-         private LabelOrientation(int code, String label) {
-             super(code, label);
-         }
-     }
- 
      public GridBagLayoutFormBuilder(SwingFormModel swingFormModel) {
          super(swingFormModel);
--- 16,35 ----
  package org.springframework.richclient.form.builder;
  
! import javax.swing.*;
  
  import org.springframework.richclient.factory.ComponentFactory;
  import org.springframework.richclient.forms.SwingFormModel;
  import org.springframework.richclient.layout.GridBagLayoutBuilder;
+ import org.springframework.richclient.layout.LabelOrientation;
  import org.springframework.richclient.layout.LayoutBuilder;
  
  /**
!  * @see GridBagLayoutBuilder
   */
! public class GridBagLayoutFormBuilder extends AbstractFormBuilder
!     implements LayoutBuilder {
  
      private final GridBagLayoutBuilder builder;
  
      public GridBagLayoutFormBuilder(SwingFormModel swingFormModel) {
          super(swingFormModel);
***************
*** 89,93 ****
       * Returns the underlying {@link GridBagLayoutBuilder}. Should be used with
       * caution.
!      * 
       * @return never null
       */
--- 40,44 ----
       * Returns the underlying {@link GridBagLayoutBuilder}. Should be used with
       * caution.
!      *
       * @return never null
       */
***************
*** 104,118 ****
       * Appends a label and field to the end of the current line.
       * <p />
!      * 
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      * 
!      * @param propertyName
!      *            the name of the property to create the controls for
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
--- 55,68 ----
       * Appends a label and field to the end of the current line.
       * <p />
!      *
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
***************
*** 125,146 ****
       * Appends a label and field to the end of the current line.
       * <p />
!      * 
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      * 
!      * @param propertyName
!      *            the name of the property to create the controls for
!      * @param colSpan
!      *            the number of columns the field should span
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!             int colSpan) {
          return appendLabeledField(propertyName, LabelOrientation.LEFT, colSpan);
      }
--- 75,94 ----
       * Appends a label and field to the end of the current line.
       * <p />
!      *
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      * @param colSpan      the number of columns the field should span
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!                                                        int colSpan) {
          return appendLabeledField(propertyName, LabelOrientation.LEFT, colSpan);
      }
***************
*** 149,168 ****
       * Appends a label and field to the end of the current line.
       * <p />
!      * 
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      * 
!      * @param propertyName
!      *            the name of the property to create the controls for
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!             LabelOrientation labelOrientation) {
          return appendLabeledField(propertyName, labelOrientation, 1);
      }
--- 97,115 ----
       * Appends a label and field to the end of the current line.
       * <p />
!      *
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!                                                        LabelOrientation labelOrientation) {
          return appendLabeledField(propertyName, labelOrientation, 1);
      }
***************
*** 171,196 ****
       * Appends a label and field to the end of the current line.
       * <p />
!      * 
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      * 
!      * @param propertyName
!      *            the name of the property to create the controls for
!      * @param colSpan
!      *            the number of columns the field should span
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!             LabelOrientation labelOrientation, int colSpan) {
          final JComponent field = getDefaultComponent(propertyName);
  
          return appendLabeledField(propertyName, field, labelOrientation,
!                 colSpan);
      }
  
--- 118,142 ----
       * Appends a label and field to the end of the current line.
       * <p />
!      *
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      * @param colSpan      the number of columns the field should span
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!                                                        LabelOrientation labelOrientation,
!                                                        int colSpan) {
          final JComponent field = getDefaultComponent(propertyName);
  
          return appendLabeledField(propertyName, field, labelOrientation,
!             colSpan);
      }
  
***************
*** 198,217 ****
       * Appends a label and field to the end of the current line.
       * <p />
!      * 
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      * 
!      * @param propertyName
!      *            the name of the property to create the controls for
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!             final JComponent field, LabelOrientation labelOrientation) {
          return appendLabeledField(propertyName, field, labelOrientation, 1);
      }
--- 144,163 ----
       * Appends a label and field to the end of the current line.
       * <p />
!      *
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see SwingFormModel#createLabel(String)
       * @see SwingFormModel#createBoundControl(String)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!                                                        final JComponent field,
!                                                        LabelOrientation labelOrientation) {
          return appendLabeledField(propertyName, field, labelOrientation, 1);
      }
***************
*** 220,244 ****
       * Appends a label and field to the end of the current line.
       * <p />
!      * 
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      * 
!      * @param propertyName
!      *            the name of the property to create the controls for
!      * @param colSpan
!      *            the number of columns the field should span
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see SwingFormModel#createLabel(String)
       * @see FormComponentInterceptor#processLabel(String, JComponent)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!             final JComponent field, LabelOrientation labelOrientation,
!             int colSpan) {
          return appendLabeledField(propertyName, field, labelOrientation,
!                 colSpan, 1, true, false);
      }
  
--- 166,188 ----
       * Appends a label and field to the end of the current line.
       * <p />
!      *
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      * @param colSpan      the number of columns the field should span
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see SwingFormModel#createLabel(String)
       * @see FormComponentInterceptor#processLabel(String, JComponent)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!                                                        final JComponent field, LabelOrientation labelOrientation,
!                                                        int colSpan) {
          return appendLabeledField(propertyName, field, labelOrientation,
!             colSpan, 1, true, false);
      }
  
***************
*** 246,300 ****
       * Appends a label and field to the end of the current line.
       * <p />
!      * 
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      * 
!      * @param propertyName
!      *            the name of the property to create the controls for
!      * @param colSpan
!      *            the number of columns the field should span
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see SwingFormModel#createLabel(String)
       * @see FormComponentInterceptor#processLabel(String, JComponent)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!             final JComponent field, LabelOrientation labelOrientation,
!             int colSpan, int rowSpan, boolean expandX, boolean expandY) {
!         final JLabel label = getLabelFor(propertyName, field);
! 
!         if (labelOrientation == LabelOrientation.LEFT
!                 || labelOrientation == null) {
!             label.setHorizontalAlignment(JLabel.RIGHT);
!             builder.appendLabel(label).append(field, colSpan, rowSpan, expandX,
!                     expandY);
!         }
!         else if (labelOrientation == LabelOrientation.RIGHT) {
!             label.setHorizontalAlignment(JLabel.LEFT);
!             builder.append(field, colSpan, rowSpan, expandX, expandY)
!                     .appendLabel(label);
!         }
!         else if (labelOrientation == LabelOrientation.TOP) {
!             label.setHorizontalAlignment(JLabel.LEFT);
!             final int col = builder.getCurrentCol();
!             final int row = builder.getCurrentRow();
!             final Insets insets = builder.getDefaultInsets();
!             builder.append(label, col, row, colSpan, 1, false, expandY, insets)
!                     .append(field, col, row + 1, colSpan, rowSpan, expandX,
!                             expandY, insets);
!         }
!         else if (labelOrientation == LabelOrientation.BOTTOM) {
!             label.setHorizontalAlignment(JLabel.LEFT);
!             final int col = builder.getCurrentCol();
!             final int row = builder.getCurrentRow();
!             final Insets insets = builder.getDefaultInsets();
!             builder.append(field, col, row, colSpan, rowSpan, expandX, expandY,
!                     insets).append(label, col, row + rowSpan, colSpan, 1,
!                     false, expandY, insets);
!         }
! 
          return this;
      }
--- 190,216 ----
       * Appends a label and field to the end of the current line.
       * <p />
!      *
       * The label will be to the left of the field, and be right-justified.
       * <br />
       * The field will "grow" horizontally as space allows.
       * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      * @param colSpan      the number of columns the field should span
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see SwingFormModel#createLabel(String)
       * @see FormComponentInterceptor#processLabel(String, JComponent)
       */
      public GridBagLayoutFormBuilder appendLabeledField(String propertyName,
!                                                        final JComponent field,
!                                                        LabelOrientation labelOrientation,
!                                                        int colSpan,
!                                                        int rowSpan,
!                                                        boolean expandX,
!                                                        boolean expandY) {
!         builder.appendLabeledField(propertyName, field, labelOrientation,
!             colSpan, rowSpan, expandX, expandY);
          return this;
      }
***************
*** 303,307 ****
       * Appends a seperator (usually a horizonal line). Has an implicit
       * {@link #nextLine()}before and after it.
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 219,223 ----
       * Appends a seperator (usually a horizonal line). Has an implicit
       * {@link #nextLine()}before and after it.
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 316,320 ****
       * bundle for the text to put along with the seperator. Has an implicit
       * {@link #nextLine()}before and after it.
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 232,236 ----
       * bundle for the text to put along with the seperator. Has an implicit
       * {@link #nextLine()}before and after it.
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 326,330 ****
      /**
       * Ends the current line and starts a new one
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 242,246 ----
      /**
       * Ends the current line and starts a new one
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 344,348 ****
       * Creates and returns a JPanel with all the given components in it, using
       * the "hints" that were provided to the builder.
!      * 
       * @return a new JPanel with the components laid-out in it
       */
--- 260,264 ----
       * Creates and returns a JPanel with all the given components in it, using
       * the "hints" that were provided to the builder.
!      *
       * @return a new JPanel with the components laid-out in it
       */
***************
*** 358,360 ****
      }
  
! }
\ No newline at end of file
--- 274,276 ----
      }
  
! }

Update of /cvsroot/spring-rich-c/spring-richclient/test/org/springframework/richclient/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4506/test/org/springframework/richclient/layout

Added Files:
	GridBagLayoutBuilderTests.java 
Removed Files:
	TestGridBagLayoutBuilder.java 
Log Message:
Added appendLabeledField to GridBagLayoutBuilder

--- TestGridBagLayoutBuilder.java DELETED ---

--- NEW FILE: GridBagLayoutBuilderTests.java ---
/*
 * Copyright 2002-2004 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License"); you may not
 * use this file except in compliance with the License. You may obtain a copy of
 * the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 * License for the specific language governing permissions and limitations under
 * the License.
 */
package org.springframework.richclient.layout;

import java.awt.*;

import javax.swing.*;

import junit.framework.TestCase;

public class GridBagLayoutBuilderTests extends TestCase {
//    static {
//        Logger.getLogger(GridBagLayoutBuilder.class).setLevel(Level.DEBUG);
//    }

    public void testAppend1() throws Exception {
        GridBagLayoutBuilder builder = new GridBagLayoutBuilder();
        builder.append(new JPanel());
        builder.append(new JPanel(), 2, 2);
        builder.append(new JPanel());
        builder.nextLine();
        builder.append(new JPanel()).
            append(new JPanel()).nextLine();
        builder.append(new JPanel()).
            append(new JPanel()).
            append(new JPanel()).
            append(new JPanel()).nextLine();

        JPanel panel = builder.getPanel();
        final Component[] comps = panel.getComponents();
        final GridBagLayout layout = ((GridBagLayout)panel.getLayout());

        check(layout.getConstraints(comps[0]), 0, 0, 1, 1);
        check(layout.getConstraints(comps[1]), 1, 0, 2, 2);
        check(layout.getConstraints(comps[2]), 3, 0, 1, 1);
        check(layout.getConstraints(comps[3]), 0, 1, 1, 1);
        check(layout.getConstraints(comps[4]), 3, 1, 1, 1);
        check(layout.getConstraints(comps[5]), 0, 2, 1, 1);
        check(layout.getConstraints(comps[6]), 1, 2, 1, 1);
        check(layout.getConstraints(comps[7]), 2, 2, 1, 1);
        check(layout.getConstraints(comps[8]), 3, 2, 1, 1);
    }

    public void testAppend2() throws Exception {
        GridBagLayoutBuilder builder = new GridBagLayoutBuilder();
        builder.append(new JPanel()).
            append(new JPanel(), 2, 1).
            append(new JPanel()).nextLine();
        builder.append(new JPanel()).
            append(new JPanel()).
            append(new JPanel()).
            append(new JPanel()).nextLine();

        JPanel panel = builder.getPanel();
        final Component[] comps = panel.getComponents();
        final GridBagLayout layout = ((GridBagLayout)panel.getLayout());

        check(layout.getConstraints(comps[0]), 0, 0, 1, 1);
        check(layout.getConstraints(comps[1]), 1, 0, 2, 1);
        check(layout.getConstraints(comps[2]), 3, 0, 1, 1);
        check(layout.getConstraints(comps[3]), 0, 1, 1, 1);
        check(layout.getConstraints(comps[4]), 1, 1, 1, 1);
        check(layout.getConstraints(comps[5]), 2, 1, 1, 1);
        check(layout.getConstraints(comps[6]), 3, 1, 1, 1);
    }

    private void check(GridBagConstraints gbc, final int x, final int y,
                       final int width, final int height) {
        assertEquals(x, gbc.gridx);
        assertEquals(y, gbc.gridy);
        assertEquals(width, gbc.gridwidth);
        assertEquals(height, gbc.gridheight);
    }

    public void testAppendLabeledField() throws Exception {
        GridBagLayoutBuilder builder = new GridBagLayoutBuilder();

        builder.appendLabeledField(new JLabel("0"), new JLabel("3"),
            LabelOrientation.TOP, 1, 2, true, false);
        builder.appendLabeledField(new JLabel("1"), new JLabel("2"),
            LabelOrientation.LEFT, 2, 1, true, false);
        builder.nextLine();

        builder.appendLabeledField(new JLabel("5"), new JLabel("4"),
            LabelOrientation.BOTTOM, 3, 1, true, false);
        builder.nextLine();
        builder.nextLine();

        builder.appendLabeledField(new JLabel("7"), new JLabel("6"),
            LabelOrientation.RIGHT, 3, 1, true, false);
        builder.nextLine();

        JPanel panel = builder.getPanel();
        final Component[] comps = panel.getComponents();
        final GridBagLayout layout = ((GridBagLayout)panel.getLayout());

        check(layout.getConstraints(comps[0]), 0, 0, 1, 1);
        check(layout.getConstraints(comps[1]), 1, 0, 1, 1);
        check(layout.getConstraints(comps[2]), 2, 0, 2, 1);
        check(layout.getConstraints(comps[3]), 0, 1, 1, 2);
        check(layout.getConstraints(comps[4]), 1, 1, 3, 1);
        check(layout.getConstraints(comps[5]), 1, 2, 3, 1);
        check(layout.getConstraints(comps[6]), 0, 3, 3, 1);
        check(layout.getConstraints(comps[7]), 3, 3, 1, 1);
    }

}

Update of /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4506/src/org/springframework/richclient/layout

Modified Files:
	GridBagLayoutBuilder.java 
Added Files:
	LabelOrientation.java 
Log Message:
Added appendLabeledField to GridBagLayoutBuilder

Index: GridBagLayoutBuilder.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/src/org/springframework/richclient/layout/GridBagLayoutBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GridBagLayoutBuilder.java	15 Oct 2004 22:18:28 -0000	1.3
--- GridBagLayoutBuilder.java	25 Oct 2004 21:51:32 -0000	1.4
***************
*** 16,29 ****
  package org.springframework.richclient.layout;
  
! import java.awt.Component;
! import java.awt.GridBagConstraints;
! import java.awt.GridBagLayout;
! import java.awt.Insets;
  import java.util.ArrayList;
  import java.util.List;
  
! import javax.swing.JComponent;
! import javax.swing.JLabel;
! import javax.swing.JPanel;
  
  import org.apache.commons.logging.Log;
--- 16,24 ----
  package org.springframework.richclient.layout;
  
! import java.awt.*;
  import java.util.ArrayList;
  import java.util.List;
  
! import javax.swing.*;
  
  import org.apache.commons.logging.Log;
***************
*** 36,59 ****
   * This provides an easy way to create panels using a {@link GridBagLayout}.
   * <p />
!  * 
   * Usage is:
!  * 
   * <pre>
   * GridBagLayoutBuilder builder = new GridBagLayoutBuilder();
!  * 
   * builder.appendRightLabel(&quot;label.field1&quot;).appendField(field1);
   * builder.appendRightLabel(&quot;label.field2&quot;).appendField(field2);
   * builder.nextLine();
!  * 
   * builder.appendRightLabel(&quot;label.field3&quot;).appendField(field3);
   * // because &quot;field3&quot; is the last component on this line, but the panel has
   * // 4 columns, &quot;field3&quot; will span 3 columns
   * builder.nextLine();
!  * 
   * // once everything's been put into the builder, ask it to build a panel
   * // to use in the UI.
   * JPanel panel = builder.getPanel();
   * </pre>
!  * 
   * @author Jim Moore
   * @see #setAutoSpanLastComponent(boolean)
--- 31,54 ----
   * This provides an easy way to create panels using a {@link GridBagLayout}.
   * <p />
!  *
   * Usage is:
!  *
   * <pre>
   * GridBagLayoutBuilder builder = new GridBagLayoutBuilder();
!  *
   * builder.appendRightLabel(&quot;label.field1&quot;).appendField(field1);
   * builder.appendRightLabel(&quot;label.field2&quot;).appendField(field2);
   * builder.nextLine();
!  *
   * builder.appendRightLabel(&quot;label.field3&quot;).appendField(field3);
   * // because &quot;field3&quot; is the last component on this line, but the panel has
   * // 4 columns, &quot;field3&quot; will span 3 columns
   * builder.nextLine();
!  *
   * // once everything's been put into the builder, ask it to build a panel
   * // to use in the UI.
   * JPanel panel = builder.getPanel();
   * </pre>
!  *
   * @author Jim Moore
   * @see #setAutoSpanLastComponent(boolean)
***************
*** 63,67 ****
  public class GridBagLayoutBuilder implements LayoutBuilder {
      private static final Log LOG = LogFactory
!             .getLog(GridBagLayoutBuilder.class);
  
      private Insets defaultInsets = new Insets(0, 0, 4, 4);
--- 58,62 ----
  public class GridBagLayoutBuilder implements LayoutBuilder {
      private static final Log LOG = LogFactory
!         .getLog(GridBagLayoutBuilder.class);
  
      private Insets defaultInsets = new Insets(0, 0, 4, 4);
***************
*** 141,148 ****
       * Appends the given component to the end of the current line, using the
       * default insets and no expansion
!      * 
!      * @param component
!      *            the component to add to the current line
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 136,142 ----
       * Appends the given component to the end of the current line, using the
       * default insets and no expansion
!      *
!      * @param component the component to add to the current line
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 154,169 ****
       * Appends the given component to the end of the current line, using the
       * default insets and no expansion
!      * 
!      * @param component
!      *            the component to add to the current line
!      * @param colSpan
!      *            the number of columns to span
!      * @param rowSpan
!      *            the number of rows to span
!      * 
       * @return "this" to make it easier to string together append calls
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!             int rowSpan) {
          return append(component, colSpan, rowSpan, 0.0, 0.0);
      }
--- 148,160 ----
       * Appends the given component to the end of the current line, using the
       * default insets and no expansion
!      *
!      * @param component the component to add to the current line
!      * @param colSpan   the number of columns to span
!      * @param rowSpan   the number of rows to span
!      *
       * @return "this" to make it easier to string together append calls
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!                                        int rowSpan) {
          return append(component, colSpan, rowSpan, 0.0, 0.0);
      }
***************
*** 172,215 ****
       * Appends the given component to the end of the current line, using the
       * default insets
!      * 
!      * @param component
!      *            the component to add to the current line
!      * @param colSpan
!      *            the number of columns to span
!      * @param rowSpan
!      *            the number of rows to span
!      * @param expandX
!      *            should the component "grow" horrizontally?
!      * @param expandY
!      *            should the component "grow" vertically?
!      * 
       * @return "this" to make it easier to string together append calls
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!             int rowSpan, boolean expandX, boolean expandY) {
          return append(component, colSpan, rowSpan, expandX, expandY,
!                 defaultInsets);
      }
  
      /**
       * Appends the given component to the end of the current line
!      * 
!      * @param component
!      *            the component to add to the current line
!      * @param colSpan
!      *            the number of columns to span
!      * @param rowSpan
!      *            the number of rows to span
!      * @param expandX
!      *            should the component "grow" horrizontally?
!      * @param expandY
!      *            should the component "grow" vertically?
!      * @param insets
!      *            the insets to use for this component
!      * 
       * @return "this" to make it easier to string together append calls
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!             int rowSpan, boolean expandX, boolean expandY, Insets insets) {
          if (expandX && expandY)
              return append(component, colSpan, rowSpan, 1.0, 1.0, insets);
--- 163,197 ----
       * Appends the given component to the end of the current line, using the
       * default insets
!      *
!      * @param component the component to add to the current line
!      * @param colSpan   the number of columns to span
!      * @param rowSpan   the number of rows to span
!      * @param expandX   should the component "grow" horrizontally?
!      * @param expandY   should the component "grow" vertically?
!      *
       * @return "this" to make it easier to string together append calls
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!                                        int rowSpan, boolean expandX,
!                                        boolean expandY) {
          return append(component, colSpan, rowSpan, expandX, expandY,
!             defaultInsets);
      }
  
      /**
       * Appends the given component to the end of the current line
!      *
!      * @param component the component to add to the current line
!      * @param colSpan   the number of columns to span
!      * @param rowSpan   the number of rows to span
!      * @param expandX   should the component "grow" horrizontally?
!      * @param expandY   should the component "grow" vertically?
!      * @param insets    the insets to use for this component
!      *
       * @return "this" to make it easier to string together append calls
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!                                        int rowSpan, boolean expandX,
!                                        boolean expandY, Insets insets) {
          if (expandX && expandY)
              return append(component, colSpan, rowSpan, 1.0, 1.0, insets);
***************
*** 224,250 ****
      /**
       * Appends the given component to the end of the current line
!      * 
!      * @param component
!      *            the component to add to the current line
!      * @param x
!      *            the column to put the component
!      * @param y
!      *            the row to put the component
!      * @param colSpan
!      *            the number of columns to span
!      * @param rowSpan
!      *            the number of rows to span
!      * @param expandX
!      *            should the component "grow" horrizontally?
!      * @param expandY
!      *            should the component "grow" vertically?
!      * @param insets
!      *            the insets to use for this component
!      * 
       * @return "this" to make it easier to string together append calls
       */
      public GridBagLayoutBuilder append(Component component, int x, int y,
!             int colSpan, int rowSpan, boolean expandX, boolean expandY,
!             Insets insets) {
          if (expandX && expandY)
              return append(component, x, y, colSpan, rowSpan, 1.0, 1.0, insets);
--- 206,224 ----
      /**
       * Appends the given component to the end of the current line
!      *
!      * @param component the component to add to the current line
!      * @param x         the column to put the component
!      * @param y         the row to put the component
!      * @param colSpan   the number of columns to span
!      * @param rowSpan   the number of rows to span
!      * @param expandX   should the component "grow" horrizontally?
!      * @param expandY   should the component "grow" vertically?
!      * @param insets    the insets to use for this component
!      *
       * @return "this" to make it easier to string together append calls
       */
      public GridBagLayoutBuilder append(Component component, int x, int y,
!                                        int colSpan, int rowSpan, boolean expandX, boolean expandY,
!                                        Insets insets) {
          if (expandX && expandY)
              return append(component, x, y, colSpan, rowSpan, 1.0, 1.0, insets);
***************
*** 260,341 ****
       * Appends the given component to the end of the current line, using the
       * default insets
!      * 
!      * @param component
!      *            the component to add to the current line
!      * @param colSpan
!      *            the number of columns to span
!      * @param rowSpan
!      *            the number of rows to span
!      * @param xweight
!      *            the "growth weight" horrizontally
!      * @param yweight
!      *            the "growth weight" horrizontally
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see GridBagConstraints#weightx
       * @see GridBagConstraints#weighty
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!             int rowSpan, double xweight, double yweight) {
          return append(component, colSpan, rowSpan, xweight, yweight,
!                 defaultInsets);
      }
  
      /**
       * Appends the given component to the end of the current line
!      * 
!      * @param component
!      *            the component to add to the current line
!      * @param colSpan
!      *            the number of columns to span
!      * @param rowSpan
!      *            the number of rows to span
!      * @param xweight
!      *            the "growth weight" horrizontally
!      * @param yweight
!      *            the "growth weight" horrizontally
!      * @param insets
!      *            the insets to use for this component
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see GridBagConstraints#weightx
       * @see GridBagConstraints#weighty
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!             int rowSpan, double xweight, double yweight, Insets insets) {
          return append(component, getCurrentCol(), getCurrentRow(), colSpan,
!                 rowSpan, xweight, yweight, insets);
      }
  
      /**
       * Appends the given component to the end of the current line
!      * 
!      * @param component
!      *            the component to add to the current line
!      * @param x
!      *            the column to put the component
!      * @param y
!      *            the row to put the component
!      * @param colSpan
!      *            the number of columns to span
!      * @param rowSpan
!      *            the number of rows to span
!      * @param xweight
!      *            the "growth weight" horrizontally
!      * @param yweight
!      *            the "growth weight" horrizontally
!      * @param insets
!      *            the insets to use for this component
!      * 
       * @return "this" to make it easier to string together append calls
!      * 
       * @see GridBagConstraints#weightx
       * @see GridBagConstraints#weighty
       */
      public GridBagLayoutBuilder append(Component component, int x, int y,
!             int colSpan, int rowSpan, double xweight, double yweight,
!             Insets insets) {
          final List rowList = getRow(y);
          ensureCapacity(rowList, Math.max(x, maxCol) + 1);
--- 234,413 ----
       * Appends the given component to the end of the current line, using the
       * default insets
!      *
!      * @param component the component to add to the current line
!      * @param colSpan   the number of columns to span
!      * @param rowSpan   the number of rows to span
!      * @param xweight   the "growth weight" horrizontally
!      * @param yweight   the "growth weight" horrizontally
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see GridBagConstraints#weightx
       * @see GridBagConstraints#weighty
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!                                        int rowSpan, double xweight,
!                                        double yweight) {
          return append(component, colSpan, rowSpan, xweight, yweight,
!             defaultInsets);
      }
  
      /**
       * Appends the given component to the end of the current line
!      *
!      * @param component the component to add to the current line
!      * @param colSpan   the number of columns to span
!      * @param rowSpan   the number of rows to span
!      * @param xweight   the "growth weight" horrizontally
!      * @param yweight   the "growth weight" horrizontally
!      * @param insets    the insets to use for this component
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see GridBagConstraints#weightx
       * @see GridBagConstraints#weighty
       */
      public GridBagLayoutBuilder append(Component component, int colSpan,
!                                        int rowSpan, double xweight,
!                                        double yweight, Insets insets) {
          return append(component, getCurrentCol(), getCurrentRow(), colSpan,
!             rowSpan, xweight, yweight, insets);
!     }
! 
!     /**
!      * Appends a label and field to the end of the current line.
!      * <p />
!      *
!      * The label will be to the left of the field, and be right-justified.
!      * <br />
!      * The field will "grow" horizontally as space allows.
!      * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      *
!      * @return "this" to make it easier to string together append calls
!      */
!     public GridBagLayoutBuilder appendLabeledField(String propertyName,
!                                                    final JComponent field,
!                                                    LabelOrientation labelOrientation) {
!         return appendLabeledField(propertyName, field, labelOrientation, 1);
!     }
! 
!     /**
!      * Appends a label and field to the end of the current line.
!      * <p />
!      *
!      * The label will be to the left of the field, and be right-justified.
!      * <br />
!      * The field will "grow" horizontally as space allows.
!      * <p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      * @param colSpan      the number of columns the field should span
!      *
!      * @return "this" to make it easier to string together append calls
!      */
!     public GridBagLayoutBuilder appendLabeledField(String propertyName,
!                                                    final JComponent field, LabelOrientation labelOrientation,
!                                                    int colSpan) {
!         return appendLabeledField(propertyName, field, labelOrientation,
!             colSpan, 1, true, false);
!     }
! 
!     /**
!      * Appends a label and field to the end of the current line.<p />
!      *
!      * The label will be to the left of the field, and be right-justified.<br />
!      * The field will "grow" horizontally as space allows.<p />
!      *
!      * @param propertyName the name of the property to create the controls for
!      * @param colSpan      the number of columns the field should span
!      *
!      * @return "this" to make it easier to string together append calls
!      */
!     public GridBagLayoutBuilder appendLabeledField(String propertyName,
!                                                    final JComponent field,
!                                                    LabelOrientation labelOrientation,
!                                                    int colSpan,
!                                                    int rowSpan,
!                                                    boolean expandX,
!                                                    boolean expandY) {
!         final JLabel label = getComponentFactory().createLabel(propertyName);
!         return appendLabeledField(label, field, labelOrientation,
!             colSpan, rowSpan, expandX, expandY);
!     }
! 
!     /**
!      * Appends a label and field to the end of the current line.<p />
!      *
!      * The label will be to the left of the field, and be right-justified.<br />
!      * The field will "grow" horizontally as space allows.<p />
!      *
!      * @param label   the label to associate and layout with the field
!      * @param colSpan the number of columns the field should span
!      *
!      * @return "this" to make it easier to string together append calls
!      */
!     public GridBagLayoutBuilder appendLabeledField(final JLabel label,
!                                                    final JComponent field,
!                                                    LabelOrientation labelOrientation,
!                                                    int colSpan,
!                                                    int rowSpan,
!                                                    boolean expandX,
!                                                    boolean expandY) {
!         label.setLabelFor(field);
! 
!         final int col = getCurrentCol();
!         final int row = getCurrentRow();
!         final Insets insets = getDefaultInsets();
! 
!         if (labelOrientation == LabelOrientation.LEFT
!             || labelOrientation == null) {
!             label.setHorizontalAlignment(JLabel.RIGHT);
!             append(label, col, row, 1, 1, false, expandY, insets);
!             append(field, col + 1, row, colSpan, rowSpan, expandX, expandY,
!                 insets);
!         }
!         else if (labelOrientation == LabelOrientation.RIGHT) {
!             label.setHorizontalAlignment(JLabel.LEFT);
!             append(field, col, row, colSpan, rowSpan, expandX, expandY, insets);
!             append(label, col + colSpan, row, 1, rowSpan, false, expandY, insets);
!         }
!         else if (labelOrientation == LabelOrientation.TOP) {
!             label.setHorizontalAlignment(JLabel.LEFT);
!             append(label, col, row, colSpan, 1, false, expandY, insets);
!             append(field, col, row + 1, colSpan, rowSpan, expandX,
!                 expandY, insets);
!         }
!         else if (labelOrientation == LabelOrientation.BOTTOM) {
!             label.setHorizontalAlignment(JLabel.LEFT);
!             append(field, col, row, colSpan, rowSpan, expandX, expandY, insets);
!             append(label, col, row + rowSpan, colSpan, 1, false, expandY,
!                 insets);
!         }
! 
!         return this;
      }
  
      /**
       * Appends the given component to the end of the current line
!      *
!      * @param component the component to add to the current line
!      * @param x         the column to put the component
!      * @param y         the row to put the component
!      * @param colSpan   the number of columns to span
!      * @param rowSpan   the number of rows to span
!      * @param xweight   the "growth weight" horrizontally
!      * @param yweight   the "growth weight" horrizontally
!      * @param insets    the insets to use for this component
!      *
       * @return "this" to make it easier to string together append calls
!      *
       * @see GridBagConstraints#weightx
       * @see GridBagConstraints#weighty
       */
      public GridBagLayoutBuilder append(Component component, int x, int y,
!                                        int colSpan, int rowSpan, double xweight, double yweight,
!                                        Insets insets) {
          final List rowList = getRow(y);
          ensureCapacity(rowList, Math.max(x, maxCol) + 1);
***************
*** 346,357 ****
  
          final GridBagConstraints gbc = createGridBagConstraint(col, y, colSpan,
!                 rowSpan, xweight, yweight, insets);
  
          rowList.set(col, new Item(component, gbc));
  
          // keep track of the largest column this has seen...
          this.maxCol = Math.max(this.maxCol, col);
  
!         currentCol += colSpan;
  
          return this;
--- 418,430 ----
  
          final GridBagConstraints gbc = createGridBagConstraint(col, y, colSpan,
!             rowSpan, xweight, yweight, insets);
  
          rowList.set(col, new Item(component, gbc));
+         if (LOG.isDebugEnabled()) LOG.debug(getDebugString(component, gbc));
  
          // keep track of the largest column this has seen...
          this.maxCol = Math.max(this.maxCol, col);
  
!         currentCol = col + colSpan;
  
          return this;
***************
*** 359,363 ****
  
      private void insertPlaceholdersIfNeeded(final int rowSpan, final int y,
!             final int col, final Component component, final int colSpan) {
          if (rowSpan > 1) {
              growRowsIfNeeded(rowSpan);
--- 432,438 ----
  
      private void insertPlaceholdersIfNeeded(final int rowSpan, final int y,
!                                             final int col,
!                                             final Component component,
!                                             final int colSpan) {
          if (rowSpan > 1) {
              growRowsIfNeeded(rowSpan);
***************
*** 367,373 ****
                  if (row.get(col) != null) {
                      // sanity check -- shouldn't ever happen
!                     throw new IllegalStateException(
!                             "Trying to overwrite another component: "
!                                     + component + ", " + col + " " + y);
                  }
                  for (int j = 0; j < colSpan; j++) {
--- 442,447 ----
                  if (row.get(col) != null) {
                      // sanity check -- shouldn't ever happen
!                     throw new IllegalStateException("Trying to overwrite another component: "
!                         + component + ", " + col + " " + y);
                  }
                  for (int j = 0; j < colSpan; j++) {
***************
*** 390,394 ****
      private int bypassPlaceholders(final List list, final int col) {
          int theCol = col;
!         while (theCol < list.size() && list.get(theCol) == NULL_ITEM) {
              theCol++;
          }
--- 464,468 ----
      private int bypassPlaceholders(final List list, final int col) {
          int theCol = col;
!         while (theCol < list.size() && list.get(theCol) != null) {
              theCol++;
          }
***************
*** 417,424 ****
       * Appends the given label to the end of the current line. The label does
       * not "grow."
!      * 
!      * @param label
!      *            the label to append
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 491,497 ----
       * Appends the given label to the end of the current line. The label does
       * not "grow."
!      *
!      * @param label the label to append
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 430,439 ****
       * Appends the given label to the end of the current line. The label does
       * not "grow."
!      * 
!      * @param label
!      *            the label to append
!      * @param colSpan
!      *            the number of columns to span
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 503,510 ----
       * Appends the given label to the end of the current line. The label does
       * not "grow."
!      *
!      * @param label   the label to append
!      * @param colSpan the number of columns to span
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 447,455 ****
       * {@link #setComponentFactory(ComponentFactory) ComponentFactory's}message
       * bundle for the text to use.
!      * 
!      * @param labelKey
!      *            the key into the message bundle; if not found the key is used
!      *            as the text to display
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 518,525 ----
       * {@link #setComponentFactory(ComponentFactory) ComponentFactory's}message
       * bundle for the text to use.
!      *
!      * @param labelKey the key into the message bundle; if not found the key is used
!      *                 as the text to display
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 463,473 ****
       * {@link #setComponentFactory(ComponentFactory) ComponentFactory's}message
       * bundle for the text to use.
!      * 
!      * @param labelKey
!      *            the key into the message bundle; if not found the key is used
!      *            as the text to display
!      * @param colSpan
!      *            the number of columns to span
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 533,541 ----
       * {@link #setComponentFactory(ComponentFactory) ComponentFactory's}message
       * bundle for the text to use.
!      *
!      * @param labelKey the key into the message bundle; if not found the key is used
!      *                 as the text to display
!      * @param colSpan  the number of columns to span
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 483,491 ****
       * {@link #setComponentFactory(ComponentFactory) ComponentFactory's}message
       * bundle for the text to use.
!      * 
!      * @param labelKey
!      *            the key into the message bundle; if not found the key is used
!      *            as the text to display
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 551,558 ----
       * {@link #setComponentFactory(ComponentFactory) ComponentFactory's}message
       * bundle for the text to use.
!      *
!      * @param labelKey the key into the message bundle; if not found the key is used
!      *                 as the text to display
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 499,509 ****
       * {@link #setComponentFactory(ComponentFactory) ComponentFactory's}message
       * bundle for the text to use.
!      * 
!      * @param labelKey
!      *            the key into the message bundle; if not found the key is used
!      *            as the text to display
!      * @param colSpan
!      *            the number of columns to span
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 566,574 ----
       * {@link #setComponentFactory(ComponentFactory) ComponentFactory's}message
       * bundle for the text to use.
!      *
!      * @param labelKey the key into the message bundle; if not found the key is used
!      *                 as the text to display
!      * @param colSpan  the number of columns to span
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 517,524 ****
       * Appends the given component to the end of the current line. The component
       * will "grow" horizontally as space allows.
!      * 
!      * @param component
!      *            the item to append
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 582,588 ----
       * Appends the given component to the end of the current line. The component
       * will "grow" horizontally as space allows.
!      *
!      * @param component the item to append
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 530,539 ****
       * Appends the given component to the end of the current line. The component
       * will "grow" horizontally as space allows.
!      * 
!      * @param component
!      *            the item to append
!      * @param colSpan
!      *            the number of columns to span
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 594,601 ----
       * Appends the given component to the end of the current line. The component
       * will "grow" horizontally as space allows.
!      *
!      * @param component the item to append
!      * @param colSpan   the number of columns to span
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 545,549 ****
       * Appends a seperator (usually a horizonal line). Has an implicit
       * {@link #nextLine()}before and after it.
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 607,611 ----
       * Appends a seperator (usually a horizonal line). Has an implicit
       * {@link #nextLine()}before and after it.
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 558,562 ****
       * bundle for the text to put along with the seperator. Has an implicit
       * {@link #nextLine()}before and after it.
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 620,624 ----
       * bundle for the text to put along with the seperator. Has an implicit
       * {@link #nextLine()}before and after it.
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 565,570 ****
              nextLine();
          }
!         final JComponent separator = getComponentFactory()
!                 .createLabeledSeparator(labelKey);
          return append(separator, 1, 1, true, false).nextLine();
      }
--- 627,632 ----
              nextLine();
          }
!         final JComponent separator =
!             getComponentFactory().createLabeledSeparator(labelKey);
          return append(separator, 1, 1, true, false).nextLine();
      }
***************
*** 572,576 ****
      /**
       * Ends the current line and starts a new one
!      * 
       * @return "this" to make it easier to string together append calls
       */
--- 634,638 ----
      /**
       * Ends the current line and starts a new one
!      *
       * @return "this" to make it easier to string together append calls
       */
***************
*** 583,588 ****
  
      private GridBagConstraints createGridBagConstraint(int x, int y,
!             int colSpan, int rowSpan, double xweight, double yweight,
!             Insets insets) {
          final GridBagConstraints gbc = new GridBagConstraints();
          gbc.gridx = x;
--- 645,650 ----
  
      private GridBagConstraints createGridBagConstraint(int x, int y,
!                                                        int colSpan, int rowSpan, double xweight, double yweight,
!                                                        Insets insets) {
          final GridBagConstraints gbc = new GridBagConstraints();
          gbc.gridx = x;
***************
*** 610,614 ****
       * Creates and returns a JPanel with all the given components in it, using
       * the "hints" that were provided to the builder.
!      * 
       * @return a new JPanel with the components laid-out in it
       */
--- 672,676 ----
       * Creates and returns a JPanel with all the given components in it, using
       * the "hints" that were provided to the builder.
!      *
       * @return a new JPanel with the components laid-out in it
       */
***************
*** 619,623 ****
  
          final JPanel panel = this.showGuidelines ? new GridBagLayoutDebugPanel()
!                 : new JPanel(new GridBagLayout());
  
          final int lastRowIndex = this.rows.size() - 1;
--- 681,685 ----
  
          final JPanel panel = this.showGuidelines ? new GridBagLayoutDebugPanel()
!             : new JPanel(new GridBagLayout());
  
          final int lastRowIndex = this.rows.size() - 1;
***************
*** 630,634 ****
  
      private void addRow(final List row, final int currentRowIndex,
!             final int lastRowIndex, final JPanel panel) {
          final int lastColIndex = row.size() - 1;
  
--- 692,696 ----
  
      private void addRow(final List row, final int currentRowIndex,
!                         final int lastRowIndex, final JPanel panel) {
          final int lastColIndex = row.size() - 1;
  
***************
*** 649,653 ****
                  if (LOG.isDebugEnabled()) {
                      LOG.debug("Adding to panel: "
!                             + getDebugString(item.component, gbc));
                  }
                  panel.add(item.component, gbc);
--- 711,715 ----
                  if (LOG.isDebugEnabled()) {
                      LOG.debug("Adding to panel: "
!                         + getDebugString(item.component, gbc));
                  }
                  panel.add(item.component, gbc);
***************
*** 694,698 ****
          // remove any insets at the bottom of the GBC
          final Insets oldInset = gbc.insets;
!         gbc.insets = new Insets(oldInset.top, oldInset.left, 0, oldInset.right);
      }
  
--- 756,761 ----
          // remove any insets at the bottom of the GBC
          final Insets oldInset = gbc.insets;
!         gbc.insets =
!             new Insets(oldInset.top, oldInset.left, 0, oldInset.right);
      }
  
***************
*** 701,716 ****
       * the end of the panel?
       * <p />
!      * 
       * For example, if you have
!      * 
       * <pre>
       * append(a).append(b).append(c).nextLine();
       * append(d).append(e).nextLine();
       * </pre>
!      * 
       * then "e" would automaticly span two columns.
!      * 
!      * @param autoSpanLastComponent
!      *            default is true
       */
      public void setAutoSpanLastComponent(boolean autoSpanLastComponent) {
--- 764,778 ----
       * the end of the panel?
       * <p />
!      *
       * For example, if you have
!      *
       * <pre>
       * append(a).append(b).append(c).nextLine();
       * append(d).append(e).nextLine();
       * </pre>
!      *
       * then "e" would automaticly span two columns.
!      *
!      * @param autoSpanLastComponent default is true
       */
      public void setAutoSpanLastComponent(boolean autoSpanLastComponent) {
***************
*** 719,726 ****
  
      private void formatLastColumn(final GridBagConstraints gbc,
!             final int currentColIndex) {
          // remove any insets at the right of the GBC
          final Insets oldInset = gbc.insets;
!         gbc.insets = new Insets(oldInset.top, oldInset.left, oldInset.bottom, 0);
  
          if (this.autoSpanLastComponent) {
--- 781,789 ----
  
      private void formatLastColumn(final GridBagConstraints gbc,
!                                   final int currentColIndex) {
          // remove any insets at the right of the GBC
          final Insets oldInset = gbc.insets;
!         gbc.insets =
!             new Insets(oldInset.top, oldInset.left, oldInset.bottom, 0);
  
          if (this.autoSpanLastComponent) {
***************
*** 730,734 ****
                  if (LOG.isDebugEnabled()) {
                      LOG.debug("Increasing gridwidth from " + gbc.gridwidth
!                             + " to " + colSpan);
                  }
                  gbc.gridwidth = colSpan;
--- 793,797 ----
                  if (LOG.isDebugEnabled()) {
                      LOG.debug("Increasing gridwidth from " + gbc.gridwidth
!                         + " to " + colSpan);
                  }
                  gbc.gridwidth = colSpan;
***************
*** 754,756 ****
      }
  
! }
\ No newline at end of file
--- 817,819 ----
      }
  
! }

--- NEW FILE: LabelOrientation.java ---
package org.springframework.richclient.layout;

import javax.swing.*;

import org.springframework.enums.ShortCodedEnum;

public final class LabelOrientation extends ShortCodedEnum {
    public static final LabelOrientation TOP = new LabelOrientation(
            SwingConstants.TOP, "Top");

    public static final LabelOrientation BOTTOM = new LabelOrientation(
            SwingConstants.BOTTOM, "Bottom");

    public static final LabelOrientation LEFT = new LabelOrientation(
            SwingConstants.LEFT, "Left");

    public static final LabelOrientation RIGHT = new LabelOrientation(
            SwingConstants.RIGHT, "Right");

    private LabelOrientation(int code, String label) {
        super(code, label);
    }
}

Update of /cvsroot/spring-rich-c/spring-richclient/test/org/springframework/binding/form
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25365/test/org/springframework/binding/form

Modified Files:
	FormModelTest.java 
Log Message:
Fixed compile problem

Index: FormModelTest.java
===================================================================
RCS file: /cvsroot/spring-rich-c/spring-richclient/test/org/springframework/binding/form/FormModelTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FormModelTest.java	25 Oct 2004 01:01:28 -0000	1.6
--- FormModelTest.java	25 Oct 2004 18:23:54 -0000	1.7
***************
*** 3,7 ****
   * $Revision$
   * $Date$
!  * 
   * Copyright Computer Science Innovations (CSI), 2004. All rights reserved.
   */
--- 3,7 ----
   * $Revision$
   * $Date$
!  *
   * Copyright Computer Science Innovations (CSI), 2004. All rights reserved.
   */
***************
*** 41,46 ****
  
      static {
!         Application application = new Application(new ApplicationServices(),
!                 new BeanFactoryApplicationAdvisor());
          Application.services().setPropertyEditorRegistry(
                  new DefaultPropertyEditorRegistry());
--- 41,46 ----
  
      static {
!         Application application = new Application(new BeanFactoryApplicationAdvisor(),
!             new ApplicationServices());
          Application.services().setPropertyEditorRegistry(
                  new DefaultPropertyEditorRegistry());
***************
*** 59,63 ****
  
          private Date hireDate;
!         
          private Map editors = new HashMap();
  
--- 59,63 ----
  
          private Date hireDate;
! 
          private Map editors = new HashMap();
  
***************
*** 101,110 ****
              this.address = address;
          }
!         
          private void setPropertyEditor(String domainProperty, PropertyEditor propertyEditor) {
              editors.put(domainProperty, propertyEditor);
          }
!         
!         public PropertyEditor getPropertyEditor(String domainProperty) {            
              return (PropertyEditor) editors.get(domainProperty);
          }
--- 101,110 ----
              this.address = address;
          }
! 
          private void setPropertyEditor(String domainProperty, PropertyEditor propertyEditor) {
              editors.put(domainProperty, propertyEditor);
          }
! 
!         public PropertyEditor getPropertyEditor(String domainProperty) {
              return (PropertyEditor) editors.get(domainProperty);
          }
***************
*** 294,331 ****
          ValueModel vm = fm.add("age");
          assertHasNoPropertyEditor(vm);
!         
          per.setPropertyEditor(int.class, PropertyEditorA.class);
          fm = new ValidatingFormModel(employee);
!         assertTrue(getPropertyEditor(fm.add("age")).getClass() == PropertyEditorA.class); 
!         
          per.setPropertyEditor(Employee.class, "age", PropertyEditorB.class);
          fm = new ValidatingFormModel(employee);
!         assertTrue(getPropertyEditor(fm.add("age")).getClass() == PropertyEditorB.class); 
!         
          PropertyEditor pe1 = new PropertyEditorA();
          fm = new ValidatingFormModel(employee);
          fm.getPropertyAccessStrategy().registerCustomEditor(int.class, pe1);
          assertTrue(getPropertyEditor(fm.add("age")) == pe1);
!                 
          PropertyEditor pe2 = new PropertyEditorA();
          fm = new ValidatingFormModel(employee);
          fm.getPropertyAccessStrategy().registerCustomEditor("age", pe2);
!         assertTrue(getPropertyEditor(fm.add("age")) == pe2);        
!         
          PropertyEditor pe3 = new PropertyEditorA();
          employee.setPropertyEditor("age", pe3);
          fm = new ValidatingFormModel(employee);
          fm.getPropertyAccessStrategy().registerCustomEditor("age", pe3);
!         assertTrue(getPropertyEditor(fm.add("age")) == pe3);     
      }
!     
      private void assertHasNoPropertyEditor(ValueModel vm) {
          ValueModel wrappedModel = (ValueModel) getFieldValue(vm, "wrappedModel");
!         assertTrue(wrappedModel instanceof BufferedValueModel);    
      }
  
      private PropertyEditor getPropertyEditor(ValueModel vm) {
          ValueModel wrappedModel = (ValueModel) getFieldValue(vm, "wrappedModel");
!         assertTrue(wrappedModel instanceof TypeConverter);        
          Closure c = (Closure) getFieldValue(wrappedModel, "convertFrom");
          PropertyEditor pe = (PropertyEditor) getFieldValue(c, "val$propertyEditor");
--- 294,331 ----
          ValueModel vm = fm.add("age");
          assertHasNoPropertyEditor(vm);
! 
          per.setPropertyEditor(int.class, PropertyEditorA.class);
          fm = new ValidatingFormModel(employee);
!         assertTrue(getPropertyEditor(fm.add("age")).getClass() == PropertyEditorA.class);
! 
          per.setPropertyEditor(Employee.class, "age", PropertyEditorB.class);
          fm = new ValidatingFormModel(employee);
!         assertTrue(getPropertyEditor(fm.add("age")).getClass() == PropertyEditorB.class);
! 
          PropertyEditor pe1 = new PropertyEditorA();
          fm = new ValidatingFormModel(employee);
          fm.getPropertyAccessStrategy().registerCustomEditor(int.class, pe1);
          assertTrue(getPropertyEditor(fm.add("age")) == pe1);
! 
          PropertyEditor pe2 = new PropertyEditorA();
          fm = new ValidatingFormModel(employee);
          fm.getPropertyAccessStrategy().registerCustomEditor("age", pe2);
!         assertTrue(getPropertyEditor(fm.add("age")) == pe2);
! 
          PropertyEditor pe3 = new PropertyEditorA();
          employee.setPropertyEditor("age", pe3);
          fm = new ValidatingFormModel(employee);
          fm.getPropertyAccessStrategy().registerCustomEditor("age", pe3);
!         assertTrue(getPropertyEditor(fm.add("age")) == pe3);
      }
! 
      private void assertHasNoPropertyEditor(ValueModel vm) {
          ValueModel wrappedModel = (ValueModel) getFieldValue(vm, "wrappedModel");
!         assertTrue(wrappedModel instanceof BufferedValueModel);
      }
  
      private PropertyEditor getPropertyEditor(ValueModel vm) {
          ValueModel wrappedModel = (ValueModel) getFieldValue(vm, "wrappedModel");
!         assertTrue(wrappedModel instanceof TypeConverter);
          Closure c = (Closure) getFieldValue(wrappedModel, "convertFrom");
          PropertyEditor pe = (PropertyEditor) getFieldValue(c, "val$propertyEditor");
***************
*** 335,348 ****
      private Object getFieldValue(Object object, String fieldName) {
          Class clazz = object.getClass();
!         Field field = null;        
          do {
              try {
!                 field = clazz.getDeclaredField(fieldName); 
!             } catch(NoSuchFieldException e) {                
                  clazz = clazz.getSuperclass();
              }
          }
!         while (field == null && clazz != null);            
!         assertNotNull("unable to find field", field);        
          try {
              field.setAccessible(true);
--- 335,348 ----
      private Object getFieldValue(Object object, String fieldName) {
          Class clazz = object.getClass();
!         Field field = null;
          do {
              try {
!                 field = clazz.getDeclaredField(fieldName);
!             } catch(NoSuchFieldException e) {
                  clazz = clazz.getSuperclass();
              }
          }
!         while (field == null && clazz != null);
!         assertNotNull("unable to find field", field);
          try {
              field.setAccessible(true);