diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/app/App.gwt.xml b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/app/App.gwt.xml index f553b63..9550610 100644 --- a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/app/App.gwt.xml +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/app/App.gwt.xml @@ -1,11 +1,10 @@ - - + - + \ No newline at end of file diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/app/place/Activity.java b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/app/place/Activity.java index 4f171bc..4de0b08 100644 --- a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/app/place/Activity.java +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/app/place/Activity.java @@ -37,19 +37,19 @@ public interface Activity { * Called when {@link #start} has not yet replied to its callback, but the * user has lost interest. */ - public void onCancel(); + void onCancel(); /** * Called when the Activity's widget has been removed from view. */ - public void onStop(); + void onStop(); /** * Called when the Activity should prepare its {@link Widget} to the user. * * @param callback allows the widget to be presented asynchronously */ - public void start(Callback callback); + void start(Callback callback); - public boolean willStop(); + boolean willStop(); } diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsActivity.java b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsActivity.java index 68f1ea8..13a059d 100644 --- a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsActivity.java +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsActivity.java @@ -25,42 +25,39 @@ import com.google.gwt.valuestore.shared.Value; import java.util.List; /** - * An {@link com.google.gwt.app.place.Activity Activity} that requests and displays detailed information on a - * given employee. + * An {@link com.google.gwt.app.place.Activity Activity} that requests and + * displays detailed information on a given employee. */ public class EmployeeDetailsActivity extends AbstractActivity { class RequestCallBack implements TakesValueList { public void setValueList(List listOfOne) { - EmployeeRecord record = listOfOne.get(0); - - StringBuilder list = new StringBuilder("

Employee " + record.getId() - + "

"); - - String user = record.getUserName(); - list.append("
"); - list.append(""); - list.append("").append(user).append(""); - list.append("
"); + view.setValue(listOfOne.get(0)); + callback.onStarted(new HTML(view.toString())); + } + } - list.append("
"); - String display = record.getDisplayName(); - list.append(""); - list.append("").append(display).append(""); - list.append("
"); + private static EmployeeDetailsView defaultView; - callback.onStarted(new HTML(list.toString())); + private static EmployeeDetailsView getDefaultView() { + if (defaultView == null) { + defaultView = new EmployeeDetailsView(); } + return defaultView; } private final ExpensesRequestFactory requests; - + private final EmployeeDetailsView view; private String id; - private Callback callback; + /** + * Creates an activity that uses the default singleton view instance. There is + * no need for the activity to have its own view instance. + */ public EmployeeDetailsActivity(String id, ExpensesRequestFactory requests) { - this.requests = requests; this.id = id; + this.requests = requests; + view = getDefaultView(); } public void start(Callback callback) { diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.java b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.java new file mode 100644 index 0000000..aded2a2 --- /dev/null +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010 Google Inc. + * + * 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 com.google.gwt.sample.expenses.gwt.ui.employee; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.SpanElement; +import com.google.gwt.sample.expenses.gwt.request.EmployeeRecord; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HTMLPanel; + +/** + * Details view for employee records. + */ +public class EmployeeDetailsView extends Composite { + interface Binder extends UiBinder { + } + + private static final Binder BINDER = GWT.create(Binder.class); + + @UiField + SpanElement displayName; + @UiField + SpanElement userName; + @UiField + SpanElement idSpan; + + public EmployeeDetailsView() { + initWidget(BINDER.createAndBindUi(this)); + } + + public void setValue(EmployeeRecord record) { + displayName.setInnerText(record.getDisplayName()); + userName.setInnerText(record.getUserName()); + idSpan.setInnerText(record.getId()); + } + +} diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.ui.xml b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.ui.xml new file mode 100644 index 0000000..54082eb --- /dev/null +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeDetailsView.ui.xml @@ -0,0 +1,11 @@ + + + +

Employee

+ + User Name:
+ Display Name: + + + diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeEditView.ui.xml b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeEditView.ui.xml index 9847a45..5908490 100644 --- a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeEditView.ui.xml +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/employee/EmployeeEditView.ui.xml @@ -1,6 +1,6 @@ + xmlns:g='urn:import:com.google.gwt.user.client.ui' >

Edit Employee

diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsActivity.java b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsActivity.java index 5a8cd42..956f92b 100644 --- a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsActivity.java +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsActivity.java @@ -31,36 +31,33 @@ import java.util.List; public class ReportDetailsActivity extends AbstractActivity { class RequestCallBack implements TakesValueList { public void setValueList(List listOfOne) { - ReportRecord record = listOfOne.get(0); - - StringBuilder list = new StringBuilder("

Employee " + record.getId() - + "

"); - - String purpose = record.getPurpose(); - list.append("
"); - list.append(""); - list.append("").append(purpose).append(""); - list.append("
"); + view.setValue(listOfOne.get(0)); + callback.onStarted(new HTML(view.toString())); + } + } - list.append("
"); - String created = record.getCreated().toString(); - list.append(""); - list.append("").append(created).append(""); - list.append("
"); + private static ReportDetailsView defaultView; - callback.onStarted(new HTML(list.toString())); + private static ReportDetailsView getDefaultView() { + if (defaultView == null) { + defaultView = new ReportDetailsView(); } + return defaultView; } private final ExpensesRequestFactory requests; - + private final ReportDetailsView view; private String id; - private Callback callback; + /** + * Creates an activity that uses the default singleton view instance. There is + * no need for the activity to have its own view instance. + */ public ReportDetailsActivity(String id, ExpensesRequestFactory requests) { this.requests = requests; this.id = id; + this.view = getDefaultView(); } public void start(Callback callback) { diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.java b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.java new file mode 100644 index 0000000..2eb9896 --- /dev/null +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.java @@ -0,0 +1,55 @@ +/* + * Copyright 2010 Google Inc. + * + * 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 com.google.gwt.sample.expenses.gwt.ui.report; + +import com.google.gwt.app.util.DateTimeFormatRenderer; +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.SpanElement; +import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.sample.expenses.gwt.request.ReportRecord; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HTMLPanel; + +/** + * Details view for employee records. + */ +public class ReportDetailsView extends Composite { + interface Binder extends UiBinder { + } + + private static final Binder BINDER = GWT.create(Binder.class); + + @UiField + SpanElement purpose; + @UiField + SpanElement created; + @UiField + SpanElement idSpan; + + public ReportDetailsView() { + initWidget(BINDER.createAndBindUi(this)); + } + + public void setValue(ReportRecord record) { + purpose.setInnerText(record.getPurpose()); + created.setInnerText(new DateTimeFormatRenderer( + DateTimeFormat.getShortDateFormat()).render(record.getCreated())); + idSpan.setInnerText(record.getId()); + } + +} diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.ui.xml b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.ui.xml new file mode 100644 index 0000000..e9a98db --- /dev/null +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportDetailsView.ui.xml @@ -0,0 +1,11 @@ + + + +

Report

+ + Purpose:
+ Created: + + + diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditActivity.java b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditActivity.java index 10a9238..6128a39 100644 --- a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditActivity.java +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditActivity.java @@ -18,22 +18,92 @@ package com.google.gwt.sample.expenses.gwt.ui.report; import com.google.gwt.app.place.AbstractActivity; import com.google.gwt.app.place.PlaceController; import com.google.gwt.sample.expenses.gwt.request.ExpensesRequestFactory; +import com.google.gwt.sample.expenses.gwt.request.ReportRecord; +import com.google.gwt.sample.expenses.gwt.scaffold.place.ListScaffoldPlace; import com.google.gwt.sample.expenses.gwt.scaffold.place.ScaffoldPlace; -import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.Window; +import com.google.gwt.user.client.ui.TakesValueList; +import com.google.gwt.valuestore.shared.DeltaValueStore; +import com.google.gwt.valuestore.shared.Value; +import com.google.gwt.valuestore.ui.RecordEditView; + +import java.util.List; /** * An activity that requests all info on a report, allows the user to edit it, * and persists the results. */ -public class ReportEditActivity extends AbstractActivity { +public class ReportEditActivity extends AbstractActivity implements + RecordEditView.Delegate { + class RequestCallBack implements TakesValueList { + public void setValueList(List listOfOne) { + view.setEnabled(true); + ReportRecord record = listOfOne.get(0); + view.setValue(record); + callback.onStarted(view.asWidget()); + } + } + + private static RecordEditView defaultView; + + private static RecordEditView getDefaultView() { + if (defaultView == null) { + defaultView = new ReportEditView(); + } + return defaultView; + } + + private final ExpensesRequestFactory requests; + private final RecordEditView view; + private final String id; + private final PlaceController placeController; + + private DeltaValueStore deltas; + private Callback callback; + /** + * Creates an activity that uses the default singleton view instance. + */ public ReportEditActivity(String id, ExpensesRequestFactory requests, PlaceController placeController) { - // TODO Auto-generated constructor stub + this(id, getDefaultView(), requests, placeController); + } + + /** + * Creates an activity that uses its own view instance. + */ + public ReportEditActivity(String id, RecordEditView view, + ExpensesRequestFactory requests, + PlaceController placeController) { + this.requests = requests; + this.id = id; + this.view = view; + this.deltas = requests.getValueStore().spawnDeltaView(); + this.placeController = placeController; + view.setDelegate(this); + view.setDeltaValueStore(deltas); + } + + public void saveClicked() { + if (deltas.isChanged()) { + view.setEnabled(false); + DeltaValueStore toCommit = deltas; + deltas = null; + requests.syncRequest(toCommit).fire(); // TODO Need callback, idiot + placeController.goTo(new ListScaffoldPlace(ReportRecord.class)); + } } public void start(Callback callback) { - callback.onStarted(new Label("tbd")); + this.callback = callback; + requests.reportRequest().findReport(Value.of(id)).to( + new RequestCallBack()).fire(); + } + + @Override + public boolean willStop() { + return deltas == null || !deltas.isChanged() + || Window.confirm("Dude! Really drop your edits?"); } } diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditView.java b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditView.java new file mode 100644 index 0000000..84fcdcf --- /dev/null +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditView.java @@ -0,0 +1,109 @@ +/* + * Copyright 2010 Google Inc. + * + * 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 com.google.gwt.sample.expenses.gwt.ui.report; + +import com.google.gwt.app.util.DateTimeFormatRenderer; +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.SpanElement; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.sample.expenses.gwt.request.ReportRecord; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.HTMLPanel; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.valuestore.shared.DeltaValueStore; +import com.google.gwt.valuestore.shared.Property; +import com.google.gwt.valuestore.ui.RecordEditView; + +import java.util.HashSet; +import java.util.Set; + +/** + * Edit view for employee records. + */ +public class ReportEditView extends Composite implements + RecordEditView { + interface Binder extends UiBinder { + } + + private static final Binder BINDER = GWT.create(Binder.class); + + @UiField + TextBox purpose; + @UiField + SpanElement created; + @UiField + Button save; + @UiField + SpanElement idSpan; + + private Delegate delegate; + private DeltaValueStore deltas; + + private ReportRecord record; + + public ReportEditView() { + initWidget(BINDER.createAndBindUi(this)); + } + + public ReportEditView asWidget() { + return this; + } + + public Set> getProperties() { + Set> rtn = new HashSet>(); + rtn.add(ReportRecord.purpose); + rtn.add(ReportRecord.created); + return rtn; + } + + public void setDelegate(Delegate delegate) { + this.delegate = delegate; + } + + public void setDeltaValueStore(DeltaValueStore deltas) { + this.deltas = deltas; + } + + public void setEnabled(boolean enabled) { + purpose.setEnabled(enabled); + save.setEnabled(enabled); + } + + public void setValue(ReportRecord value) { + this.record = value; + purpose.setValue(record.getPurpose()); + created.setInnerText(new DateTimeFormatRenderer( + DateTimeFormat.getShortDateFormat()).render(record.getCreated())); + idSpan.setInnerText(record.getId()); + } + + @UiHandler("purpose") + void onPurposeChange(ValueChangeEvent event) { + deltas.set(ReportRecord.purpose, record, event.getValue()); + } + + @UiHandler("save") + void onSave(@SuppressWarnings("unused") ClickEvent event) { + delegate.saveClicked(); + } + +} diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditView.ui.xml b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditView.ui.xml new file mode 100644 index 0000000..c3316b0 --- /dev/null +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportEditView.ui.xml @@ -0,0 +1,12 @@ + + + +

Edit Report

+ + Purpose: + Created: + + Save + + diff --git a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportListView.java b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportListView.java index 13d9690..d598074 100644 --- a/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportListView.java +++ b/google3/third_party/java/gwt/source/svn/trunk/bikeshed/src/com/google/gwt/sample/expenses/gwt/ui/report/ReportListView.java @@ -47,7 +47,6 @@ public class ReportListView extends AbstractRecordListView { init(BINDER.createAndBindUi(this), table, getColumns()); } - protected List> getColumns() { // TODO These should be elements in a in the ui.xml file