Revision: 1710
http://svn.sourceforge.net/spring-rich-c/?rev=1710&view=rev
Author: kdonald
Date: 2007-02-07 05:54:02 -0800 (Wed, 07 Feb 2007)
Log Message:
-----------
Minor design simplifications
Modified Paths:
--------------
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactForm.java
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactPropertiesDialog.java
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactView.java
Modified:
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactForm.java
===================================================================
---
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactForm.java
2007-02-07 13:22:52 UTC (rev 1709)
+++
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactForm.java
2007-02-07 13:54:02 UTC (rev 1710)
@@ -18,9 +18,9 @@
import javax.swing.JComponent;
import javax.swing.JTextField;
-import org.springframework.binding.form.FormModel;
import org.springframework.richclient.form.AbstractForm;
import org.springframework.richclient.form.builder.TableFormBuilder;
+import org.springframework.richclient.samples.simple.domain.Contact;
/**
* Form to handle the properties of a Contact object. It uses a [EMAIL
PROTECTED] TableFormBuilder} to construct the layout of the
@@ -31,21 +31,13 @@
*/
public class ContactForm extends AbstractForm {
- public static final String FORM_NAME = "contact";
-
private JComponent firstNameField;
- /**
- * @param pageFormModel
- */
- public ContactForm(FormModel formModel) {
- super(formModel, FORM_NAME);
+ public ContactForm(Contact contact) {
+ super(contact);
+ setId("contact");
}
- /*
- * (non-Javadoc)
- * @see
org.springframework.richclient.form.AbstractForm#createFormControl()
- */
protected JComponent createFormControl() {
TableFormBuilder formBuilder = new
TableFormBuilder(getBindingFactory());
formBuilder.setLabelAttributes("colGrId=label
colSpec=right:pref");
@@ -75,8 +67,7 @@
formBuilder.row();
formBuilder.add("address.city", "colSpan=1 align=left");
formBuilder.row();
- // formBuilder.add( bf.createBoundComboBox( "address.state",
- // MasterLists.STATE_CODE ), "colSpan=1 align=left" );
+ // formBuilder.add(getBindingFactory().createBoundComboBox(
"address.state", MasterLists.STATE_CODE), "colSpan=1 align=left" );
formBuilder.add("address.state", "colSpan=1 align=left");
formBuilder.row();
@@ -97,4 +88,4 @@
public boolean requestFocusInWindow() {
return firstNameField.requestFocusInWindow();
}
-}
+}
\ No newline at end of file
Modified:
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactPropertiesDialog.java
===================================================================
---
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactPropertiesDialog.java
2007-02-07 13:22:52 UTC (rev 1709)
+++
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactPropertiesDialog.java
2007-02-07 13:54:02 UTC (rev 1710)
@@ -21,7 +21,6 @@
import org.springframework.richclient.dialog.FormBackedDialogPage;
import org.springframework.richclient.dialog.TitledPageApplicationDialog;
import org.springframework.richclient.form.Form;
-import org.springframework.richclient.form.FormModelHelper;
import org.springframework.richclient.samples.simple.domain.Contact;
import org.springframework.richclient.samples.simple.domain.ContactDataStore;
import org.springframework.util.Assert;
@@ -57,7 +56,7 @@
contact = new Contact();
}
setCloseAction(CloseAction.DISPOSE);
- form = new
ContactForm(FormModelHelper.createFormModel(contact));
+ form = new ContactForm(contact);
setDialogPage(new FormBackedDialogPage(form));
this.dataStore = dataStore;
}
Modified:
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactView.java
===================================================================
---
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactView.java
2007-02-07 13:22:52 UTC (rev 1709)
+++
trunk/spring-richclient/samples/simple/src/main/java/org/springframework/richclient/samples/simple/ui/ContactView.java
2007-02-07 13:54:02 UTC (rev 1710)
@@ -30,6 +30,7 @@
import org.springframework.richclient.application.PageComponentContext;
import
org.springframework.richclient.application.event.LifecycleApplicationEvent;
import org.springframework.richclient.application.support.AbstractView;
+import org.springframework.richclient.command.ActionCommand;
import org.springframework.richclient.command.ActionCommandExecutor;
import org.springframework.richclient.command.CommandGroup;
import org.springframework.richclient.command.GuardedActionCommandExecutor;
@@ -169,11 +170,11 @@
// Install the popup menu
CommandGroup popup = new CommandGroup();
-
popup.add(getWindowCommandManager().getActionCommand("deleteCommand"));
+ popup.add((ActionCommand)
getWindowCommandManager().getCommand("deleteCommand", ActionCommand.class));
popup.addSeparator();
-
popup.add(getWindowCommandManager().getActionCommand("propertiesCommand"));
+ popup.add((ActionCommand)
getWindowCommandManager().getCommand("propertiesCommand", ActionCommand.class));
contactTable.setPopupCommandGroup(popup);
-
+
// Register to get notified when the filtered list
changes
contactTable.setStatusBar(getStatusBar());
@@ -186,7 +187,7 @@
ValueModel selectionHolder = new
ListSelectionValueModelAdapter(contactTable.getSelectionModel());
new ListSingleSelectionGuard(selectionHolder,
deleteExecutor);
new ListSingleSelectionGuard(selectionHolder,
propertiesExecutor);
-
+
return contactTable;
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
spring-rich-c-cvs mailing list
spring-rich-c-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
