[gdf commit] r570 - trunk/gdf-gwt/src/main/java/gdf/gwt/client/view

[codesite...@google.com]

Author: khaledmarouene
Date: Mon Jan 7 04:31:09 2008
New Revision: 570

Modified:
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 useless conditions

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
Mon Jan 7 04:31:09 2008
@@ -84,9 +84,8 @@
String labelText = field.getLabel();

if (field.isMandatory()) {
- if (field instanceof TextField) {
- label.addStyleName(FieldView.CSS_LABEL_MANDATORY);
- }
+
+ label.addStyleName(FieldView.CSS_LABEL_MANDATORY);

if (labelText != null) {
labelText += " *";
@@ -94,10 +93,7 @@
labelText = " *";
}
} else {
- if (field instanceof TextField) {
- label.addStyleName(FieldView.CSS_LABEL_OPTIONAL);
- }
-
+ label.addStyleName(FieldView.CSS_LABEL_OPTIONAL);
}

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

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 Mon
Jan 7 04:31:09 2008
@@ -12,7 +12,6 @@
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;
@@ -91,9 +90,8 @@
String labelText = getFieldModel().getLabel();

if (getFieldModel().isMandatory()) {
- if (getField() instanceof TextField) {
- label.addStyleName(FieldView.CSS_FIELD_MANDATORY);
- }
+
+ label.addStyleName(FieldView.CSS_FIELD_MANDATORY);

if (labelText != null) {
labelText += " *";
@@ -101,9 +99,7 @@
labelText = " *";
}
} else {
- if (getField() instanceof TextField) {
- label.addStyleName(FieldView.CSS_FIELD_OPTIONAL);
- }
+ label.addStyleName(FieldView.CSS_FIELD_OPTIONAL);
}

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

[codesite...@google.com]