[gdf commit] r561 - in trunk: gdf-core/src/main/java/gdf/core/client/form gdf-gwt/src/main/java/gdf/gwt/client...

[codesite...@google.com]

Author: jlouvel
Date: Fri Jan 4 07:16:09 2008
New Revision: 561

Added:
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/component/
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/component/TablePanel.java
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/component/TextPanel.java
Removed:
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/table/
Modified:
trunk/gdf-core/src/main/java/gdf/core/client/form/Field.java
trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/TextView.java
trunk/gdf-sample/src/main/java/gdf/sample/client/Module.java
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/menu/MenuTreeProvider.java

Log:
- Fixed mode issue with fields (the mode was not given to the content component).
- Added sample case in menu.
- Refactored sample app.

Modified: trunk/gdf-core/src/main/java/gdf/core/client/form/Field.java
==============================================================================
--- trunk/gdf-core/src/main/java/gdf/core/client/form/Field.java (original)
+++ trunk/gdf-core/src/main/java/gdf/core/client/form/Field.java Fri
Jan 4 07:16:09 2008
@@ -97,6 +97,7 @@

public void setMode(int mode) {
getFieldModel().setMode(mode);
+ getContent().setMode(mode);
}

public void setPrefixLabel(String label) {

Modified: trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/TextView.java
==============================================================================
--- trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/TextView.java (original)
+++ trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/TextView.java Fri
Jan 4 07:16:09 2008
@@ -13,7 +13,6 @@
import gdf.core.client.event.Event;
import gdf.core.client.event.EventListener;
import gdf.core.client.event.SetEvent;
-import gdf.core.client.form.Field;
import gdf.core.client.text.Text;
import gdf.core.client.text.TextModel;
import gdf.gwt.client.widget.FocusWidgetListener;
@@ -50,8 +49,9 @@
public Widget getWidget() {
Widget result = null;

- if (getModel().getMode() == Field.MODE_DISPLAY_ONLY) {
+ if (getModel().getMode() == Component.MODE_DISPLAY_ONLY) {
Label l = new Label(getTextModel().getValue());
+ l.setWordWrap(false);
result = l;
} else {
if (getTextModel().getVisibleLines() == 1) {

Modified: trunk/gdf-sample/src/main/java/gdf/sample/client/Module.java
==============================================================================
--- trunk/gdf-sample/src/main/java/gdf/sample/client/Module.java (original)
+++ trunk/gdf-sample/src/main/java/gdf/sample/client/Module.java Fri
Jan 4 07:16:09 2008
@@ -49,10 +49,10 @@

// displayCheck();
// displayChoice();
- // displayDesk();
+ displayDesk();
// displayField();
// displayFieldPanel();
- displayForm();
+ // displayForm();
// displayImage();
// displayTable();
// displayToolBar();

Added: trunk/gdf-sample/src/main/java/gdf/sample/client/desk/component/TablePanel.java
==============================================================================
--- (empty file)
+++
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/component/TablePanel.java
Fri Jan 4 07:16:09 2008
@@ -0,0 +1,69 @@
+package gdf.sample.client.desk.component;
+
+import gdf.core.client.Component;
+import gdf.core.client.action.ActionItem;
+import gdf.core.client.choice.ChoiceItem;
+import gdf.core.client.panel.Panel;
+import gdf.core.client.table.Table;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TablePanel extends Panel {
+
+ public TablePanel() {
+ super();
+ this.setTitle("Table panel");
+ this.setIconStyle("sample-icon-table");
+
+ Table tbl = new Table();
+
+ List choiceItems = new ArrayList();
+ ChoiceItem ci;
+ ci = new ChoiceItem("1.76 m", "1");
+ choiceItems.add(ci);
+ ci = new ChoiceItem("1.83 m", "2");
+ choiceItems.add(ci);
+ ci = new ChoiceItem("1.74 m", "3");
+ choiceItems.add(ci);
+
+ tbl.addColumn("Family Name", Table.TYPE_TEXT, Table.MODE_DISPLAY_ONLY);
+ tbl.addColumn("First Name", Table.TYPE_TEXT, Table.MODE_DISPLAY_ONLY);
+ tbl.addColumn("Age", Table.TYPE_TEXT, Component.MODE_EDITION, 20, 40,
+ 30);
+ tbl.addColumn("Height", Table.TYPE_CHOICE, choiceItems);
+ tbl.addColumn("Icon", Table.TYPE_IMAGE, Component.MODE_DISPLAY_ONLY,
+ 20, 40, 30);
+ tbl.addColumn("Cool guy", Table.TYPE_CHECK);
+ tbl.addColumn("Action", Table.TYPE_ACTION, new Integer(
+ ActionItem.COMMAND_DELETE));
+
+ tbl.setValue(0, 0, "Khaled");
+ tbl.setValue(0, 1, "Marouène");
+ tbl.setValue(0, 2, "55");
+ tbl.setValue(0, 3, "1");
+ tbl.setValue(0, 4, "home.gif");
+ tbl.setValue(0, 5, new Boolean(false));
+ tbl.setValue(0, 6, "goo");
+
+ tbl.setValue(1, 0, "Chaaba");
+ tbl.setValue(1, 1, "Anis");
+ tbl.setValue(1, 2, "69");
+ tbl.setValue(1, 3, "3");
+ tbl.setValue(1, 4, "home.gif");
+ tbl.setValue(1, 5, new Boolean(true));
+ tbl.setValue(1, 6, "bouton");
+
+ tbl.setValue(2, 0, "Oudassi");
+ tbl.setValue(2, 1, "Jawad");
+ tbl.setValue(2, 2, "12");
+ tbl.setValue(2, 3, "2");
+ tbl.setValue(2, 4, "home.gif");
+ tbl.setValue(2, 5, new Boolean(true));
+ tbl.setValue(2, 6, "hello");
+
+ addChild(tbl);
+
+ }
+
+}

Added: trunk/gdf-sample/src/main/java/gdf/sample/client/desk/component/TextPanel.java
==============================================================================
--- (empty file)
+++
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/component/TextPanel.java
Fri Jan 4 07:16:09 2008
@@ -0,0 +1,30 @@
+package gdf.sample.client.desk.component;
+
+import gdf.core.client.form.FieldSet;
+import gdf.core.client.form.TextField;
+import gdf.core.client.panel.Panel;
+
+public class TextPanel extends Panel {
+
+ public TextPanel() {
+ this.setTitle("Text panel");
+ this.setIconStyle("sample-icon-table");
+
+ FieldSet fieldSet = new FieldSet();
+
+ TextField editionTextField = new TextField();
+ editionTextField.setLabel("Editable text field:");
+ editionTextField.setMode(MODE_EDITION);
+ editionTextField.setValue("modify me");
+ fieldSet.addChild(editionTextField);
+
+ TextField displayOnlyTextField = new TextField();
+ displayOnlyTextField.setLabel("Display only text field:");
+ displayOnlyTextField.setMode(MODE_DISPLAY_ONLY);
+ displayOnlyTextField.setValue("read me");
+ fieldSet.addChild(displayOnlyTextField);
+
+ addChild(fieldSet);
+ }
+
+}

Modified: trunk/gdf-sample/src/main/java/gdf/sample/client/desk/menu/MenuTreeProvider.java
==============================================================================
---
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/menu/MenuTreeProvider.java (original)
+++
trunk/gdf-sample/src/main/java/gdf/sample/client/desk/menu/MenuTreeProvider.java
Fri Jan 4 07:16:09 2008
@@ -12,9 +12,10 @@
import gdf.core.client.desk.Perspective;
import gdf.core.client.form.Field;
import gdf.core.client.tree.TreeProvider;
+import gdf.sample.client.desk.component.TablePanel;
+import gdf.sample.client.desk.component.TextPanel;
import gdf.sample.client.desk.form.FieldForm;
import gdf.sample.client.desk.form.TreeItem;
-import gdf.sample.client.desk.table.TablePanel;

import java.util.ArrayList;
import java.util.List;
@@ -53,20 +54,33 @@
componentItem.setLabel("Component");
componentItem.setIconStyle("sample-icon-component");

+ // Node for Table sample
TreeItem tableItem = new TreeItem();
tableItem.setLabel("Table Item");
tableItem.setIconStyle("sample-icon-table");
componentItem.getChildren().add(tableItem);

Command command = new Command() {
-
public void execute() {
TablePanel tablePanel = new TablePanel();
getPerspective().addCenter(tablePanel);
}
-
};
tableItem.setDefaultActionItem(command);
+
+ // Node for Text sample
+ TreeItem textItem = new TreeItem();
+ textItem.setLabel("Text Item");
+ textItem.setIconStyle("sample-icon-table");
+ componentItem.getChildren().add(textItem);
+
+ command = new Command() {
+ public void execute() {
+ TextPanel textPanel = new TextPanel();
+ getPerspective().addCenter(textPanel);
+ }
+ };
+ textItem.setDefaultActionItem(command);
return componentItem;
}

[codesite...@google.com]