[gdf commit] r562 - in trunk: gdf-core/src/main/java/gdf/core/client gdf-core/src/main/java/gdf/core/public gd...

[codesite...@google.com]

Author: khaledmarouene
Date: Fri Jan 4 07:21:18 2008
New Revision: 562

Modified:
trunk/gdf-core/src/main/java/gdf/core/client/Constants.java
trunk/gdf-core/src/main/java/gdf/core/client/View.java
trunk/gdf-core/src/main/java/gdf/core/public/gdf-core.css
trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/FieldSetView.java
trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/FieldView.java

Log:
Removed the blue border around all fields except TextField
Changed some code related to css styles

Modified: trunk/gdf-core/src/main/java/gdf/core/client/Constants.java
==============================================================================
--- trunk/gdf-core/src/main/java/gdf/core/client/Constants.java (original)
+++ trunk/gdf-core/src/main/java/gdf/core/client/Constants.java Fri Jan
4 07:21:18 2008
@@ -2,11 +2,11 @@

public interface Constants extends
com.google.gwt.i18n.client.Constants {

- // Text to be displayed before the first radio button in a Check component
- // if its type is RADIO
+ // Text to be displayed in front of the first radio button in a Check
+ // component if its type is RADIO
String checkYesText();

- // Text to be displayed before the second radio button in a Check component
- // if its type is RADIO
+ // Text to be displayed in front of the second radio button in a Check
+ // component if its type is RADIO
String checkNoText();
}

Modified: trunk/gdf-core/src/main/java/gdf/core/client/View.java
==============================================================================
--- trunk/gdf-core/src/main/java/gdf/core/client/View.java (original)
+++ trunk/gdf-core/src/main/java/gdf/core/client/View.java Fri Jan 4
07:21:18 2008
@@ -62,7 +62,7 @@
protected void configure(Widget widget, String cssRoot, String
cssSuffix) {

if (widget != null) {
- widget.setStyleName(cssRoot + cssSuffix);
+ widget.addStyleName(cssRoot + cssSuffix);

if ((getModel().getWidth() != null)
&& !getModel().getWidth().equals("auto")) {

Modified: trunk/gdf-core/src/main/java/gdf/core/public/gdf-core.css
==============================================================================
--- trunk/gdf-core/src/main/java/gdf/core/public/gdf-core.css (original)
+++ trunk/gdf-core/src/main/java/gdf/core/public/gdf-core.css Fri Jan
4 07:21:18 2008
@@ -121,7 +121,6 @@
padding: 4px;
background-color: #fffebb;
font-weight: normal;
- white-space: nowrap;
}

.gdf-FieldSet {

Modified: trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/FieldSetView.java
==============================================================================
--- trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/FieldSetView.java (original)
+++ trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/FieldSetView.java
Fri Jan 4 07:21:18 2008
@@ -15,6 +15,7 @@
import gdf.core.client.form.FieldModel;
import gdf.core.client.form.FieldSet;
import gdf.core.client.form.FieldSetModel;
+import gdf.core.client.form.TextField;

import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HorizontalPanel;
@@ -83,14 +84,20 @@
String labelText = field.getLabel();

if (field.isMandatory()) {
- label.setStyleName(FieldView.CSS_LABEL_MANDATORY);
+ if (field instanceof TextField) {
+ label.addStyleName(FieldView.CSS_LABEL_MANDATORY);
+ }
+
if (labelText != null) {
labelText += " *";
} else {
labelText = " *";
}
} else {
- label.setStyleName(FieldView.CSS_LABEL_OPTIONAL);
+ if (field instanceof TextField) {
+ label.addStyleName(FieldView.CSS_LABEL_OPTIONAL);
+ }
+
}

if (labelText != null && !label.equals("")) {
@@ -104,7 +111,7 @@

if (field.getPrefixLabel() != null) {
label = new Label(field.getPrefixLabel());
- label.setStyleName(FieldView.CSS_LABEL_PREFIX);
+ label.addStyleName(FieldView.CSS_LABEL_PREFIX);
hp.add(label);
}

@@ -112,9 +119,13 @@

if (w != null) {
if (field.isMandatory()) {
- w.setStyleName(FieldView.CSS_FIELD_MANDATORY);
+ if (field instanceof TextField) {
+ w.addStyleName(FieldView.CSS_FIELD_MANDATORY);
+ }
} else {
- w.setStyleName(FieldView.CSS_FIELD_OPTIONAL);
+ if (field instanceof TextField) {
+ w.addStyleName(FieldView.CSS_FIELD_OPTIONAL);
+ }
}

hp.add(w);
@@ -122,7 +133,7 @@

if (field.getSuffixLabel() != null) {
label = new Label(field.getSuffixLabel());
- label.setStyleName(FieldView.CSS_LABEL_SUFFIX);
+ label.addStyleName(FieldView.CSS_LABEL_SUFFIX);
hp.add(label);
}

Modified: trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/FieldView.java
==============================================================================
--- trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/FieldView.java (original)
+++ trunk/gdf-gwt/src/main/java/gdf/gwt/client/view/FieldView.java Fri
Jan 4 07:21:18 2008
@@ -12,6 +12,7 @@
import gdf.core.client.View;
import gdf.core.client.form.Field;
import gdf.core.client.form.FieldModel;
+import gdf.core.client.form.TextField;

import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
@@ -90,14 +91,19 @@
String labelText = getFieldModel().getLabel();

if (getFieldModel().isMandatory()) {
- label.setStyleName(FieldView.CSS_FIELD_OPTIONAL);
+ if (getField() instanceof TextField) {
+ label.addStyleName(FieldView.CSS_FIELD_MANDATORY);
+ }
+
if (labelText != null) {
labelText += " *";
} else {
labelText = " *";
}
} else {
- label.setStyleName(FieldView.CSS_FIELD_OPTIONAL);
+ if (getField() instanceof TextField) {
+ label.addStyleName(FieldView.CSS_FIELD_OPTIONAL);
+ }
}

if (labelText != null && !label.equals("")) {