Skip to content

Instantly share code, notes, and snippets.

@niloc132

niloc132/gxt230.patch

Created April 26, 2013 15:57
Show Gist options
  • Save niloc132/5468343 to your computer and use it in GitHub Desktop.
Save niloc132/5468343 to your computer and use it in GitHub Desktop.
Download ZIP
Quick draft at bringing Sigma-h up to GXT 2.3.0-gwt22
Raw
gxt230.patch
Index: pom.xml
===================================================================
--- pom.xml (revision 1297)
+++ pom.xml (working copy)
@@ -139,7 +139,7 @@
<dependency>
<groupId>com.extjs</groupId>
<artifactId>gxt</artifactId>
- <version>2.2.5-gwt22</version>
+ <version>2.3.0-gwt22</version>
</dependency>
<dependency>
Index: src/main/java/org/sigmah/client/SigmahHelpWindow.java
===================================================================
--- src/main/java/org/sigmah/client/SigmahHelpWindow.java (revision 1297)
+++ src/main/java/org/sigmah/client/SigmahHelpWindow.java (working copy)
@@ -77,7 +77,7 @@
// Window.
window = new Window();
- window.setHeading(I18N.CONSTANTS.help());
+ window.setHeadingText(I18N.CONSTANTS.help());
window.setSize(700, 557);
window.setPlain(true);
window.setModal(true);
Index: src/main/java/org/sigmah/client/offline/ui/ConnectionDialog.java
===================================================================
--- src/main/java/org/sigmah/client/offline/ui/ConnectionDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/offline/ui/ConnectionDialog.java (working copy)
@@ -19,7 +19,7 @@
public ConnectionDialog() {
- setHeading(I18N.CONSTANTS.connectionRequired());
+ setHeadingText(I18N.CONSTANTS.connectionRequired());
setModal(true);
setClosable(false);
setWidth(400);
Index: src/main/java/org/sigmah/client/offline/ui/ProgressDialog.java
===================================================================
--- src/main/java/org/sigmah/client/offline/ui/ProgressDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/offline/ui/ProgressDialog.java (working copy)
@@ -14,7 +14,7 @@
private ProgressBar progressBar;
public ProgressDialog() {
- setHeading(I18N.CONSTANTS.statusOfflineMode());
+ setHeadingText(I18N.CONSTANTS.statusOfflineMode());
setWidth(400);
setHeight(75);
setLayout(new CenterLayout());
Index: src/main/java/org/sigmah/client/offline/ui/StatusWindow.java
===================================================================
--- src/main/java/org/sigmah/client/offline/ui/StatusWindow.java (revision 1297)
+++ src/main/java/org/sigmah/client/offline/ui/StatusWindow.java (working copy)
@@ -22,7 +22,7 @@
private Button toggleOfflineButton;
public StatusWindow() {
- setHeading(I18N.CONSTANTS.statusOfflineMode());
+ setHeadingText(I18N.CONSTANTS.statusOfflineMode());
setWidth(300);
setHeight(200);
setLayout(new CenterLayout());
Index: src/main/java/org/sigmah/client/page/admin/AdminUtil.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/AdminUtil.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/AdminUtil.java (working copy)
@@ -144,7 +144,7 @@
@Override
public void handleEvent(ButtonEvent be) {
final Window window = new Window();
- window.setHeading(title);
+ window.setHeadingText(title);
window.setSize(width, height);
window.setPlain(true);
window.setModal(true);
@@ -160,7 +160,7 @@
public static void showForm(final Window window, final FormPanel form,
final String title, final int width, final int height) {
- window.setHeading(title);
+ window.setHeadingText(title);
window.setSize(width, height);
window.setPlain(true);
window.setModal(true);
Index: src/main/java/org/sigmah/client/page/admin/category/AdminCategoryPresenter.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/category/AdminCategoryPresenter.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/category/AdminCategoryPresenter.java (working copy)
@@ -211,7 +211,7 @@
// Create a dialog window to show error message
final Dialog errorDialog = new Dialog();
- errorDialog.setHeading(I18N.CONSTANTS.deletionError());
+ errorDialog.setHeadingText(I18N.CONSTANTS.deletionError());
errorDialog.setButtons(Dialog.CANCEL);
errorDialog.setScrollMode(Scroll.AUTO);
errorDialog.setHideOnButtonClick(true);
@@ -359,7 +359,7 @@
if (deletionErrorList.size() > 0) {
// Create a dialog window to show error message
final Dialog errorDialog = new Dialog();
- errorDialog.setHeading(I18N.CONSTANTS.deletionError());
+ errorDialog.setHeadingText(I18N.CONSTANTS.deletionError());
errorDialog.setButtons(Dialog.CANCEL);
errorDialog.setScrollMode(Scroll.AUTO);
errorDialog.setHideOnButtonClick(true);
Index: src/main/java/org/sigmah/client/page/admin/category/AdminCategoryView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/category/AdminCategoryView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/category/AdminCategoryView.java (working copy)
@@ -110,7 +110,7 @@
ColumnConfig column = new ColumnConfig();
column.setId("color");
column.setWidth(75);
- column.setHeader(I18N.CONSTANTS.adminCategoryElementColor());
+ column.setHeaderText(I18N.CONSTANTS.adminCategoryElementColor());
column.setRenderer(new GridCellRenderer<CategoryElementDTO>(){
@Override
@@ -126,7 +126,7 @@
column = new ColumnConfig();
column.setId("label");
column.setWidth(400);
- column.setHeader(I18N.CONSTANTS.adminCategoryElementLabel());
+ column.setHeaderText(I18N.CONSTANTS.adminCategoryElementLabel());
configs.add(column);
ColumnModel cm = new ColumnModel(configs);
@@ -151,7 +151,7 @@
column = new ColumnConfig();
column.setId("icon_name");
column.setWidth(75);
- column.setHeader(I18N.CONSTANTS.adminCategoryTypeIcon());
+ column.setHeaderText(I18N.CONSTANTS.adminCategoryTypeIcon());
column.setRenderer(new GridCellRenderer<CategoryTypeDTO>(){
@Override
Index: src/main/java/org/sigmah/client/page/admin/management/AdminBackupManagementView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/management/AdminBackupManagementView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/management/AdminBackupManagementView.java (working copy)
@@ -61,7 +61,7 @@
formFlexTable.setHeight(height + "px");
this.add(formFlexTable);
- this.setHeading(I18N.CONSTANTS.backupManagementTitle());
+ this.setHeadingText(I18N.CONSTANTS.backupManagementTitle());
this.setBodyStyleName("width-of-parent height-of-parent");
}
Index: src/main/java/org/sigmah/client/page/admin/management/AdminCoreManagementView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/management/AdminCoreManagementView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/management/AdminCoreManagementView.java (working copy)
@@ -80,7 +80,7 @@
this.add(formFlexTable);
this.setLayout(new FlowLayout());
- this.setHeading(I18N.CONSTANTS.organizationManagementTitle());
+ this.setHeadingText(I18N.CONSTANTS.organizationManagementTitle());
this.setBodyStyleName("width-of-parent height-of-parent");
}
Index: src/main/java/org/sigmah/client/page/admin/management/AdminExportManagementView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/management/AdminExportManagementView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/management/AdminExportManagementView.java (working copy)
@@ -30,7 +30,7 @@
@Inject
public AdminExportManagementView() {
- this.setHeading(I18N.CONSTANTS.defaultExportFormat());
+ this.setHeadingText(I18N.CONSTANTS.defaultExportFormat());
final FormPanel panel = new FormPanel();
panel.setHeaderVisible(false);
FormLayout layout = new FormLayout();
Index: src/main/java/org/sigmah/client/page/admin/model/common/AdminModelActionListener.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/model/common/AdminModelActionListener.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/model/common/AdminModelActionListener.java (working copy)
@@ -304,7 +304,7 @@
int height = 550;
String title = I18N.CONSTANTS.adminProjectModelCreationBox();
final Window window = new Window();
- window.setHeading(title);
+ window.setHeadingText(title);
window.setSize(width, height);
window.setPlain(true);
window.setModal(true);
@@ -357,7 +357,7 @@
int height = 550;
String title = I18N.CONSTANTS.adminOrgUnitsModelCreationBox();
final Window window = new Window();
- window.setHeading(title);
+ window.setHeadingText(title);
window.setSize(width, height);
window.setPlain(true);
window.setModal(true);
@@ -450,15 +450,15 @@
importDialog.setBlinkModal(true);
if (isProject) {
- importDialog.setHeading(I18N.CONSTANTS.adminProjectModelImport());
+ importDialog.setHeadingText(I18N.CONSTANTS.adminProjectModelImport());
} else {
if (isReport) {
- importDialog.setHeading(I18N.CONSTANTS.adminReportModelImport());
+ importDialog.setHeadingText(I18N.CONSTANTS.adminReportModelImport());
} else {
if (isOrgUnit) {
- importDialog.setHeading(I18N.CONSTANTS.adminOrgUnitsModelImport());
+ importDialog.setHeadingText(I18N.CONSTANTS.adminOrgUnitsModelImport());
} else {
- importDialog.setHeading(I18N.CONSTANTS.adminCategoryImport());
+ importDialog.setHeadingText(I18N.CONSTANTS.adminCategoryImport());
}
}
}
Index: src/main/java/org/sigmah/client/page/admin/model/common/AdminOneModelPresenter.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/model/common/AdminOneModelPresenter.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/model/common/AdminOneModelPresenter.java (working copy)
@@ -848,7 +848,7 @@
if (currentTabItem != null) {
for (int i = 0; i < MAIN_TABS.length; i++) {
- if (MAIN_TABS[i].equals(currentTabItem.getText())) {
+ if (MAIN_TABS[i].equals(currentTabItem.getHtml())) {
tabIndex = i;
break;
}
@@ -930,7 +930,7 @@
if (currentTabItem != null) {
for (int i = 0; i < MAIN_TABS.length; i++) {
- if (MAIN_TABS[i].equals(currentTabItem.getText())) {
+ if (MAIN_TABS[i].equals(currentTabItem.getHtml())) {
tabIndex = i;
break;
}
Index: src/main/java/org/sigmah/client/page/admin/model/common/element/AdminFlexibleElementsView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/model/common/element/AdminFlexibleElementsView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/model/common/element/AdminFlexibleElementsView.java (working copy)
@@ -135,7 +135,7 @@
int height = 200;
String title = I18N.CONSTANTS.adminFlexibleGroup();
final Window window = new Window();
- window.setHeading(title);
+ window.setHeadingText(title);
window.setSize(width, height);
window.setPlain(true);
window.setModal(true);
@@ -219,7 +219,7 @@
int height = 375;
String title = I18N.CONSTANTS.adminFlexible();
final Window window = new Window();
- window.setHeading(title);
+ window.setHeadingText(title);
window.setSize(width, height);
window.setPlain(true);
window.setModal(true);
Index: src/main/java/org/sigmah/client/page/admin/model/common/element/ElementForm.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/model/common/element/ElementForm.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/model/common/element/ElementForm.java (working copy)
@@ -452,7 +452,7 @@
if(flexibleElement != null && flexibleElement.getElementType()!= null){
if(ElementTypeEnum.DEFAULT.equals(flexibleElement.getElementType())){
- label.setText(DefaultFlexibleElementType.getName(((DefaultFlexibleElementDTO)flexibleElement).getType()));
+ label.setValue(DefaultFlexibleElementType.getName(((DefaultFlexibleElementDTO)flexibleElement).getType()));
label.show();
oldFieldProperties.put(AdminUtil.PROP_FX_NAME,DefaultFlexibleElementType.getName(((DefaultFlexibleElementDTO)flexibleElement).getType()));
htmlArea.setValue(DefaultFlexibleElementType.getName(((DefaultFlexibleElementDTO)flexibleElement).getType()));
Index: src/main/java/org/sigmah/client/page/admin/model/project/logframe/AdminLogFrameView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/model/project/logframe/AdminLogFrameView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/model/project/logframe/AdminLogFrameView.java (working copy)
@@ -126,7 +126,7 @@
final HBoxLayout oPanelLayout = new HBoxLayout();
oPanelLayout.setHBoxLayoutAlign(HBoxLayout.HBoxLayoutAlign.STRETCH);
objectivesPanel = new ContentPanel(oPanelLayout);
- objectivesPanel.setHeading(I18N.CONSTANTS.adminLogFrameObjectives());
+ objectivesPanel.setHeadingText(I18N.CONSTANTS.adminLogFrameObjectives());
objectivesPanel.setBorders(true);
objectivesPanel.setWidth(1200);
objectivesPanel.setHeight(150);
@@ -189,7 +189,7 @@
final HBoxLayout aPanelLayout = new HBoxLayout();
aPanelLayout.setHBoxLayoutAlign(HBoxLayout.HBoxLayoutAlign.STRETCH);
activitiesPanel = new ContentPanel(aPanelLayout);
- activitiesPanel.setHeading(I18N.CONSTANTS.adminLogFrameActivities());
+ activitiesPanel.setHeadingText(I18N.CONSTANTS.adminLogFrameActivities());
activitiesPanel.setBorders(true);
activitiesPanel.setWidth(1200);
activitiesPanel.setHeight(150);
@@ -259,7 +259,7 @@
final HBoxLayout rPanelLayout = new HBoxLayout();
rPanelLayout.setHBoxLayoutAlign(HBoxLayout.HBoxLayoutAlign.STRETCH);
resultsPanel = new ContentPanel(rPanelLayout);
- resultsPanel.setHeading(I18N.CONSTANTS.adminLogFrameResults());
+ resultsPanel.setHeadingText(I18N.CONSTANTS.adminLogFrameResults());
resultsPanel.setBorders(true);
resultsPanel.setWidth(1200);
resultsPanel.setHeight(150);
@@ -329,7 +329,7 @@
final HBoxLayout pPanelLayout = new HBoxLayout();
pPanelLayout.setHBoxLayoutAlign(HBoxLayout.HBoxLayoutAlign.STRETCH);
prerequisitesPanel = new ContentPanel(pPanelLayout);
- prerequisitesPanel.setHeading(I18N.CONSTANTS.adminLogFramePrerequisites());
+ prerequisitesPanel.setHeadingText(I18N.CONSTANTS.adminLogFramePrerequisites());
prerequisitesPanel.setBorders(true);
prerequisitesPanel.setWidth(1200);
prerequisitesPanel.setHeight(150);
Index: src/main/java/org/sigmah/client/page/admin/model/project/phase/AdminPhasesView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/model/project/phase/AdminPhasesView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/model/project/phase/AdminPhasesView.java (working copy)
@@ -182,7 +182,7 @@
int height = 400;
String title = I18N.CONSTANTS.adminPhaseName();
final Window window = new Window();
- window.setHeading(title);
+ window.setHeadingText(title);
window.setSize(width, height);
window.setPlain(true);
window.setModal(true);
Index: src/main/java/org/sigmah/client/page/admin/orgunit/AddOrgUnitWindow.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/orgunit/AddOrgUnitWindow.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/orgunit/AddOrgUnitWindow.java (working copy)
@@ -183,7 +183,7 @@
// Window.
window = new Window();
- window.setHeading(I18N.CONSTANTS.adminOrgUnitAdd());
+ window.setHeadingText(I18N.CONSTANTS.adminOrgUnitAdd());
window.setWidth(560);
window.setAutoHeight(true);
Index: src/main/java/org/sigmah/client/page/admin/orgunit/AdminOrgUnitView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/orgunit/AdminOrgUnitView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/orgunit/AdminOrgUnitView.java (working copy)
@@ -54,7 +54,7 @@
buildToolbar();
mainPanel = new ContentPanel(new FitLayout());
- mainPanel.setHeading(I18N.CONSTANTS.orgunitTree());
+ mainPanel.setHeadingText(I18N.CONSTANTS.orgunitTree());
mainPanel.setTopComponent(toolbar);
mainPanel.add(tree);
@@ -67,14 +67,14 @@
// Code
final ColumnConfig nameColumn = new ColumnConfig();
nameColumn.setId("name");
- nameColumn.setHeader(I18N.CONSTANTS.projectName());
+ nameColumn.setHeaderText(I18N.CONSTANTS.projectName());
nameColumn.setRenderer(new TreeGridCellRenderer<OrgUnitDTOLight>());
nameColumn.setWidth(150);
// Title
final ColumnConfig fullNameColumn = new ColumnConfig();
fullNameColumn.setId("fullName");
- fullNameColumn.setHeader(I18N.CONSTANTS.projectFullName());
+ fullNameColumn.setHeaderText(I18N.CONSTANTS.projectFullName());
fullNameColumn.setRenderer(new GridCellRenderer<OrgUnitDTOLight>() {
@Override
@@ -101,7 +101,7 @@
// Country
final ColumnConfig countryColumn = new ColumnConfig();
countryColumn.setId("country");
- countryColumn.setHeader(I18N.CONSTANTS.projectCountry());
+ countryColumn.setHeaderText(I18N.CONSTANTS.projectCountry());
countryColumn.setWidth(100);
countryColumn.setRenderer(new GridCellRenderer<OrgUnitDTOLight>() {
@@ -122,7 +122,7 @@
// OrgUnitModel
final ColumnConfig modelColumn = new ColumnConfig();
modelColumn.setId("oum");
- modelColumn.setHeader(I18N.CONSTANTS.projectModel());
+ modelColumn.setHeaderText(I18N.CONSTANTS.projectModel());
modelColumn.setWidth(200);
modelColumn.setRenderer(new GridCellRenderer<OrgUnitDTOLight>() {
Index: src/main/java/org/sigmah/client/page/admin/orgunit/MoveOrgUnitWindow.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/orgunit/MoveOrgUnitWindow.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/orgunit/MoveOrgUnitWindow.java (working copy)
@@ -199,7 +199,7 @@
orgUnitsField.reset();
orgUnitsStore.removeAll();
unitField.setValue(String.valueOf(moved.getId()));
- window.setHeading(I18N.CONSTANTS.adminOrgUnitMove() + " " + moved.getName() + " - " + moved.getFullName());
+ window.setHeadingText(I18N.CONSTANTS.adminOrgUnitMove() + " " + moved.getName() + " - " + moved.getFullName());
// if (moved.getParent() == null) {
// alertLabel.setHTML(I18N.CONSTANTS.adminOrgUnitMoveRoot());
Index: src/main/java/org/sigmah/client/page/admin/report/AdminReportModelView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/report/AdminReportModelView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/report/AdminReportModelView.java (working copy)
@@ -116,13 +116,13 @@
ColumnConfig column = new ColumnConfig();
column.setId("id");
column.setWidth(50);
- column.setHeader(I18N.CONSTANTS.adminFlexibleFieldId());
+ column.setHeaderText(I18N.CONSTANTS.adminFlexibleFieldId());
configs.add(column);
column = new ColumnConfig();
column.setId("index");
column.setWidth(50);
- column.setHeader(I18N.CONSTANTS.adminReportSectionIndex());
+ column.setHeaderText(I18N.CONSTANTS.adminReportSectionIndex());
NumberField index = new NumberField();
index.setAllowBlank(false);
column.setEditor(new CellEditor(index) {
@@ -139,7 +139,7 @@
column = new ColumnConfig();
column.setId("name");
column.setWidth(280);
- column.setHeader(I18N.CONSTANTS.adminReportSectionName());
+ column.setHeaderText(I18N.CONSTANTS.adminReportSectionName());
TextField<String> name = new TextField<String>();
name.setAllowBlank(false);
column.setEditor(new CellEditor(name));
@@ -148,7 +148,7 @@
column = new ColumnConfig();
column.setId("numberOfTextarea");
column.setWidth(75);
- column.setHeader(I18N.CONSTANTS.adminReportSectionNbText());
+ column.setHeaderText(I18N.CONSTANTS.adminReportSectionNbText());
NumberField nbTextAreas = new NumberField();
nbTextAreas.setAllowBlank(false);
column.setEditor(new CellEditor(nbTextAreas) {
@@ -165,7 +165,7 @@
column = new ColumnConfig();
column.setId("parentSectionModelName");
column.setWidth(280);
- column.setHeader(I18N.CONSTANTS.adminReportSectionParentSection());
+ column.setHeaderText(I18N.CONSTANTS.adminReportSectionParentSection());
parentSectionsCombo = new ComboBox<ProjectReportModelSectionDTO>();
parentSectionsCombo.setTriggerAction(TriggerAction.ALL);
parentSectionsCombo.setEditable(false);
Index: src/main/java/org/sigmah/client/page/admin/users/AdminUsersView.java
===================================================================
--- src/main/java/org/sigmah/client/page/admin/users/AdminUsersView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/admin/users/AdminUsersView.java (working copy)
@@ -117,7 +117,7 @@
// Users panel
usersListPanel = new ContentPanel();
usersListPanel.setScrollMode(Style.Scroll.AUTO);
- usersListPanel.setHeading(I18N.CONSTANTS.adminUsersPanel());
+ usersListPanel.setHeadingText(I18N.CONSTANTS.adminUsersPanel());
adminUsersStore = new AdminUsersPresenter.AdminUsersStore();
usersGrid = buildUsersGrid();
usersGrid.setSelectionModel(new GridSelectionModel<UserDTO>());
@@ -135,7 +135,7 @@
profilesListPanel = new ContentPanel(new FitLayout());
profilesListPanel.setScrollMode(Style.Scroll.AUTO);
- profilesListPanel.setHeading(I18N.CONSTANTS.adminProfilesPanel());
+ profilesListPanel.setHeadingText(I18N.CONSTANTS.adminProfilesPanel());
adminProfilesStore = new AdminUsersPresenter.AdminProfilesStore();
profilesGrid = buildProfilesGrid();
profilesGrid.setSelectionModel(new GridSelectionModel<ProfileDTO>());
@@ -152,7 +152,7 @@
privacyGroupsPanel = new ContentPanel(new FitLayout());
privacyGroupsPanel.setScrollMode(Style.Scroll.AUTO);
privacyGroupsPanel.setWidth(230);
- privacyGroupsPanel.setHeading(I18N.CONSTANTS.adminPrivacyGroups());
+ privacyGroupsPanel.setHeadingText(I18N.CONSTANTS.adminPrivacyGroups());
privacyGroupsPanel.add(privacyGroupsGrid);
privacyGroupsPanel.setTopComponent(initToolBar(3));
final BorderLayoutData rightLayoutData = new BorderLayoutData(LayoutRegion.EAST, 300);
@@ -449,7 +449,7 @@
column = new ColumnConfig("pwdChangeDate", I18N.CONSTANTS.adminUsersDatePasswordChange(), 120);
final DateTimeFormat format = DateUtils.DATE_SHORT;
- column.setHeader(I18N.CONSTANTS.adminUsersDatePasswordChange());
+ column.setHeaderText(I18N.CONSTANTS.adminUsersDatePasswordChange());
column.setDateTimeFormat(format);
column.setRenderer(new GridCellRenderer<UserDTO>() {
@Override
@@ -463,7 +463,7 @@
column = new ColumnConfig();
column.setId("profiles");
- column.setHeader(I18N.CONSTANTS.adminUsersProfiles());
+ column.setHeaderText(I18N.CONSTANTS.adminUsersProfiles());
column.setWidth(300);
column.setRenderer(new GridCellRenderer<UserDTO>() {
@@ -644,7 +644,7 @@
@Override
public UserSigmahForm showNewUserForm(Window window, AsyncCallback<CreateResult> callback, UserDTO userToUpdate) {
- window.setHeading(I18N.CONSTANTS.newUser());
+ window.setHeadingText(I18N.CONSTANTS.newUser());
window.setSize(550, 450);
window.setPlain(true);
window.setModal(true);
@@ -660,7 +660,7 @@
@Override
public ProfileSigmahForm showNewProfileForm(Window window, AsyncCallback<CreateResult> asyncCallback,
ProfileDTO profileToUpdate) {
- window.setHeading(I18N.CONSTANTS.adminProfileAdd());
+ window.setHeadingText(I18N.CONSTANTS.adminProfileAdd());
window.setSize(550, 500);
window.setPlain(true);
window.setModal(true);
@@ -675,7 +675,7 @@
@Override
public PrivacyGroupSigmahForm showNewPrivacyGroupForm(Window window, AsyncCallback<CreateResult> asyncCallback,
PrivacyGroupDTO privacyGroupToUpdate) {
- window.setHeading(I18N.CONSTANTS.addItem());
+ window.setHeadingText(I18N.CONSTANTS.addItem());
window.setSize(400, 150);
window.setPlain(true);
window.setModal(true);
Index: src/main/java/org/sigmah/client/page/charts/ChartPage.java
===================================================================
--- src/main/java/org/sigmah/client/page/charts/ChartPage.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/charts/ChartPage.java (working copy)
@@ -125,7 +125,7 @@
private void createWest() {
ContentPanel westPanel = new ContentPanel(new AccordionLayout());
- westPanel.setHeading(I18N.CONSTANTS.filter());
+ westPanel.setHeadingText(I18N.CONSTANTS.filter());
indicatorPanel = new IndicatorTreePanel(service, true);
indicatorPanel.setHeaderVisible(true);
@@ -167,7 +167,7 @@
south.setMargins(new Margins(5, 0, 0, 0));
gridPanel = new PivotGridPanel(eventBus, service);
- gridPanel.setHeading("Table");
+ gridPanel.setHeadingText("Table");
center.add(gridPanel, south);
}
Index: src/main/java/org/sigmah/client/page/common/dialog/FormDialogImpl.java
===================================================================
--- src/main/java/org/sigmah/client/page/common/dialog/FormDialogImpl.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/common/dialog/FormDialogImpl.java (working copy)
@@ -86,7 +86,7 @@
@Override
public void execute() {
if (!form.isValid()) {
- MessageBox.alert(getHeading(),
+ MessageBox.alert(getHeadingHtml(),
I18N.CONSTANTS.pleaseCompleteForm(), null);
} else {
onValidated();
@@ -185,7 +185,7 @@
cancelButton.enable();
status.clearStatus("");
- MessageBox.alert(this.getHeading(), I18N.CONSTANTS.serverError(), null);
+ MessageBox.alert(this.getHeadingHtml(), I18N.CONSTANTS.serverError(), null);
}
Index: src/main/java/org/sigmah/client/page/common/dialog/SavePromptMessageBox.java
===================================================================
--- src/main/java/org/sigmah/client/page/common/dialog/SavePromptMessageBox.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/common/dialog/SavePromptMessageBox.java (working copy)
@@ -48,7 +48,7 @@
setBodyStyle("padding: 5px;");
setWidth(450);
setHeight(200);
- setHeading(I18N.CONSTANTS.save());
+ setHeadingText(I18N.CONSTANTS.save());
setLayout(new CenterLayout());
add(new Html(I18N.CONSTANTS.promptSave()));
@@ -136,7 +136,7 @@
cancelButton.enable();
status.clearStatus("");
- MessageBox.alert(this.getHeading(), I18N.CONSTANTS.serverError(), null);
+ MessageBox.alert(this.getHeadingHtml(), I18N.CONSTANTS.serverError(), null);
}
Index: src/main/java/org/sigmah/client/page/common/filter/AdminFilterPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/common/filter/AdminFilterPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/common/filter/AdminFilterPanel.java (working copy)
@@ -51,7 +51,7 @@
this.setLayout(new FitLayout());
this.setScrollMode(Style.Scroll.AUTO);
- this.setHeading(I18N.CONSTANTS.filterByGeography());
+ this.setHeadingText(I18N.CONSTANTS.filterByGeography());
this.setIcon(IconImageBundle.ICONS.filter());
Index: src/main/java/org/sigmah/client/page/common/filter/DateRangePanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/common/filter/DateRangePanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/common/filter/DateRangePanel.java (working copy)
@@ -27,7 +27,7 @@
public DateRangePanel() {
super();
- setHeading(I18N.CONSTANTS.filterByDate());
+ setHeadingText(I18N.CONSTANTS.filterByDate());
setIcon(IconImageBundle.ICONS.filter());
setBodyStyle("padding:5px");
Index: src/main/java/org/sigmah/client/page/common/filter/IndicatorTreePanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/common/filter/IndicatorTreePanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/common/filter/IndicatorTreePanel.java (working copy)
@@ -54,7 +54,7 @@
public IndicatorTreePanel(Dispatcher service, final boolean multipleSelection, AsyncMonitor monitor) {
this.service = service;
//this.setHeaderVisible(false);
- this.setHeading(I18N.CONSTANTS.indicators());
+ this.setHeadingText(I18N.CONSTANTS.indicators());
this.setIcon(IconImageBundle.ICONS.indicator());
this.setLayout(new FitLayout());
this.setScrollMode(Style.Scroll.NONE);
Index: src/main/java/org/sigmah/client/page/common/filter/PartnerFilterPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/common/filter/PartnerFilterPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/common/filter/PartnerFilterPanel.java (working copy)
@@ -47,12 +47,12 @@
@Inject
public PartnerFilterPanel(Dispatcher service) {
this.service = service;
- setHeading(I18N.CONSTANTS.filterByPartner());
+ setHeadingText(I18N.CONSTANTS.filterByPartner());
setIcon(IconImageBundle.ICONS.filter());
this.setLayout(new FitLayout());
this.setScrollMode(Style.Scroll.NONE);
- this.setHeading(I18N.CONSTANTS.filterByPartner());
+ this.setHeadingText(I18N.CONSTANTS.filterByPartner());
this.setIcon(IconImageBundle.ICONS.filter());
loader = new BaseTreeLoader<ModelData>(new PartnerDataProxy()) {
Index: src/main/java/org/sigmah/client/page/common/nav/NavigationPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/common/nav/NavigationPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/common/nav/NavigationPanel.java (working copy)
@@ -45,7 +45,7 @@
public NavigationPanel(final EventBus eventBus, final Navigator navigator) {
this.eventBus = eventBus;
- this.setHeading(navigator.getHeading());
+ this.setHeadingText(navigator.getHeading());
this.setScrollMode(Scroll.NONE);
this.setLayout(new FitLayout());
Index: src/main/java/org/sigmah/client/page/common/widget/VSplitFilteredFrameSet.java
===================================================================
--- src/main/java/org/sigmah/client/page/common/widget/VSplitFilteredFrameSet.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/common/widget/VSplitFilteredFrameSet.java (working copy)
@@ -33,7 +33,7 @@
layoutData.setMargins(new Margins(0, 5, 0, 0));
filterPane = new ContentPanel();
- filterPane.setHeading(null);
+ filterPane.setHeadingText(null);
filterPane.setLayout(new AccordionLayout());
filterPane.add(super.getNavPanel());
container.add(filterPane, layoutData);
Index: src/main/java/org/sigmah/client/page/config/AccountPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/AccountPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/AccountPanel.java (working copy)
@@ -15,10 +15,10 @@
public AccountPanel() {
- this.setHeading(I18N.CONSTANTS.mySettings());
+ this.setHeadingText(I18N.CONSTANTS.mySettings());
FieldSet userInfoSet = new FieldSet();
- userInfoSet.setHeading(I18N.CONSTANTS.userInformation());
+ userInfoSet.setHeadingHtml(I18N.CONSTANTS.userInformation());
TextField<String> userNameField = new TextField<String>();
userNameField.setFieldLabel(I18N.CONSTANTS.yourName());
Index: src/main/java/org/sigmah/client/page/config/DbListPage.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/DbListPage.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/DbListPage.java (working copy)
@@ -46,7 +46,7 @@
presenter = new DbListPresenter(eventBus, dispatcher, this);
setLayout(new FitLayout());
- setHeading(I18N.CONSTANTS.databases());
+ setHeadingText(I18N.CONSTANTS.databases());
setIcon(IconImageBundle.ICONS.database());
createGrid();
Index: src/main/java/org/sigmah/client/page/config/DbListPresenter.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/DbListPresenter.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/DbListPresenter.java (working copy)
@@ -153,7 +153,7 @@
final FormDialogImpl dialog = new FormDialogImpl(form);
dialog.setWidth(400);
dialog.setHeight(200);
- dialog.setHeading(I18N.CONSTANTS.newDatabase());
+ dialog.setHeadingText(I18N.CONSTANTS.newDatabase());
dialog.show(new FormDialogCallback() {
Index: src/main/java/org/sigmah/client/page/config/DbPartnerGrid.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/DbPartnerGrid.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/DbPartnerGrid.java (working copy)
@@ -46,7 +46,7 @@
public void init(DbPartnerEditor editor, UserDatabaseDTO db, ListStore<PartnerDTO> store) {
super.init(editor, store);
- this.setHeading(db.getName() + " - " + messages.partners());
+ this.setHeadingText(db.getName() + " - " + messages.partners());
}
@@ -88,7 +88,7 @@
FormDialogImpl dlg = new FormDialogImpl(form);
dlg.setWidth(450);
dlg.setHeight(300);
- dlg.setHeading(messages.newPartner());
+ dlg.setHeadingText(messages.newPartner());
dlg.show(callback);
Index: src/main/java/org/sigmah/client/page/config/DbUserGrid.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/DbUserGrid.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/DbUserGrid.java (working copy)
@@ -37,14 +37,14 @@
protected UserDatabaseDTO db;
public DbUserGrid() {
- setHeading(I18N.CONSTANTS.users());
+ setHeadingText(I18N.CONSTANTS.users());
setLayout(new FitLayout());
}
public void init(DbUserEditor presenter, UserDatabaseDTO db, ListStore<UserPermissionDTO> store) {
this.db = db;
super.init(presenter, store);
- this.setHeading(db.getName() + " - " + I18N.CONSTANTS.users());
+ this.setHeadingText(db.getName() + " - " + I18N.CONSTANTS.users());
}
@@ -157,7 +157,7 @@
form.getBinding().bind(user);
FormDialogImpl dlg = new FormDialogImpl(form);
- dlg.setHeading(I18N.CONSTANTS.newUser());
+ dlg.setHeadingText(I18N.CONSTANTS.newUser());
dlg.setWidth(400);
dlg.setHeight(300);
Index: src/main/java/org/sigmah/client/page/config/design/DesignFormContainer.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/design/DesignFormContainer.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/design/DesignFormContainer.java (working copy)
@@ -50,13 +50,13 @@
dlg.setScrollMode(Style.Scroll.AUTOY);
if (entity instanceof ActivityDTO) {
- dlg.setHeading(I18N.CONSTANTS.newActivity());
+ dlg.setHeadingText(I18N.CONSTANTS.newActivity());
} else if (entity instanceof AttributeGroupDTO) {
- dlg.setHeading(I18N.CONSTANTS.newAttributeGroup());
+ dlg.setHeadingText(I18N.CONSTANTS.newAttributeGroup());
} else if (entity instanceof AttributeDTO) {
- dlg.setHeading(I18N.CONSTANTS.newAttribute());
+ dlg.setHeadingText(I18N.CONSTANTS.newAttribute());
} else if (entity instanceof IndicatorDTO) {
- dlg.setHeading(I18N.CONSTANTS.newIndicator());
+ dlg.setHeadingText(I18N.CONSTANTS.newIndicator());
}
dlg.show(callback);
Index: src/main/java/org/sigmah/client/page/config/design/DesignPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/design/DesignPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/design/DesignPanel.java (working copy)
@@ -383,7 +383,7 @@
form.setIdVisible(false);
final FormDialogImpl<IndicatorForm> dialog = new FormDialogImpl<IndicatorForm>(form);
- dialog.setHeading(I18N.CONSTANTS.newIndicator());
+ dialog.setHeadingText(I18N.CONSTANTS.newIndicator());
dialog.setWidth(form.getPreferredDialogWidth());
dialog.setHeight(form.getPreferredDialogHeight());
dialog.setScrollMode(Style.Scroll.AUTOY);
@@ -429,7 +429,7 @@
form.getBinding().bind(group);
final FormDialogImpl<IndicatorGroupForm> dialog = new FormDialogImpl<IndicatorGroupForm>(form);
- dialog.setHeading(I18N.CONSTANTS.newIndicatorGroup());
+ dialog.setHeadingText(I18N.CONSTANTS.newIndicatorGroup());
dialog.setWidth(form.getPreferredDialogWidth());
dialog.setHeight(form.getPreferredDialogHeight());
dialog.setScrollMode(Style.Scroll.AUTOY);
Index: src/main/java/org/sigmah/client/page/config/design/DesignPanelActivityInfo.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/design/DesignPanelActivityInfo.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/design/DesignPanelActivityInfo.java (working copy)
@@ -55,7 +55,7 @@
}
// setLayout(new BorderLayout());
setIcon(IconImageBundle.ICONS.design());
- setHeading(I18N.CONSTANTS.design() + " - " + db.getFullName());
+ setHeadingText(I18N.CONSTANTS.design() + " - " + db.getFullName());
doLoad();
// setActionEnabled(UIActions.delete, false);
Index: src/main/java/org/sigmah/client/page/config/design/IndicatorBrowseDialog.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/design/IndicatorBrowseDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/design/IndicatorBrowseDialog.java (working copy)
@@ -92,7 +92,7 @@
setWidth(450);
setHeight(350);
setButtons(OKCANCEL);
- setHeading("Select indicators");
+ setHeadingText("Select indicators");
setLayout(new FitLayout());
setBodyStyle("background: white");
add(treePanel);
Index: src/main/java/org/sigmah/client/page/config/design/IndicatorDialog.java
===================================================================
--- src/main/java/org/sigmah/client/page/config/design/IndicatorDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/config/design/IndicatorDialog.java (working copy)
@@ -78,7 +78,7 @@
this.indicator = new IndicatorDTO();
this.indicator.setProperties(indicator.getProperties());
- setHeading(indicator.getName() == null ? I18N.CONSTANTS.newIndicator() : indicator.getName());
+ setHeadingText(indicator.getName() == null ? I18N.CONSTANTS.newIndicator() : indicator.getName());
indicatorForm.getBinding().bind(this.indicator);
pivotPanel.load(databaseId, this.indicator);
Index: src/main/java/org/sigmah/client/page/dashboard/CreateProjectWindow.java
===================================================================
--- src/main/java/org/sigmah/client/page/dashboard/CreateProjectWindow.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/dashboard/CreateProjectWindow.java (working copy)
@@ -243,7 +243,7 @@
iconGrid.setText(0, 1, ProjectModelType.getName(type));
DOM.setStyleAttribute(iconGrid.getCellFormatter().getElement(0, 1), "paddingLeft", "5px");
- modelType.setText(iconGrid.getElement().getString());
+ modelType.setValue(iconGrid.getElement().getString());
}
});
@@ -286,7 +286,7 @@
// Computes the ratio between the allocated amount and the
// funding project.
if (currentFunding == null) {
- percentageField.setText(I18N.CONSTANTS.createProjectPercentageNotAvailable());
+ percentageField.setValue(I18N.CONSTANTS.createProjectPercentageNotAvailable());
} else {
switch (currentMode) {
@@ -300,13 +300,13 @@
double min;
if (budget <= 0) {
amountField.setValue(0);
- percentageField.setText("0.0 %");
+ percentageField.setValue("0.0 %");
break;
} else if ((min = Math.min(fundingBudget, budget)) < amountField.getValue().doubleValue()) {
amountField.setValue(min);
}
- percentageField.setText(NumberUtils.ratioAsString(amountField.getValue().doubleValue(), budget));
+ percentageField.setValue(NumberUtils.ratioAsString(amountField.getValue().doubleValue(), budget));
}
break;
case FUNDING: {
@@ -315,20 +315,20 @@
final double budget = budgetField.getValue().doubleValue();
if (fundingBudget <= 0) {
- percentageField.setText("0.0 %");
+ percentageField.setValue("0.0 %");
return;
}
double min;
if (budget <= 0) {
amountField.setValue(0);
- percentageField.setText("0.0 %");
+ percentageField.setValue("0.0 %");
break;
} else if ((min = Math.min(fundingBudget, budget)) < amountField.getValue().doubleValue()) {
amountField.setValue(min);
}
- percentageField.setText(NumberUtils.ratioAsString(amountField.getValue().doubleValue(),
+ percentageField.setValue(NumberUtils.ratioAsString(amountField.getValue().doubleValue(),
fundingBudget));
}
break;
@@ -337,7 +337,7 @@
budgetField.setValue(0);
break;
default:
- percentageField.setText(I18N.CONSTANTS.createProjectPercentageNotAvailable());
+ percentageField.setValue(I18N.CONSTANTS.createProjectPercentageNotAvailable());
break;
}
}
@@ -407,7 +407,7 @@
testProjectPanel = new FormPanel();
testProjectPanel.setPadding(0);
- testProjectPanel.setHeading(I18N.CONSTANTS.createTestProjectListe());
+ testProjectPanel.setHeadingText(I18N.CONSTANTS.createTestProjectListe());
testProjectPanel.setHeaderVisible(true);
testProjectStore = new ListStore<ProjectDTOLight>();
testProjectGrid = buildTestProjectPanel();
@@ -695,7 +695,7 @@
modelType.setValue("");
amountField.setValue(0);
budgetField.setValue(0);
- percentageField.setText("0 %");
+ percentageField.setValue("0 %");
alert = false;
// Manages the display mode.
@@ -735,7 +735,7 @@
budgetField.setAllowBlank(true);
testProjectPanel.setVisible(true);
testProjectGrid.setVisible(true);
- window.setHeading(I18N.CONSTANTS.createProjectTest());
+ window.setHeadingText(I18N.CONSTANTS.createProjectTest());
// window.setSize(550, 450);
break;
default:
Index: src/main/java/org/sigmah/client/page/dashboard/DashboardPresenter.java
===================================================================
--- src/main/java/org/sigmah/client/page/dashboard/DashboardPresenter.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/dashboard/DashboardPresenter.java (working copy)
@@ -122,7 +122,7 @@
if (result != null) {
view.getOrgUnitsStore().removeAll();
- view.getOrgUnitsPanel().setHeading(
+ view.getOrgUnitsPanel().setHeadingText(
I18N.CONSTANTS.orgunitTree() + " - " + result.getName() + " (" + result.getFullName() + ")");
view.getProjectsListPanel().refresh(true, result.getId());
Index: src/main/java/org/sigmah/client/page/dashboard/DashboardView.java
===================================================================
--- src/main/java/org/sigmah/client/page/dashboard/DashboardView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/dashboard/DashboardView.java (working copy)
@@ -138,7 +138,7 @@
final VBoxLayout menuPanelLayout = new VBoxLayout();
menuPanelLayout.setVBoxLayoutAlign(VBoxLayout.VBoxLayoutAlign.STRETCH);
menuPanel.setLayout(menuPanelLayout);
- menuPanel.setHeading(I18N.CONSTANTS.menu());
+ menuPanel.setHeadingText(I18N.CONSTANTS.menu());
buildNavLinks(menuPanel);
@@ -413,7 +413,7 @@
orgUnitsTreeGrid = new OrgUnitTreeGrid(eventBus, false);
final ContentPanel panel = new ContentPanel(new FitLayout());
- panel.setHeading(I18N.CONSTANTS.orgunitTree());
+ panel.setHeadingText(I18N.CONSTANTS.orgunitTree());
panel.setTopComponent(orgUnitsTreeGrid.getToolbar());
panel.add(orgUnitsTreeGrid.getTreeGrid());
@@ -438,7 +438,7 @@
private ContentPanel createReminderListPanel() {
final ContentPanel remindersPanel = new ContentPanel(new FitLayout());
- remindersPanel.setHeading(I18N.CONSTANTS.reminderPoints());
+ remindersPanel.setHeadingText(I18N.CONSTANTS.reminderPoints());
reminderStore = new ListStore<ReminderDTO>();
final Grid<ReminderDTO> reminderGrid =
@@ -459,7 +459,7 @@
// Icon
final ColumnConfig iconColumn = new ColumnConfig();
iconColumn.setId("icon");
- iconColumn.setHeader("");
+ iconColumn.setHeaderText("");
iconColumn.setWidth(16);
iconColumn.setRenderer(new GridCellRenderer<ReminderDTO>() {
@@ -478,13 +478,13 @@
// Label.
final ColumnConfig labelColumn = new ColumnConfig();
labelColumn.setId("label");
- labelColumn.setHeader(I18N.CONSTANTS.monitoredPointLabel());
+ labelColumn.setHeaderText(I18N.CONSTANTS.monitoredPointLabel());
labelColumn.setWidth(100);
// Expected date.
final ColumnConfig expectedDateColumn = new ColumnConfig();
expectedDateColumn.setId("expectedDate");
- expectedDateColumn.setHeader(I18N.CONSTANTS.monitoredPointExpectedDate());
+ expectedDateColumn.setHeaderText(I18N.CONSTANTS.monitoredPointExpectedDate());
expectedDateColumn.setWidth(60);
expectedDateColumn.setDateTimeFormat(format);
expectedDateColumn.setRenderer(new GridCellRenderer<ReminderDTO>() {
@@ -509,7 +509,7 @@
private ContentPanel createMonitoredPointListPanel() {
final ContentPanel monitoredPointsPanel = new ContentPanel(new FitLayout());
- monitoredPointsPanel.setHeading(I18N.CONSTANTS.monitoredPoints());
+ monitoredPointsPanel.setHeadingText(I18N.CONSTANTS.monitoredPoints());
monitoredPointStore = new ListStore<MonitoredPointDTO>();
final Grid<MonitoredPointDTO> reminderGrid =
@@ -531,7 +531,7 @@
// Icon
final ColumnConfig iconColumn = new ColumnConfig();
iconColumn.setId("icon");
- iconColumn.setHeader("");
+ iconColumn.setHeaderText("");
iconColumn.setWidth(16);
iconColumn.setRenderer(new GridCellRenderer<MonitoredPointDTO>() {
@@ -550,13 +550,13 @@
// Label.
final ColumnConfig labelColumn = new ColumnConfig();
labelColumn.setId("label");
- labelColumn.setHeader(I18N.CONSTANTS.monitoredPointLabel());
+ labelColumn.setHeaderText(I18N.CONSTANTS.monitoredPointLabel());
labelColumn.setWidth(100);
// Expected date.
final ColumnConfig expectedDateColumn = new ColumnConfig();
expectedDateColumn.setId("expectedDate");
- expectedDateColumn.setHeader(I18N.CONSTANTS.monitoredPointExpectedDate());
+ expectedDateColumn.setHeaderText(I18N.CONSTANTS.monitoredPointExpectedDate());
expectedDateColumn.setWidth(60);
expectedDateColumn.setDateTimeFormat(format);
expectedDateColumn.setRenderer(new GridCellRenderer<MonitoredPointDTO>() {
Index: src/main/java/org/sigmah/client/page/dashboard/OrgUnitTreeGrid.java
===================================================================
--- src/main/java/org/sigmah/client/page/dashboard/OrgUnitTreeGrid.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/dashboard/OrgUnitTreeGrid.java (working copy)
@@ -70,13 +70,13 @@
final ColumnConfig nameColumn = new ColumnConfig();
nameColumn.setId("name");
- nameColumn.setHeader(I18N.CONSTANTS.projectName());
+ nameColumn.setHeaderText(I18N.CONSTANTS.projectName());
nameColumn.setRenderer(new TreeGridCellRenderer<OrgUnitDTOLight>());
nameColumn.setWidth(150);
final ColumnConfig fullNameColumn = new ColumnConfig();
fullNameColumn.setId("fullName");
- fullNameColumn.setHeader(I18N.CONSTANTS.projectFullName());
+ fullNameColumn.setHeaderText(I18N.CONSTANTS.projectFullName());
fullNameColumn.setWidth(250);
fullNameColumn.setRenderer(new GridCellRenderer<OrgUnitDTOLight>() {
@@ -102,7 +102,7 @@
final ColumnConfig countryColumn = new ColumnConfig();
countryColumn.setId("country");
- countryColumn.setHeader(I18N.CONSTANTS.projectCountry());
+ countryColumn.setHeaderText(I18N.CONSTANTS.projectCountry());
countryColumn.setWidth(100);
countryColumn.setRenderer(new GridCellRenderer<OrgUnitDTOLight>() {
Index: src/main/java/org/sigmah/client/page/dashboard/ProjectsListPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/dashboard/ProjectsListPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/dashboard/ProjectsListPanel.java (working copy)
@@ -451,7 +451,7 @@
// Panel
projectTreePanel = new ContentPanel(new FitLayout());
- projectTreePanel.setHeading(I18N.CONSTANTS.projects());
+ projectTreePanel.setHeadingText(I18N.CONSTANTS.projects());
projectTreePanel.setTopComponent(toolbar);
@@ -888,7 +888,7 @@
@Override
public void handleEvent(StoreEvent<ProjectDTOLight> be) {
- projectTreePanel.setHeading(I18N.CONSTANTS.projects() + " ("
+ projectTreePanel.setHeadingText(I18N.CONSTANTS.projects() + " ("
+ projectTreeGrid.getTreeStore().getChildCount() + ')');
}
});
@@ -970,7 +970,7 @@
@SuppressWarnings("deprecation")
private void updateRefreshingDate(Date date) {
if (date != null) {
- refreshDateLabel.setText("(" + (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + "h"
+ refreshDateLabel.setHtml("(" + (date.getHours() < 10 ? "0" + date.getHours() : date.getHours()) + "h"
+ (date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes()) + ")");
}
}
Index: src/main/java/org/sigmah/client/page/entry/ActivityFilterPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/ActivityFilterPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/ActivityFilterPanel.java (working copy)
@@ -50,7 +50,7 @@
@Inject
public ActivityFilterPanel(Dispatcher dispatcher) {
this.service = dispatcher;
- this.setHeading(I18N.CONSTANTS.activities());
+ this.setHeadingText(I18N.CONSTANTS.activities());
this.setScrollMode(Scroll.NONE);
this.setLayout(new FitLayout());
Index: src/main/java/org/sigmah/client/page/entry/DataEntryPage.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/DataEntryPage.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/DataEntryPage.java (working copy)
@@ -124,7 +124,7 @@
private void addFilterPane() {
ContentPanel west = new ContentPanel();
- west.setHeading(I18N.CONSTANTS.filter());
+ west.setHeadingText(I18N.CONSTANTS.filter());
west.setIcon(IconImageBundle.ICONS.filter());
west.setLayout(new AccordionLayout());
west.add(activityPanel);
@@ -170,7 +170,7 @@
this.currentActivity = selectedItem;
applyFilter();
- gridPanel.setHeading(selectedItem.getName());
+ gridPanel.setHeadingText(selectedItem.getName());
if (siteMap.isVisible()) {
siteMap.loadSites(selectedItem);
}
Index: src/main/java/org/sigmah/client/page/entry/MonthlyGrid.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/MonthlyGrid.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/MonthlyGrid.java (working copy)
@@ -38,7 +38,7 @@
public MonthlyGrid(ActivityDTO activity) {
this.activity = activity;
- this.setHeading(I18N.CONSTANTS.monthlyReports());
+ this.setHeadingText(I18N.CONSTANTS.monthlyReports());
this.setLayout(new FitLayout());
this.setBorders(false);
this.setFrame(false);
Index: src/main/java/org/sigmah/client/page/entry/SiteDetailPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/SiteDetailPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/SiteDetailPanel.java (working copy)
@@ -51,7 +51,7 @@
this.eventBus = eventBus;
this.messages = messages;
- setHeading(I18N.CONSTANTS.details());
+ setHeadingText(I18N.CONSTANTS.details());
setScrollMode(Style.Scroll.AUTOY);
setLayout(new FitLayout());
@@ -89,13 +89,13 @@
}
private void updateHtml(SiteDTO site) {
- setHeading(site.getLocationName());
+ setHeadingText(site.getLocationName());
html.setHtml(renderSite(site));
}
public void clear() {
- setHeading(I18N.CONSTANTS.details());
+ setHeadingText(I18N.CONSTANTS.details());
html.setHtml("&nbsp;");
}
Index: src/main/java/org/sigmah/client/page/entry/SiteGridPanel.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/SiteGridPanel.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/SiteGridPanel.java (working copy)
@@ -101,7 +101,7 @@
this.siteUpdated = false;
setLayout(new FitLayout());
- setHeading("Sites");
+ setHeadingText("Sites");
initLoader();
store = new ListStore<SiteDTO>(loader);
Index: src/main/java/org/sigmah/client/page/entry/editor/AbstractFieldSet.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/editor/AbstractFieldSet.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/editor/AbstractFieldSet.java (working copy)
@@ -21,7 +21,7 @@
layout.setLabelWidth(labelWidth);
layout.setDefaultWidth(fieldWidth);
- this.setHeading(name);
+ this.setHeadingHtml(name);
this.setLayout(layout);
this.setCollapsible(false);
}
Index: src/main/java/org/sigmah/client/page/entry/editor/CommentFieldSet.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/editor/CommentFieldSet.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/editor/CommentFieldSet.java (working copy)
@@ -18,7 +18,7 @@
public CommentFieldSet() {
- setHeading(I18N.CONSTANTS.comments());
+ setHeadingHtml(I18N.CONSTANTS.comments());
setLayout(new FieldSetFitLayout());
setCollapsible(false);
setHeight(200);
Index: src/main/java/org/sigmah/client/page/entry/editor/IndicatorFieldSet.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/editor/IndicatorFieldSet.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/editor/IndicatorFieldSet.java (working copy)
@@ -30,7 +30,7 @@
layout.setCellPadding(5);
layout.setCellVerticalAlign(Style.VerticalAlignment.TOP);
- setHeading(I18N.CONSTANTS.indicators());
+ setHeadingHtml(I18N.CONSTANTS.indicators());
setLayout(layout);
setCollapsible(false);
setStyleAttribute("fontSize", "8pt");
Index: src/main/java/org/sigmah/client/page/entry/editor/MapFieldSet.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/editor/MapFieldSet.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/editor/MapFieldSet.java (working copy)
@@ -59,7 +59,7 @@
this.presenter = presenter;
- setHeading(I18N.CONSTANTS.geoPosition());
+ setHeadingHtml(I18N.CONSTANTS.geoPosition());
setLayout(new FieldSetFitLayout());
setHeight(250);
Index: src/main/java/org/sigmah/client/page/entry/editor/SiteForm.java
===================================================================
--- src/main/java/org/sigmah/client/page/entry/editor/SiteForm.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/entry/editor/SiteForm.java (working copy)
@@ -53,7 +53,7 @@
this.setBodyStyle("padding: 3px");
this.setIcon(IconImageBundle.ICONS.editPage());
- this.setHeading(I18N.CONSTANTS.loading());
+ this.setHeadingText(I18N.CONSTANTS.loading());
setLayout(new FlowLayout());
setScrollMode(Scroll.AUTOY);
@@ -80,7 +80,7 @@
public SiteForm(Dispatcher dispatcher, ActivityDTO activity) {
this();
- setHeading(activity.getName());
+ setHeadingText(activity.getName());
// ACTIVITY fieldset
Index: src/main/java/org/sigmah/client/page/login/LoginView.java
===================================================================
--- src/main/java/org/sigmah/client/page/login/LoginView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/login/LoginView.java (working copy)
@@ -150,7 +150,7 @@
// If the user clicked on "OK".
if(Dialog.OK.equals(be.getButtonClicked().getItemId())) {
final Dialog waitDialog = new Dialog();
- waitDialog.setHeading(I18N.CONSTANTS.loginPasswordForgotten());
+ waitDialog.setHeadingText(I18N.CONSTANTS.loginPasswordForgotten());
waitDialog.addText(I18N.CONSTANTS.loading());
waitDialog.setButtons("");
waitDialog.setModal(true);
Index: src/main/java/org/sigmah/client/page/map/BubbleLayerForm.java
===================================================================
--- src/main/java/org/sigmah/client/page/map/BubbleLayerForm.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/map/BubbleLayerForm.java (working copy)
@@ -23,7 +23,7 @@
public BubbleLayerForm() {
super();
- setHeading(I18N.CONSTANTS.selectTheSymbol());
+ setHeadingText(I18N.CONSTANTS.selectTheSymbol());
setIcon(IconImageBundle.ICONS.graduatedSymbol());
setLabelWidth(100);
Index: src/main/java/org/sigmah/client/page/map/LayoutForm.java
===================================================================
--- src/main/java/org/sigmah/client/page/map/LayoutForm.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/map/LayoutForm.java (working copy)
@@ -41,7 +41,7 @@
this.service = service;
- setHeading(I18N.CONSTANTS.pageLayout());
+ setHeadingText(I18N.CONSTANTS.pageLayout());
setIcon(IconImageBundle.ICONS.report());
setLabelWidth(125);
Index: src/main/java/org/sigmah/client/page/map/MapForm.java
===================================================================
--- src/main/java/org/sigmah/client/page/map/MapForm.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/map/MapForm.java (working copy)
@@ -48,13 +48,13 @@
this.messages = messages;
this.icons = icons;
- setHeading(I18N.CONSTANTS.settings());
+ setHeadingText(I18N.CONSTANTS.settings());
accordionLayout = new AccordionLayout();
setLayout(accordionLayout);
indicatorTree = new IndicatorTreePanel(service, false);
- indicatorTree.setHeading(messages.indicators());
+ indicatorTree.setHeadingText(messages.indicators());
indicatorTree.setIcon(icons.indicator());
indicatorTree.setHeaderVisible(true);
add(indicatorTree);
Index: src/main/java/org/sigmah/client/page/map/MapPage.java
===================================================================
--- src/main/java/org/sigmah/client/page/map/MapPage.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/map/MapPage.java (working copy)
@@ -57,7 +57,7 @@
private void createPreview() {
previewPanel = new MapPreview();
- previewPanel.setHeading(I18N.CONSTANTS.preview());
+ previewPanel.setHeadingText(I18N.CONSTANTS.preview());
add(previewPanel, new BorderLayoutData(Style.LayoutRegion.CENTER));
}
Index: src/main/java/org/sigmah/client/page/map/MapPreview.java
===================================================================
--- src/main/java/org/sigmah/client/page/map/MapPreview.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/map/MapPreview.java (working copy)
@@ -68,7 +68,7 @@
public MapPreview() {
- setHeading(I18N.CONSTANTS.preview());
+ setHeadingText(I18N.CONSTANTS.preview());
setLayout(new FlowLayout());
setScrollMode(Style.Scroll.AUTO);
Index: src/main/java/org/sigmah/client/page/orgunit/OrgUnitPresenter.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/OrgUnitPresenter.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/OrgUnitPresenter.java (working copy)
@@ -223,7 +223,7 @@
// Panel.
final ContentPanel panel = view.getPanelBanner();
- panel.setHeading(currentOrgUnitDTO.getOrgUnitModel().getTitle()
+ panel.setHeadingText(currentOrgUnitDTO.getOrgUnitModel().getTitle()
+ ' '
+ currentOrgUnitDTO.getName()
+ " ("
Index: src/main/java/org/sigmah/client/page/orgunit/dashboard/OrgUnitDashboardView.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/dashboard/OrgUnitDashboardView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/dashboard/OrgUnitDashboardView.java (working copy)
@@ -36,7 +36,7 @@
tree = new OrgUnitTreeGrid(eventBus, false);
projectsListPanel = new ProjectsListPanel(dispatcher, authentication, eventBus);
- setHeading(I18N.CONSTANTS.orgunitTree());
+ setHeadingText(I18N.CONSTANTS.orgunitTree());
final VBoxLayout layout = new VBoxLayout() {
@Override
Index: src/main/java/org/sigmah/client/page/orgunit/details/OrgUnitDetailsView.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/details/OrgUnitDetailsView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/details/OrgUnitDetailsView.java (working copy)
@@ -41,7 +41,7 @@
setLayout(layout);
setHeaderVisible(true);
setBorders(true);
- setHeading(I18N.CONSTANTS.projectDetails());
+ setHeadingText(I18N.CONSTANTS.projectDetails());
// Toolbar.
final ToolBar toolBar = buildToolbar();
Index: src/main/java/org/sigmah/client/page/orgunit/reports/AttachFileHandler.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/reports/AttachFileHandler.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/reports/AttachFileHandler.java (working copy)
@@ -77,8 +77,8 @@
}
uploadFormPanel.reset();
- phaseField.setText(phaseName);
- elementField.setText(flexibleElement.getLabel());
+ phaseField.setValue(phaseName);
+ elementField.setValue(flexibleElement.getLabel());
// Upload the selected file immediately after it's selected.
uploadField.removeAllListeners();
@@ -101,8 +101,8 @@
currentCreatedDocument.setLastEditDate(new Date());
currentCreatedDocument.setEditorName(authentication.getUserShortName());
currentCreatedDocument.setDocument(true);
- currentCreatedDocument.setFlexibleElementLabel(elementField.getText());
- currentCreatedDocument.setPhaseName(phaseField.getText());
+ currentCreatedDocument.setFlexibleElementLabel((String) elementField.getValue());
+ currentCreatedDocument.setPhaseName((String) phaseField.getValue());
// Debug form hidden values.
if (Log.isDebugEnabled()) {
@@ -277,7 +277,7 @@
// Dialog box.
final Dialog dialogBox = new Dialog();
dialogBox.setButtons(Dialog.CLOSE);
- dialogBox.setHeading(I18N.CONSTANTS.flexibleElementFilesListAddDocumentDetails());
+ dialogBox.setHeadingText(I18N.CONSTANTS.flexibleElementFilesListAddDocumentDetails());
dialogBox.setModal(true);
dialogBox.setResizable(false);
Index: src/main/java/org/sigmah/client/page/orgunit/reports/AttachReportHandler.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/reports/AttachReportHandler.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/reports/AttachReportHandler.java (working copy)
@@ -59,7 +59,7 @@
private Dialog createDialog() {
final Dialog dialogBox = new Dialog();
dialogBox.setButtons(Dialog.OKCANCEL);
- dialogBox.setHeading(I18N.CONSTANTS.reportCreateReport());
+ dialogBox.setHeadingText(I18N.CONSTANTS.reportCreateReport());
dialogBox.setModal(true);
dialogBox.setResizable(false);
Index: src/main/java/org/sigmah/client/page/orgunit/reports/EditReportDialog.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/reports/EditReportDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/reports/EditReportDialog.java (working copy)
@@ -43,7 +43,7 @@
if (editReportDialog == null) {
final Dialog dialog = new Dialog();
dialog.setButtons(Dialog.OKCANCEL);
- dialog.setHeading(I18N.CONSTANTS.reportCreateReport());
+ dialog.setHeadingText(I18N.CONSTANTS.reportCreateReport());
dialog.setModal(true);
dialog.setResizable(false);
Index: src/main/java/org/sigmah/client/page/orgunit/reports/KeyQuestionDialog.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/reports/KeyQuestionDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/reports/KeyQuestionDialog.java (working copy)
@@ -70,11 +70,11 @@
final FoldPanel panel, final int toolButtonIndex, final KeyQuestionState keyQuestionState,
boolean enabled) {
final Dialog dialog = getDialog();
- dialog.setHeading(I18N.MESSAGES.reportKeyQuestionDialogTitle(Integer.toString(keyQuestion.getNumber())));
+ dialog.setHeadingText(I18N.MESSAGES.reportKeyQuestionDialogTitle(Integer.toString(keyQuestion.getNumber())));
// Question label
final Label question = (Label) dialog.getWidget(0);
- question.setText(keyQuestion.getLabel());
+ question.setHtml(keyQuestion.getLabel());
// Rich text editor
final RichTextArea dialogTextArea = (RichTextArea) dialog.getWidget(1);
Index: src/main/java/org/sigmah/client/page/orgunit/reports/KeyQuestionState.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/reports/KeyQuestionState.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/reports/KeyQuestionState.java (working copy)
@@ -55,6 +55,6 @@
}
private void updateLabel() {
- label.setText(I18N.MESSAGES.reportKeyQuestions(Integer.toString(valids), Integer.toString(count)));
+ label.setHtml(I18N.MESSAGES.reportKeyQuestions(Integer.toString(valids), Integer.toString(count)));
}
}
Index: src/main/java/org/sigmah/client/page/orgunit/reports/OrgUnitReportsView.java
===================================================================
--- src/main/java/org/sigmah/client/page/orgunit/reports/OrgUnitReportsView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/orgunit/reports/OrgUnitReportsView.java (working copy)
@@ -178,7 +178,7 @@
*/
private ContentPanel createDocumentList(final ListStore<ReportReference> store) {
final ContentPanel panel = new ContentPanel(new FitLayout());
- panel.setHeading(I18N.CONSTANTS.projectTabReports());
+ panel.setHeadingText(I18N.CONSTANTS.projectTabReports());
// Toolbar
final ToolBar toolBar = new ToolBar();
@@ -442,7 +442,7 @@
// Title bar
final ContentPanel reportPanel = new ContentPanel(new FitLayout());
reportPanel.setScrollMode(Scroll.AUTOY);
- reportPanel.setHeading(report.getName());
+ reportPanel.setHeadingText(report.getName());
final ToolButton closeButton = new ToolButton("x-tool-close");
closeButton.addListener(Events.Select, new Listener<BaseEvent>() {
@@ -607,9 +607,9 @@
final Date now = new Date();
header.clear();
- draftLastChangedTime.setText(I18N.MESSAGES.reportDraftLastChanged(dateFormat.format(now),
+ draftLastChangedTime.setHtml(I18N.MESSAGES.reportDraftLastChanged(dateFormat.format(now),
timeFormat.format(now)));
- personalDraft.setText(I18N.MESSAGES.personalDraft());
+ personalDraft.setHtml(I18N.MESSAGES.personalDraft());
header.add(personalDraft);
header.add(draftLastChangedTime);
header.add(buttons);
@@ -939,7 +939,7 @@
imageAddDialog = new Dialog();
imageAddDialog.setButtons(Dialog.OKCANCEL);
- imageAddDialog.setHeading(I18N.CONSTANTS.reportAddImageDialogTitle());
+ imageAddDialog.setHeadingText(I18N.CONSTANTS.reportAddImageDialogTitle());
imageAddDialog.setModal(true);
imageAddDialog.setResizable(false);
Index: src/main/java/org/sigmah/client/page/project/ProjectPresenter.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/ProjectPresenter.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/ProjectPresenter.java (working copy)
@@ -235,7 +235,7 @@
w.setBlinkModal(true);
w.setLayout(new FitLayout());
w.setSize(350,180);
- w.setHeading(I18N.CONSTANTS.exportData());
+ w.setHeadingText(I18N.CONSTANTS.exportData());
final FormPanel panel=new FormPanel();
@@ -490,7 +490,7 @@
if (projectTitle != null && !projectTitle.isEmpty())
titleToDisplay = projectTitle.length() > 110 ? projectTitle.substring(0, 110) + "..." : projectTitle;
- panel.setHeading(I18N.CONSTANTS.projectMainTabTitle()
+ panel.setHeadingText(I18N.CONSTANTS.projectMainTabTitle()
+ ' '
+ currentProjectDTO.getName()
+ " ("
@@ -584,7 +584,7 @@
if (component instanceof LabelField) {
LabelField lableFieldComponent = (LabelField) component;
// Get the text of the field
- String textValue = lableFieldComponent.getText();
+ String textValue = lableFieldComponent.getValue().toString();
// Set the tool tip
ToolTipConfig config = new ToolTipConfig();
@@ -596,7 +596,7 @@
if (textValue != null && !textValue.isEmpty()) {
String newTextValue =
textValue.length() > 30 ? textValue.substring(0, 29) + "..." : textValue;
- lableFieldComponent.setText(newTextValue);
+ lableFieldComponent.setValue(newTextValue);
}
groupPanel.add(lableFieldComponent);
} else {
Index: src/main/java/org/sigmah/client/page/project/ProjectView.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/ProjectView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/ProjectView.java (working copy)
@@ -96,7 +96,7 @@
vBoxLayout.setVBoxLayoutAlign(VBoxLayout.VBoxLayoutAlign.STRETCH);
vBoxLayout.setPadding(new Padding(4));
final ContentPanel amendmentPanel = new ContentPanel(vBoxLayout);
- amendmentPanel.setHeading(I18N.CONSTANTS.amendmentBoxTitle());
+ amendmentPanel.setHeadingText(I18N.CONSTANTS.amendmentBoxTitle());
return amendmentPanel;
}
Index: src/main/java/org/sigmah/client/page/project/calendar/ProjectCalendarView.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/calendar/ProjectCalendarView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/calendar/ProjectCalendarView.java (working copy)
@@ -90,7 +90,7 @@
setLayout(borderLayout);
final ContentPanel calendarList = new ContentPanel(new FitLayout());
- calendarList.setHeading(I18N.CONSTANTS.projectTabCalendar());
+ calendarList.setHeadingText(I18N.CONSTANTS.projectTabCalendar());
final BorderLayoutData calendarListData = new BorderLayoutData(LayoutRegion.WEST, 250);
calendarListData.setCollapsible(true);
add(calendarList, calendarListData);
@@ -145,13 +145,13 @@
final ContentPanel calendarView = new ContentPanel(new FitLayout());
// Retrieving the current calendar header
- calendarView.setHeading(calendar.getHeading());
+ calendarView.setHeadingText(calendar.getHeading());
// Listening for further calendar header changes
calendar.setListener(new CalendarWidget.CalendarListener() {
@Override
public void afterRefresh() {
- calendarView.setHeading(calendar.getHeading());
+ calendarView.setHeadingText(calendar.getHeading());
}
});
@@ -287,7 +287,7 @@
if (addPersonalEventDialog == null) {
final Dialog dialog = new Dialog();
dialog.setButtons(Dialog.OKCANCEL);
- dialog.setHeading(I18N.CONSTANTS.calendarAddEvent());
+ dialog.setHeadingText(I18N.CONSTANTS.calendarAddEvent());
dialog.setModal(true);
dialog.setResizable(false);
Index: src/main/java/org/sigmah/client/page/project/dashboard/EditFormWindow.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/dashboard/EditFormWindow.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/dashboard/EditFormWindow.java (working copy)
@@ -307,10 +307,10 @@
init();
}
- titleLabel.setText(header);
+ titleLabel.setHtml(header);
// Open the window.
- window.setHeading(title);
+ window.setHeadingText(title);
window.setHeight(100 + (FIELD_HEIGHT * (fields.size())));
window.show();
}
Index: src/main/java/org/sigmah/client/page/project/dashboard/FinancialProjectEditButtonGridCellRender.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/dashboard/FinancialProjectEditButtonGridCellRender.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/dashboard/FinancialProjectEditButtonGridCellRender.java (working copy)
@@ -110,7 +110,7 @@
amountField.setValue(0);
}
- percentageField.setText(NumberUtils.ratioAsString(amountField.getValue(),
+ percentageField.setValue(NumberUtils.ratioAsString(amountField.getValue(),
projectPresenter.getCurrentProjectDTO().getPlannedBudget()));
}
});
@@ -187,7 +187,7 @@
Button btn = be.getButtonClicked();
//If user clicks the Yes button,begin to delete
- if(btn.getText().equals(I18N.CONSTANTS.yes()))
+ if(btn.getHtml().equals(I18N.CONSTANTS.yes()))
{
HashMap<String, Object> properties = new HashMap <String,Object>();
Index: src/main/java/org/sigmah/client/page/project/dashboard/LocalPartnerProjectEditButtonGridCellRender.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/dashboard/LocalPartnerProjectEditButtonGridCellRender.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/dashboard/LocalPartnerProjectEditButtonGridCellRender.java (working copy)
@@ -109,7 +109,7 @@
amountField.setValue(0);
}
- percentageField.setText(NumberUtils.ratioAsString(amountField.getValue(),
+ percentageField.setValue(NumberUtils.ratioAsString(amountField.getValue(),
projectPresenter.getCurrentProjectDTO().getPlannedBudget()));
}
});
@@ -187,7 +187,7 @@
Button btn = be.getButtonClicked();
//If user clicks the Yes button,begin to delete
- if(btn.getText().equals(I18N.CONSTANTS.yes()))
+ if(btn.getHtml().equals(I18N.CONSTANTS.yes()))
{
HashMap<String, Object> properties = new HashMap <String,Object>();
Index: src/main/java/org/sigmah/client/page/project/dashboard/MonitoredPointLabelCellRender.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/dashboard/MonitoredPointLabelCellRender.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/dashboard/MonitoredPointLabelCellRender.java (working copy)
@@ -159,7 +159,7 @@
Button btn = be.getButtonClicked();
//If user clicks the Yes button,begin to delete
- if(btn.getText().equals(I18N.CONSTANTS.yes()))
+ if(btn.getHtml().equals(I18N.CONSTANTS.yes()))
{
HashMap<String, Object> properties = new HashMap <String,Object>();
properties.put("expectedDate",model.getExpectedDate().getTime());
Index: src/main/java/org/sigmah/client/page/project/dashboard/ProjectDashboardPresenter.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/dashboard/ProjectDashboardPresenter.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/dashboard/ProjectDashboardPresenter.java (working copy)
@@ -1407,7 +1407,7 @@
DOM.setStyleAttribute(iconGrid.getCellFormatter().getElement(0, 1), "paddingLeft",
"5px");
- modelTypeLabel.setText(iconGrid.getElement().getString());
+ modelTypeLabel.setValue(iconGrid.getElement().getString());
}
});
@@ -1420,7 +1420,7 @@
amountField.setValue(0);
}
- percentageField.setText(NumberUtils.ratioAsString(amountField.getValue(),
+ percentageField.setValue(NumberUtils.ratioAsString(amountField.getValue(),
projectPresenter.getCurrentProjectDTO().getPlannedBudget()));
}
});
@@ -1662,7 +1662,7 @@
DOM.setStyleAttribute(iconGrid.getCellFormatter().getElement(0, 1), "paddingLeft",
"5px");
- modelTypeLabel.setText(iconGrid.getElement().getString());
+ modelTypeLabel.setValue(iconGrid.getElement().getString());
}
});
@@ -1678,9 +1678,9 @@
final List<ProjectDTOLight> selection = projects.getSelection();
if (selection == null || selection.isEmpty()) {
- percentageField.setText(I18N.CONSTANTS.createProjectPercentageNotAvailable());
+ percentageField.setValue(I18N.CONSTANTS.createProjectPercentageNotAvailable());
} else {
- percentageField.setText(NumberUtils.ratioAsString(amountField.getValue(), selection
+ percentageField.setValue(NumberUtils.ratioAsString(amountField.getValue(), selection
.get(0).getPlannedBudget()));
}
}
@@ -2168,7 +2168,7 @@
}
- view.getRequiredElementContentPanel().setHeading(
+ view.getRequiredElementContentPanel().setHeadingText(
I18N.CONSTANTS.projectRequiredElements()
+ " ("
+ filledRequiredElements
Index: src/main/java/org/sigmah/client/page/project/dashboard/ProjectDashboardView.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/dashboard/ProjectDashboardView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/dashboard/ProjectDashboardView.java (working copy)
@@ -174,7 +174,7 @@
cd.setMargins(new Margins(0, 4, 4, 0));
final ContentPanel cp2 = new ContentPanel(new FitLayout());
- cp2.setHeading(I18N.CONSTANTS.phaseDetails());
+ cp2.setHeadingText(I18N.CONSTANTS.phaseDetails());
cp2.setScrollMode(Scroll.AUTOY);
cp2.setTopComponent(toolBar);
@@ -188,7 +188,7 @@
final VBoxLayout vLayout = new VBoxLayout();
vLayout.setVBoxLayoutAlign(VBoxLayoutAlign.STRETCH);
final ContentPanel westPanel = new ContentPanel(vLayout);
- westPanel.setHeading(I18N.CONSTANTS.reminders());
+ westPanel.setHeadingText(I18N.CONSTANTS.reminders());
final VBoxLayoutData flex = new VBoxLayoutData(new Margins(0, 0, 5, 0));
flex.setFlex(1);
@@ -203,7 +203,7 @@
final HBoxLayout layout = new StylableHBoxLayout("join-background");
layout.setHBoxLayoutAlign(HBoxLayoutAlign.STRETCH);
final ContentPanel southPanel = new ContentPanel(layout);
- southPanel.setHeading(I18N.CONSTANTS.projectLinkedProjects());
+ southPanel.setHeadingText(I18N.CONSTANTS.projectLinkedProjects());
panelFinancialProjects.setWidth("50%");
panelLocalProjects.setWidth("50%");
@@ -555,7 +555,7 @@
// Name.
final ColumnConfig nameColumn = new ColumnConfig();
nameColumn.setId("name");
- nameColumn.setHeader(I18N.CONSTANTS.projectName());
+ nameColumn.setHeaderText(I18N.CONSTANTS.projectName());
nameColumn.setWidth(80);
nameColumn.setRenderer(new GridCellRenderer<ProjectFundingDTO>() {
@@ -574,7 +574,7 @@
// Full name.
final ColumnConfig fullNameColumn = new ColumnConfig();
fullNameColumn.setId("fullName");
- fullNameColumn.setHeader(I18N.CONSTANTS.projectFullName());
+ fullNameColumn.setHeaderText(I18N.CONSTANTS.projectFullName());
fullNameColumn.setWidth(130);
fullNameColumn.setRenderer(new GridCellRenderer<ProjectFundingDTO>() {
@@ -591,13 +591,13 @@
// Amount.
final ColumnConfig amountColumn = new ColumnConfig();
amountColumn.setId("percentage");
- amountColumn.setHeader(I18N.CONSTANTS.projectFinances() + " (" + I18N.CONSTANTS.currencyEuro() + ')');
+ amountColumn.setHeaderText(I18N.CONSTANTS.projectFinances() + " (" + I18N.CONSTANTS.currencyEuro() + ')');
amountColumn.setWidth(120);
// Percentage.
final ColumnConfig percentageColumn = new ColumnConfig();
percentageColumn.setId("percentage2");
- percentageColumn.setHeader(I18N.CONSTANTS.createProjectPercentage());
+ percentageColumn.setHeaderText(I18N.CONSTANTS.createProjectPercentage());
percentageColumn.setWidth(60);
percentageColumn.setRenderer(new GridCellRenderer<ProjectFundingDTO>() {
@@ -654,7 +654,7 @@
// Name.
final ColumnConfig nameColumn = new ColumnConfig();
nameColumn.setId("name");
- nameColumn.setHeader(I18N.CONSTANTS.projectName());
+ nameColumn.setHeaderText(I18N.CONSTANTS.projectName());
nameColumn.setWidth(80);
nameColumn.setRenderer(new GridCellRenderer<ProjectFundingDTO>() {
@@ -673,7 +673,7 @@
// Full name.
final ColumnConfig fullNameColumn = new ColumnConfig();
fullNameColumn.setId("fullName");
- fullNameColumn.setHeader(I18N.CONSTANTS.projectFullName());
+ fullNameColumn.setHeaderText(I18N.CONSTANTS.projectFullName());
fullNameColumn.setWidth(130);
fullNameColumn.setRenderer(new GridCellRenderer<ProjectFundingDTO>() {
@@ -690,13 +690,13 @@
// Amount.
final ColumnConfig amountColumn = new ColumnConfig();
amountColumn.setId("percentage");
- amountColumn.setHeader(I18N.CONSTANTS.projectFundedBy() + " (" + I18N.CONSTANTS.currencyEuro() + ')');
+ amountColumn.setHeaderText(I18N.CONSTANTS.projectFundedBy() + " (" + I18N.CONSTANTS.currencyEuro() + ')');
amountColumn.setWidth(120);
// Percentage.
final ColumnConfig percentageColumn = new ColumnConfig();
percentageColumn.setId("percentage2");
- percentageColumn.setHeader(I18N.CONSTANTS.createProjectPercentage());
+ percentageColumn.setHeaderText(I18N.CONSTANTS.createProjectPercentage());
percentageColumn.setWidth(60);
percentageColumn.setRenderer(new GridCellRenderer<ProjectFundingDTO>() {
@@ -841,7 +841,7 @@
// Panel.
final ContentPanel panel = new ContentPanel(new FitLayout());
- panel.setHeading(I18N.CONSTANTS.reminderPoints());
+ panel.setHeadingText(I18N.CONSTANTS.reminderPoints());
panel.setBorders(false);
panel.setTopComponent(toolbar);
@@ -967,7 +967,7 @@
// Panel.
final ContentPanel panel = new ContentPanel(new FitLayout());
- panel.setHeading(I18N.CONSTANTS.monitoredPoints());
+ panel.setHeadingText(I18N.CONSTANTS.monitoredPoints());
panel.setBorders(false);
panel.setTopComponent(toolbar);
@@ -1043,7 +1043,7 @@
// Completed ?
final CheckColumnConfig completedColumn = new CheckColumnConfig();
completedColumn.setId("completed");
- completedColumn.setHeader(I18N.CONSTANTS.monitoredPointClose() + "?");
+ completedColumn.setHeaderText(I18N.CONSTANTS.monitoredPointClose() + "?");
completedColumn.setWidth(20);
completedColumn.setSortable(false);
final CellEditor checkBoxEditor = new CellEditor(new CheckBox());
@@ -1052,7 +1052,7 @@
// Icon
final ColumnConfig iconColumn = new ColumnConfig();
iconColumn.setId("icon");
- iconColumn.setHeader("");
+ iconColumn.setHeaderText("");
iconColumn.setWidth(16);
iconColumn.setRenderer(new GridCellRenderer<MonitoredPointDTO>() {
@@ -1073,7 +1073,7 @@
// Label.
final ColumnConfig labelColumn = new ColumnConfig();
labelColumn.setId("label");
- labelColumn.setHeader(I18N.CONSTANTS.monitoredPointLabel());
+ labelColumn.setHeaderText(I18N.CONSTANTS.monitoredPointLabel());
labelColumn.setWidth(60);
if (ProfileUtils.isGranted(authentication, GlobalPermissionEnum.EDIT_PROJECT)) {
labelColumn.setRenderer(new MonitoredPointLabelCellRender(this, this.dispatcher));
@@ -1082,7 +1082,7 @@
// Expected date.
final ColumnConfig expectedDateColumn = new ColumnConfig();
expectedDateColumn.setId("expectedDate");
- expectedDateColumn.setHeader(I18N.CONSTANTS.monitoredPointExpectedDate());
+ expectedDateColumn.setHeaderText(I18N.CONSTANTS.monitoredPointExpectedDate());
expectedDateColumn.setWidth(60);
expectedDateColumn.setDateTimeFormat(format);
expectedDateColumn.setRenderer(new GridCellRenderer<MonitoredPointDTO>() {
@@ -1102,7 +1102,7 @@
// Completion date.
final ColumnConfig completionDateColumn = new ColumnConfig();
completionDateColumn.setId("completionDate");
- completionDateColumn.setHeader(I18N.CONSTANTS.monitoredPointCompletionDate());
+ completionDateColumn.setHeaderText(I18N.CONSTANTS.monitoredPointCompletionDate());
completionDateColumn.setWidth(60);
completionDateColumn.setDateTimeFormat(format);
@@ -1122,7 +1122,7 @@
// Completed ?
final CheckColumnConfig completedColumn = new CheckColumnConfig();
completedColumn.setId("completed");
- completedColumn.setHeader(I18N.CONSTANTS.monitoredPointClose() + "?");
+ completedColumn.setHeaderText(I18N.CONSTANTS.monitoredPointClose() + "?");
completedColumn.setWidth(20);
completedColumn.setSortable(false);
final CellEditor checkBoxEditor = new CellEditor(new CheckBox());
@@ -1131,7 +1131,7 @@
// Icon
final ColumnConfig iconColumn = new ColumnConfig();
iconColumn.setId("icon");
- iconColumn.setHeader("");
+ iconColumn.setHeaderText("");
iconColumn.setWidth(16);
iconColumn.setRenderer(new GridCellRenderer<ReminderDTO>() {
@@ -1152,7 +1152,7 @@
// Label.
final ColumnConfig labelColumn = new ColumnConfig();
labelColumn.setId("label");
- labelColumn.setHeader(I18N.CONSTANTS.monitoredPointLabel());
+ labelColumn.setHeaderText(I18N.CONSTANTS.monitoredPointLabel());
labelColumn.setWidth(60);
if (ProfileUtils.isGranted(authentication, GlobalPermissionEnum.EDIT_PROJECT)) {
labelColumn.setRenderer(new ReminderLableCellRenderer(this, this.dispatcher));
@@ -1161,7 +1161,7 @@
// Expected date.
final ColumnConfig expectedDateColumn = new ColumnConfig();
expectedDateColumn.setId("expectedDate");
- expectedDateColumn.setHeader(I18N.CONSTANTS.monitoredPointExpectedDate());
+ expectedDateColumn.setHeaderText(I18N.CONSTANTS.monitoredPointExpectedDate());
expectedDateColumn.setWidth(60);
expectedDateColumn.setDateTimeFormat(format);
expectedDateColumn.setRenderer(new GridCellRenderer<ReminderDTO>() {
@@ -1181,7 +1181,7 @@
// Completion date.
final ColumnConfig completionDateColumn = new ColumnConfig();
completionDateColumn.setId("completionDate");
- completionDateColumn.setHeader(I18N.CONSTANTS.monitoredPointCompletionDate());
+ completionDateColumn.setHeaderText(I18N.CONSTANTS.monitoredPointCompletionDate());
completionDateColumn.setWidth(60);
completionDateColumn.setDateTimeFormat(format);
Index: src/main/java/org/sigmah/client/page/project/dashboard/ReminderLableCellRenderer.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/dashboard/ReminderLableCellRenderer.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/dashboard/ReminderLableCellRenderer.java (working copy)
@@ -164,7 +164,7 @@
Button btn = be.getButtonClicked();
//If user clicks the Yes button,begin to delete
- if(btn.getText().equals(I18N.CONSTANTS.yes()))
+ if(btn.getHtml().equals(I18N.CONSTANTS.yes()))
{
HashMap<String, Object> properties = new HashMap <String,Object>();
properties.put("expectedDate",model.getExpectedDate().getTime());
Index: src/main/java/org/sigmah/client/page/project/details/ProjectDetailsView.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/details/ProjectDetailsView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/details/ProjectDetailsView.java (working copy)
@@ -39,7 +39,7 @@
setLayout(layout);
setHeaderVisible(true);
setBorders(true);
- setHeading(I18N.CONSTANTS.projectDetails());
+ setHeadingText(I18N.CONSTANTS.projectDetails());
// Toolbar.
final ToolBar toolBar = buildToolbar();
Index: src/main/java/org/sigmah/client/page/project/logframe/ConfirmPasteDialog.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/logframe/ConfirmPasteDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/logframe/ConfirmPasteDialog.java (working copy)
@@ -16,7 +16,7 @@
public ConfirmPasteDialog() {
- setHeading(I18N.CONSTANTS.paste());
+ setHeadingText(I18N.CONSTANTS.paste());
setWidth(350);
setHeight(200);
Index: src/main/java/org/sigmah/client/page/project/logframe/FormWindow.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/logframe/FormWindow.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/logframe/FormWindow.java (working copy)
@@ -251,10 +251,10 @@
init();
}
- titleLabel.setText(header);
+ titleLabel.setHtml(header);
// Open the window.
- window.setHeading(title);
+ window.setHeadingText(title);
window.setHeight(100 + (FIELD_HEIGHT * (fields.size())));
window.show();
}
Index: src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFrameGrid.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFrameGrid.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFrameGrid.java (working copy)
@@ -2427,7 +2427,7 @@
updateWindow.setPlain(true);
updateWindow.setModal(true);
updateWindow.setBlinkModal(true);
- updateWindow.setHeading(I18N.CONSTANTS.logFrameModifyA());
+ updateWindow.setHeadingText(I18N.CONSTANTS.logFrameModifyA());
updateWindow.setLayout(new FitLayout());
updateWindow.setWidth(380);
updateWindow.setAutoHeight(true);
Index: src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFramePresenter.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFramePresenter.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFramePresenter.java (working copy)
@@ -169,7 +169,7 @@
public void viewDidAppear() {
// Make sure when the currentProjectDTO's title is changed, reset the log title's value
- view.getLogFrameTitleContentLabel().setText(projectPresenter.getCurrentProjectDTO().getFullName());
+ view.getLogFrameTitleContentLabel().setHtml(projectPresenter.getCurrentProjectDTO().getFullName());
}
@@ -340,7 +340,7 @@
private void fillAndInit() {
// Fill the log frame title with the project's title
- view.getLogFrameTitleContentLabel().setText(currentProjectDTO.getFullName());
+ view.getLogFrameTitleContentLabel().setHtml(currentProjectDTO.getFullName());
if (logFrame != null) {
// Fill the log frame main objective.
Index: src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFrameView.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFrameView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/logframe/ProjectLogFrameView.java (working copy)
@@ -72,7 +72,7 @@
setLayout(layout);
setHeaderVisible(true);
setBorders(true);
- setHeading(I18N.CONSTANTS.logFrame());
+ setHeadingText(I18N.CONSTANTS.logFrame());
addStyleName("logframe-grid-main-panel");
Index: src/main/java/org/sigmah/client/page/project/logframe/grid/IndicatorListWidget.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/logframe/grid/IndicatorListWidget.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/logframe/grid/IndicatorListWidget.java (working copy)
@@ -194,7 +194,7 @@
form.setGroupVisible(false);
dialog = new FormDialogImpl<IndicatorForm>(form);
- dialog.setHeading(indicator.getName() == null ? I18N.CONSTANTS
+ dialog.setHeadingText(indicator.getName() == null ? I18N.CONSTANTS
.newIndicator() : indicator.getName());
dialog.setWidth(form.getPreferredDialogWidth());
dialog.setHeight(form.getPreferredDialogHeight());
Index: src/main/java/org/sigmah/client/page/project/pivot/ProjectPivotContainer.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/pivot/ProjectPivotContainer.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/pivot/ProjectPivotContainer.java (working copy)
@@ -108,7 +108,7 @@
setHeaderVisible(false);
setLayout(new FitLayout());
- gridPanel.setHeading(I18N.CONSTANTS.indicators());
+ gridPanel.setHeadingText(I18N.CONSTANTS.indicators());
gridPanel.addListener(Events.HeaderClick, new Listener<PivotGridHeaderEvent>() {
@Override
@@ -317,7 +317,7 @@
siteFilter.clear();
dateFilter.clear();
- gridPanel.setHeading(I18N.MESSAGES.projectPivotByIndicator(layout.getIndicator().getName()));
+ gridPanel.setHeadingText(I18N.MESSAGES.projectPivotByIndicator(layout.getIndicator().getName()));
gridPanel.setShowSwapIcon(false);
PivotTableElement pivot = composer.fixIndicator(layout.getIndicator().getId());
@@ -331,7 +331,7 @@
dateFilter.clear();
PivotTableElement pivot = composer.fixSite(layout.getSite().getId());
- gridPanel.setHeading(I18N.MESSAGES.projectPivotBySite(layout.getSite().getLocationName()));
+ gridPanel.setHeadingText(I18N.MESSAGES.projectPivotBySite(layout.getSite().getLocationName()));
gridPanel.setShowSwapIcon(false);
loadPivot(pivot);
@@ -342,7 +342,7 @@
private void pivotTo(DateLayout layout) {
indicatorFilter.clear();
siteFilter.clear();
- gridPanel.setHeading(I18N.MESSAGES.projectPivotByMonth(layout.getModel().getLabel()));
+ gridPanel.setHeadingText(I18N.MESSAGES.projectPivotByMonth(layout.getModel().getLabel()));
gridPanel.setShowSwapIcon(true);
PivotTableElement pivot = composer.fixDateRange(layout.getDateRange(), layout.getAxesSwapped());
Index: src/main/java/org/sigmah/client/page/project/reports/AttachFileHandler.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/reports/AttachFileHandler.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/reports/AttachFileHandler.java (working copy)
@@ -76,8 +76,8 @@
}
uploadFormPanel.reset();
- phaseField.setText(phaseName);
- elementField.setText(flexibleElement.getLabel());
+ phaseField.setValue(phaseName);
+ elementField.setValue(flexibleElement.getLabel());
// Upload the selected file immediately after it's selected.
uploadField.removeAllListeners();
@@ -100,8 +100,8 @@
currentCreatedDocument.setLastEditDate(new Date());
currentCreatedDocument.setEditorName(authentication.getUserShortName());
currentCreatedDocument.setDocument(true);
- currentCreatedDocument.setFlexibleElementLabel(elementField.getText());
- currentCreatedDocument.setPhaseName(phaseField.getText());
+ currentCreatedDocument.setFlexibleElementLabel(elementField.getValue().toString());
+ currentCreatedDocument.setPhaseName(phaseField.getValue().toString());
// Debug form hidden values.
if (Log.isDebugEnabled()) {
@@ -275,7 +275,7 @@
// Dialog box.
final Dialog dialogBox = new Dialog();
dialogBox.setButtons(Dialog.CLOSE);
- dialogBox.setHeading(I18N.CONSTANTS.flexibleElementFilesListAddDocumentDetails());
+ dialogBox.setHeadingText(I18N.CONSTANTS.flexibleElementFilesListAddDocumentDetails());
dialogBox.setModal(true);
dialogBox.setResizable(false);
Index: src/main/java/org/sigmah/client/page/project/reports/AttachReportHandler.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/reports/AttachReportHandler.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/reports/AttachReportHandler.java (working copy)
@@ -59,7 +59,7 @@
private Dialog createDialog() {
final Dialog dialogBox = new Dialog();
dialogBox.setButtons(Dialog.OKCANCEL);
- dialogBox.setHeading(I18N.CONSTANTS.reportCreateReport());
+ dialogBox.setHeadingText(I18N.CONSTANTS.reportCreateReport());
dialogBox.setModal(true);
dialogBox.setResizable(false);
Index: src/main/java/org/sigmah/client/page/project/reports/EditReportDialog.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/reports/EditReportDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/reports/EditReportDialog.java (working copy)
@@ -43,7 +43,7 @@
if (editReportDialog == null) {
final Dialog dialog = new Dialog();
dialog.setButtons(Dialog.OKCANCEL);
- dialog.setHeading(I18N.CONSTANTS.reportCreateReport());
+ dialog.setHeadingText(I18N.CONSTANTS.reportCreateReport());
dialog.setModal(true);
dialog.setResizable(false);
Index: src/main/java/org/sigmah/client/page/project/reports/KeyQuestionDialog.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/reports/KeyQuestionDialog.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/reports/KeyQuestionDialog.java (working copy)
@@ -70,11 +70,11 @@
final FoldPanel panel, final int toolButtonIndex, final KeyQuestionState keyQuestionState,
boolean enabled) {
final Dialog dialog = getDialog();
- dialog.setHeading(I18N.MESSAGES.reportKeyQuestionDialogTitle(Integer.toString(keyQuestion.getNumber())));
+ dialog.setHeadingText(I18N.MESSAGES.reportKeyQuestionDialogTitle(Integer.toString(keyQuestion.getNumber())));
// Question label
final Label question = (Label) dialog.getWidget(0);
- question.setText(keyQuestion.getLabel());
+ question.setHtml(keyQuestion.getLabel());
// Rich text editor
final RichTextArea dialogTextArea = (RichTextArea) dialog.getWidget(1);
Index: src/main/java/org/sigmah/client/page/project/reports/KeyQuestionState.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/reports/KeyQuestionState.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/reports/KeyQuestionState.java (working copy)
@@ -54,6 +54,6 @@
}
private void updateLabel() {
- label.setText(I18N.MESSAGES.reportKeyQuestions(Integer.toString(valids), Integer.toString(count)));
+ label.setHtml(I18N.MESSAGES.reportKeyQuestions(Integer.toString(valids), Integer.toString(count)));
}
}
Index: src/main/java/org/sigmah/client/page/project/reports/ProjectReportsView.java
===================================================================
--- src/main/java/org/sigmah/client/page/project/reports/ProjectReportsView.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/project/reports/ProjectReportsView.java (working copy)
@@ -178,7 +178,7 @@
*/
private ContentPanel createDocumentList(final ListStore<ReportReference> store) {
final ContentPanel panel = new ContentPanel(new FitLayout());
- panel.setHeading(I18N.CONSTANTS.projectTabReports());
+ panel.setHeadingText(I18N.CONSTANTS.projectTabReports());
// Toolbar
final ToolBar toolBar = new ToolBar();
@@ -455,7 +455,7 @@
// Title bar
final ContentPanel reportPanel = new ContentPanel(new FitLayout());
reportPanel.setScrollMode(Scroll.AUTOY);
- reportPanel.setHeading(report.getName());
+ reportPanel.setHeadingText(report.getName());
final ToolButton closeButton = new ToolButton("x-tool-close");
closeButton.addListener(Events.Select, new Listener<BaseEvent>() {
@@ -620,9 +620,9 @@
final Date now = new Date();
header.clear();
- draftLastChangedTime.setText(I18N.MESSAGES.reportDraftLastChanged(dateFormat.format(now),
+ draftLastChangedTime.setHtml(I18N.MESSAGES.reportDraftLastChanged(dateFormat.format(now),
timeFormat.format(now)));
- personalDraft.setText(I18N.MESSAGES.personalDraft());
+ personalDraft.setHtml(I18N.MESSAGES.personalDraft());
header.add(personalDraft);
header.add(draftLastChangedTime);
header.add(buttons);
@@ -952,7 +952,7 @@
imageAddDialog = new Dialog();
imageAddDialog.setButtons(Dialog.OKCANCEL);
- imageAddDialog.setHeading(I18N.CONSTANTS.reportAddImageDialogTitle());
+ imageAddDialog.setHeadingText(I18N.CONSTANTS.reportAddImageDialogTitle());
imageAddDialog.setModal(true);
imageAddDialog.setResizable(false);
Index: src/main/java/org/sigmah/client/page/report/ReportPreview.java
===================================================================
--- src/main/java/org/sigmah/client/page/report/ReportPreview.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/report/ReportPreview.java (working copy)
@@ -77,7 +77,7 @@
this.presenter = presenter;
toolBar.setListener(this.presenter);
- setHeading(template.getTitle());
+ setHeadingText(template.getTitle());
if (template.getFrequency() == ReportFrequency.Monthly) {
addMonthlyFields();
Index: src/main/java/org/sigmah/client/page/table/PivotPage.java
===================================================================
--- src/main/java/org/sigmah/client/page/table/PivotPage.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/table/PivotPage.java (working copy)
@@ -155,7 +155,7 @@
layout.setVBoxLayoutAlign(VBoxLayout.VBoxLayoutAlign.STRETCH);
ContentPanel pane = new ContentPanel();
- pane.setHeading(I18N.CONSTANTS.dimensions());
+ pane.setHeadingText(I18N.CONSTANTS.dimensions());
pane.setScrollMode(Style.Scroll.NONE);
pane.setIcon(null);
pane.setLayout(layout);
@@ -306,7 +306,7 @@
private void createFilterPane() {
filterPane = new ContentPanel();
- filterPane.setHeading(I18N.CONSTANTS.filter());
+ filterPane.setHeadingText(I18N.CONSTANTS.filter());
filterPane.setIcon(IconImageBundle.ICONS.filter());
filterPane.setLayout(new AccordionLayout());
@@ -322,14 +322,14 @@
private void createIndicatorPanel() {
indicatorPanel = new IndicatorTreePanel(service, true, getMonitor());
indicatorPanel.setHeaderVisible(true);
- indicatorPanel.setHeading(I18N.CONSTANTS.indicators());
+ indicatorPanel.setHeadingText(I18N.CONSTANTS.indicators());
indicatorPanel.setIcon(IconImageBundle.ICONS.indicator());
filterPane.add(indicatorPanel);
}
private void createAdminFilter() {
adminPanel = new AdminFilterPanel(service);
- adminPanel.setHeading(I18N.CONSTANTS.filterByGeography());
+ adminPanel.setHeadingText(I18N.CONSTANTS.filterByGeography());
adminPanel.setIcon(IconImageBundle.ICONS.filter());
filterPane.add(adminPanel);
}
@@ -357,7 +357,7 @@
gridContainer = new PivotGridPanel(eventBus, service);
gridContainer.setHeaderVisible(true);
- gridContainer.setHeading(I18N.CONSTANTS.preview());
+ gridContainer.setHeadingText(I18N.CONSTANTS.preview());
gridToolBar = new ToolBar();
gridContainer.setTopComponent(gridToolBar);
Index: src/main/java/org/sigmah/client/page/table/drilldown/DrillDownEditor.java
===================================================================
--- src/main/java/org/sigmah/client/page/table/drilldown/DrillDownEditor.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/table/drilldown/DrillDownEditor.java (working copy)
@@ -35,7 +35,7 @@
super(eventBus, service, stateMgr);
this.dateUtil = dateUtil;
- setHeading(I18N.CONSTANTS.drilldown());
+ setHeadingText(I18N.CONSTANTS.drilldown());
eventListener = new Listener<PivotCellEvent>() {
Index: src/main/java/org/sigmah/client/page/table/filter/PartnerFieldSet.java
===================================================================
--- src/main/java/org/sigmah/client/page/table/filter/PartnerFieldSet.java (revision 1297)
+++ src/main/java/org/sigmah/client/page/table/filter/PartnerFieldSet.java (working copy)
@@ -25,7 +25,7 @@
public PartnerFieldSet(SchemaDTO schema) {
- setHeading(I18N.CONSTANTS.filterByPartner());
+ setHeadingHtml(I18N.CONSTANTS.filterByPartner());
setLayout(new FieldSetFitLayout());
Index: src/main/java/org/sigmah/client/ui/CreditFrame.java
===================================================================
--- src/main/java/org/sigmah/client/ui/CreditFrame.java (revision 1297)
+++ src/main/java/org/sigmah/client/ui/CreditFrame.java (working copy)
@@ -73,7 +73,7 @@
window = new Window();
window.setWidth(735);
window.setHeight(570);
- window.setHeading(I18N.CONSTANTS.credits());
+ window.setHeadingText(I18N.CONSTANTS.credits());
window.setPlain(true);
window.setModal(true);
window.setBlinkModal(true);
Index: src/main/java/org/sigmah/client/ui/GlobalExportForm.java
===================================================================
--- src/main/java/org/sigmah/client/ui/GlobalExportForm.java (revision 1297)
+++ src/main/java/org/sigmah/client/ui/GlobalExportForm.java (working copy)
@@ -85,7 +85,7 @@
w.setBlinkModal(true);
w.setLayout(new FitLayout());
w.setSize(420,150);
- w.setHeading(I18N.CONSTANTS.globalExport());
+ w.setHeadingText(I18N.CONSTANTS.globalExport());
final FormPanel panel=new FormPanel();
panel.setHeaderVisible(false);
Index: src/main/java/org/sigmah/client/ui/GlobalExportSettingsForm.java
===================================================================
--- src/main/java/org/sigmah/client/ui/GlobalExportSettingsForm.java (revision 1297)
+++ src/main/java/org/sigmah/client/ui/GlobalExportSettingsForm.java (working copy)
@@ -134,7 +134,7 @@
w.setBlinkModal(true);
w.setLayout(new FitLayout());
w.setSize(600,400);
- w.setHeading(I18N.CONSTANTS.globalExportConfiguration());
+ w.setHeadingText(I18N.CONSTANTS.globalExportConfiguration());
final FormPanel panel=new FormPanel();
panel.setHeaderVisible(false);
Index: src/main/java/org/sigmah/client/ui/HistoryWindow.java
===================================================================
--- src/main/java/org/sigmah/client/ui/HistoryWindow.java (revision 1297)
+++ src/main/java/org/sigmah/client/ui/HistoryWindow.java (working copy)
@@ -131,14 +131,14 @@
// Date.
final ColumnConfig dateColumn = new ColumnConfig();
dateColumn.setId("date");
- dateColumn.setHeader(I18N.CONSTANTS.historyDate());
+ dateColumn.setHeaderText(I18N.CONSTANTS.historyDate());
dateColumn.setWidth(125);
dateColumn.setDateTimeFormat(format);
// User.
final ColumnConfig userColumn = new ColumnConfig();
userColumn.setId("user");
- userColumn.setHeader(I18N.CONSTANTS.historyUser());
+ userColumn.setHeaderText(I18N.CONSTANTS.historyUser());
userColumn.setWidth(135);
userColumn.setRenderer(new GridCellRenderer<HistoryTokenListDTO>() {
@@ -152,7 +152,7 @@
// Value.
final ColumnConfig valueColumn = new ColumnConfig();
valueColumn.setId("tokens");
- valueColumn.setHeader(I18N.CONSTANTS.historyValue());
+ valueColumn.setHeaderText(I18N.CONSTANTS.historyValue());
valueColumn.setSortable(false);
valueColumn.setWidth(490);
valueColumn.setRenderer(new GridCellRenderer<HistoryTokenListDTO>() {
@@ -208,7 +208,7 @@
window.layout();
// Shows window.
- window.setHeading(I18N.CONSTANTS.history() + ": " + manager.getElementLabel());
+ window.setHeadingText(I18N.CONSTANTS.history() + ": " + manager.getElementLabel());
window.show();
}
}
Index: src/main/java/org/sigmah/client/util/Notification.java
===================================================================
--- src/main/java/org/sigmah/client/util/Notification.java (revision 1297)
+++ src/main/java/org/sigmah/client/util/Notification.java (working copy)
@@ -31,8 +31,8 @@
* The content message.
*/
public static void show(String title, String message) {
- info.title = title;
- info.text = message;
+ info.titleHtml = title;
+ info.html = message;
info.display = 4000;
info.width = 350;
new Info().show(info);
Index: src/main/java/org/sigmah/shared/dto/element/DefaultFlexibleElementDTO.java
===================================================================
--- src/main/java/org/sigmah/shared/dto/element/DefaultFlexibleElementDTO.java (revision 1297)
+++ src/main/java/org/sigmah/shared/dto/element/DefaultFlexibleElementDTO.java (working copy)
@@ -320,7 +320,7 @@
ValueResultUtils.mergeElements(plannedBudgetRawValue, spendBudgetRawValue,
receivedBudgetRawValue);
- ratioLabel.setText(I18N.CONSTANTS.flexibleElementBudgetDistributionRatio()
+ ratioLabel.setHtml(I18N.CONSTANTS.flexibleElementBudgetDistributionRatio()
+ ": "
+ NumberUtils.ratioAsString(spendBudgetAsDouble, plannedBudgetAsDouble));
@@ -356,7 +356,7 @@
plannedBudgetField = plannedBudgetLabelField;
}
- ratioLabel.setText(I18N.CONSTANTS.flexibleElementBudgetDistributionRatio()
+ ratioLabel.setHtml(I18N.CONSTANTS.flexibleElementBudgetDistributionRatio()
+ ": "
+ NumberUtils.ratioAsString(sb, pb));
@@ -372,7 +372,7 @@
// Sets the field label.
setLabel(I18N.CONSTANTS.projectBudget());
- fieldset.setHeading(getLabel());
+ fieldset.setHeadingHtml(getLabel());
component = fieldset;
}
@@ -1366,7 +1366,7 @@
ValueResultUtils.mergeElements(plannedBudgetRawValue, spendBudgetRawValue,
receivedBudgetRawValue);
- ratioLabel.setText(I18N.CONSTANTS.flexibleElementBudgetDistributionRatio()
+ ratioLabel.setHtml(I18N.CONSTANTS.flexibleElementBudgetDistributionRatio()
+ ": "
+ NumberUtils.ratioAsString(spendBudgetAsDouble, plannedBudgetAsDouble));
@@ -1408,7 +1408,7 @@
receivedBudgetField = receivedBudgetLabelField;
}
- ratioLabel.setText(I18N.CONSTANTS.flexibleElementBudgetDistributionRatio()
+ ratioLabel.setHtml(I18N.CONSTANTS.flexibleElementBudgetDistributionRatio()
+ ": "
+ NumberUtils.ratioAsString(sb, pb));
@@ -1424,7 +1424,7 @@
// Sets the field label.
setLabel(I18N.CONSTANTS.projectBudget());
- fieldset.setHeading(getLabel());
+ fieldset.setHeadingHtml(getLabel());
component = fieldset;
}
Index: src/main/java/org/sigmah/shared/dto/element/FilesListElementDTO.java
===================================================================
--- src/main/java/org/sigmah/shared/dto/element/FilesListElementDTO.java (revision 1297)
+++ src/main/java/org/sigmah/shared/dto/element/FilesListElementDTO.java (working copy)
@@ -401,10 +401,10 @@
int max = getAdjustedLimit();
if (max != -1) {
- mainPanel.setHeading(getLabel() + " ("
+ mainPanel.setHeadingText(getLabel() + " ("
+ I18N.MESSAGES.flexibleElementFilesListLimitReached(String.valueOf(getAdjustedLimit())) + ")");
} else {
- mainPanel.setHeading(getLabel());
+ mainPanel.setHeadingText(getLabel());
}
mainPanel.setTopComponent(actionsToolBar);
@@ -517,7 +517,7 @@
// File's add date.
final ColumnConfig dateColumn = new ColumnConfig();
dateColumn.setId("date");
- dateColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListDate());
+ dateColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListDate());
dateColumn.setWidth(60);
dateColumn.setRenderer(new GridCellRenderer<FileDTO>() {
@@ -534,7 +534,7 @@
// File's name.
final ColumnConfig nameColumn = new ColumnConfig();
nameColumn.setId("name");
- nameColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListName());
+ nameColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListName());
nameColumn.setWidth(100);
nameColumn.setRenderer(new GridCellRenderer<FileDTO>() {
@@ -548,7 +548,7 @@
// File's author.
final ColumnConfig authorColumn = new ColumnConfig();
authorColumn.setId("author");
- authorColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListAuthor());
+ authorColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListAuthor());
authorColumn.setWidth(100);
authorColumn.setRenderer(new GridCellRenderer<FileDTO>() {
@Override
@@ -563,7 +563,7 @@
// File's last version number.
final ColumnConfig versionColumn = new ColumnConfig();
versionColumn.setId("version");
- versionColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListVersion());
+ versionColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListVersion());
versionColumn.setWidth(20);
versionColumn.setRenderer(new GridCellRenderer<FileDTO>() {
@Override
@@ -577,7 +577,7 @@
// Upload new version.
final ColumnConfig addVersionColumn = new ColumnConfig();
addVersionColumn.setId("addVersion");
- addVersionColumn.setHeader(null);
+ addVersionColumn.setHeaderText(null);
addVersionColumn.setWidth(60);
addVersionColumn.setSortable(false);
addVersionColumn.setRenderer(new GridCellRenderer<FileDTO>() {
@@ -678,7 +678,7 @@
// Versions list.
final ColumnConfig historyColumn = new ColumnConfig();
historyColumn.setId("history");
- historyColumn.setHeader(null);
+ historyColumn.setHeaderText(null);
historyColumn.setWidth(20);
historyColumn.setSortable(false);
historyColumn.setRenderer(new GridCellRenderer<FileDTO>() {
@@ -712,7 +712,7 @@
// Delete.
final ColumnConfig deleteColumn = new ColumnConfig();
deleteColumn.setId("delete");
- deleteColumn.setHeader(null);
+ deleteColumn.setHeaderText(null);
deleteColumn.setWidth(10);
deleteColumn.setSortable(false);
deleteColumn.setRenderer(new GridCellRenderer<FileDTO>() {
@@ -918,20 +918,20 @@
// Version's number.
final ColumnConfig versionColumn = new ColumnConfig();
versionColumn.setId("versionNumber");
- versionColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListVersionNumber());
+ versionColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListVersionNumber());
versionColumn.setWidth(55);
// Version's add date.
final ColumnConfig dateColumn = new ColumnConfig();
dateColumn.setId("addedDate");
- dateColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListDate());
+ dateColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListDate());
dateColumn.setWidth(110);
dateColumn.setDateTimeFormat(DateUtils.DATE_TIME_SHORT);
// Version's author.
final ColumnConfig authorColumn = new ColumnConfig();
authorColumn.setId("author");
- authorColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListAuthor());
+ authorColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListAuthor());
authorColumn.setWidth(100);
authorColumn.setRenderer(new GridCellRenderer<FileVersionDTO>() {
@Override
@@ -945,7 +945,7 @@
// Version's name.
final ColumnConfig nameColumn = new ColumnConfig();
nameColumn.setId("name");
- nameColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListName());
+ nameColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListName());
nameColumn.setWidth(100);
nameColumn.setRenderer(new GridCellRenderer<FileVersionDTO>() {
@Override
@@ -958,7 +958,7 @@
// Version's size.
final ColumnConfig sizeColumn = new ColumnConfig();
sizeColumn.setId("size");
- sizeColumn.setHeader(I18N.CONSTANTS.flexibleElementFilesListSize());
+ sizeColumn.setHeaderText(I18N.CONSTANTS.flexibleElementFilesListSize());
sizeColumn.setWidth(60);
sizeColumn.setRenderer(new GridCellRenderer<FileVersionDTO>() {
@Override
@@ -972,7 +972,7 @@
// Delete.
final ColumnConfig deleteColumn = new ColumnConfig();
deleteColumn.setId("delete");
- deleteColumn.setHeader(null);
+ deleteColumn.setHeaderText(null);
deleteColumn.setWidth(25);
deleteColumn.setSortable(false);
deleteColumn.setRenderer(new GridCellRenderer<FileVersionDTO>() {
@@ -1069,7 +1069,7 @@
// Configures the window parameters to be consistent with the new
// displayed file.
- window.setHeading(I18N.CONSTANTS.flexibleElementFilesListHistory() + " - " + lastVersion.getName() + '.'
+ window.setHeadingText(I18N.CONSTANTS.flexibleElementFilesListHistory() + " - " + lastVersion.getName() + '.'
+ lastVersion.getExtension());
window.show();
}
Index: src/main/java/org/sigmah/shared/dto/element/IndicatorsListElementDTO.java
===================================================================
--- src/main/java/org/sigmah/shared/dto/element/IndicatorsListElementDTO.java (revision 1297)
+++ src/main/java/org/sigmah/shared/dto/element/IndicatorsListElementDTO.java (working copy)
@@ -101,7 +101,7 @@
// Creates the main panel.
final ContentPanel panel = new ContentPanel();
- panel.setHeading(getLabel());
+ panel.setHeadingText(getLabel());
panel.setLayout(new FitLayout());
panel.setTopComponent(actionsToolBar);
@@ -189,7 +189,7 @@
// Incator's code.
ColumnConfig column = new ColumnConfig();
column.setId("code");
- column.setHeader(I18N.CONSTANTS.flexibleElementIndicatorsListCode());
+ column.setHeaderText(I18N.CONSTANTS.flexibleElementIndicatorsListCode());
column.setEditor(null);
column.setWidth(30);
columnConfigs.add(column);
@@ -197,7 +197,7 @@
// Indicator's name.
column = new ColumnConfig();
column.setId("name");
- column.setHeader(I18N.CONSTANTS.flexibleElementIndicatorsListName());
+ column.setHeaderText(I18N.CONSTANTS.flexibleElementIndicatorsListName());
column.setEditor(null);
column.setWidth(100);
columnConfigs.add(column);
@@ -205,7 +205,7 @@
// Indicator's unit.
column = new ColumnConfig();
column.setId("units");
- column.setHeader(I18N.CONSTANTS.flexibleElementIndicatorsListUnits());
+ column.setHeaderText(I18N.CONSTANTS.flexibleElementIndicatorsListUnits());
column.setEditor(null);
column.setWidth(80);
columnConfigs.add(column);
Index: src/main/java/org/sigmah/shared/dto/element/QuestionElementDTO.java
===================================================================
--- src/main/java/org/sigmah/shared/dto/element/QuestionElementDTO.java (revision 1297)
+++ src/main/java/org/sigmah/shared/dto/element/QuestionElementDTO.java (working copy)
@@ -158,7 +158,7 @@
// Defines grid column model.
final ColumnConfig labelColumn = new ColumnConfig();
labelColumn.setId("label");
- labelColumn.setHeader(I18N.CONSTANTS.flexibleElementQuestionMutiple());
+ labelColumn.setHeaderText(I18N.CONSTANTS.flexibleElementQuestionMutiple());
labelColumn.setWidth(500);
if (getCategoryTypeDTO() != null) {
labelColumn.setRenderer(new GridCellRenderer<QuestionChoiceElementDTO>() {
@@ -192,7 +192,7 @@
final ContentPanel cp = new ContentPanel();
cp.setHeaderVisible(true);
cp.setBorders(true);
- cp.setHeading(getLabel());
+ cp.setHeadingText(getLabel());
cp.setTopComponent(null);
cp.add(multipleQuestion);
Index: src/main/java/org/sigmah/shared/dto/element/ReportListElementDTO.java
===================================================================
--- src/main/java/org/sigmah/shared/dto/element/ReportListElementDTO.java (revision 1297)
+++ src/main/java/org/sigmah/shared/dto/element/ReportListElementDTO.java (working copy)
@@ -75,7 +75,7 @@
@Override
protected Component getComponent(ValueResult valueResult, boolean enabled) {
final ContentPanel component = new ContentPanel();
- component.setHeading(getLabel());
+ component.setHeadingText(getLabel());
// Setting up the report store
final List<?> reports = valueResult.getValuesObject();
Index: src/main/java/org/sigmah/shared/dto/element/TripletsListElementDTO.java
===================================================================
--- src/main/java/org/sigmah/shared/dto/element/TripletsListElementDTO.java (revision 1297)
+++ src/main/java/org/sigmah/shared/dto/element/TripletsListElementDTO.java (working copy)
@@ -113,7 +113,7 @@
// Creates the main panel.
final ContentPanel panel = new ContentPanel();
- panel.setHeading(getLabel());
+ panel.setHeadingText(getLabel());
panel.setBorders(true);
panel.setLayout(new FitLayout());
@@ -165,7 +165,7 @@
final ColumnConfig codeColumn = new ColumnConfig();
codeColumn.setId("code");
- codeColumn.setHeader(I18N.CONSTANTS.flexibleElementTripletsListCode());
+ codeColumn.setHeaderText(I18N.CONSTANTS.flexibleElementTripletsListCode());
TextField<String> text = new TextField<String>();
text.setAllowBlank(false);
codeColumn.setEditor(new CellEditor(text));
@@ -173,7 +173,7 @@
final ColumnConfig nameColumn = new ColumnConfig();
nameColumn.setId("name");
- nameColumn.setHeader(I18N.CONSTANTS.flexibleElementTripletsListName());
+ nameColumn.setHeaderText(I18N.CONSTANTS.flexibleElementTripletsListName());
text = new TextField<String>();
text.setAllowBlank(false);
nameColumn.setEditor(new CellEditor(text));
@@ -181,7 +181,7 @@
final ColumnConfig periodColumn = new ColumnConfig();
periodColumn.setId("period");
- periodColumn.setHeader(I18N.CONSTANTS.flexibleElementTripletsListPeriod());
+ periodColumn.setHeaderText(I18N.CONSTANTS.flexibleElementTripletsListPeriod());
text = new TextField<String>();
text.setAllowBlank(false);
periodColumn.setEditor(new CellEditor(text));
@@ -313,7 +313,7 @@
// Change type.
final ColumnConfig typeColumn = new ColumnConfig();
typeColumn.setId("type");
- typeColumn.setHeader(I18N.CONSTANTS.historyModificationType());
+ typeColumn.setHeaderText(I18N.CONSTANTS.historyModificationType());
typeColumn.setWidth(150);
typeColumn.setSortable(false);
typeColumn.setRenderer(new GridCellRenderer<TripletValueDTO>() {
@@ -342,19 +342,19 @@
// Code.
final ColumnConfig codeColumn = new ColumnConfig();
codeColumn.setId("code");
- codeColumn.setHeader(I18N.CONSTANTS.flexibleElementTripletsListCode());
+ codeColumn.setHeaderText(I18N.CONSTANTS.flexibleElementTripletsListCode());
codeColumn.setWidth(200);
// Name.
final ColumnConfig nameColumn = new ColumnConfig();
nameColumn.setId("name");
- nameColumn.setHeader(I18N.CONSTANTS.flexibleElementTripletsListName());
+ nameColumn.setHeaderText(I18N.CONSTANTS.flexibleElementTripletsListName());
nameColumn.setWidth(200);
// Period.
final ColumnConfig periodColumn = new ColumnConfig();
periodColumn.setId("period");
- periodColumn.setHeader(I18N.CONSTANTS.flexibleElementTripletsListPeriod());
+ periodColumn.setHeaderText(I18N.CONSTANTS.flexibleElementTripletsListPeriod());
periodColumn.setWidth(200);
return new ColumnConfig[] { typeColumn, codeColumn, nameColumn, periodColumn };
Index: src/main/java/org/sigmah/shared/dto/layout/LayoutGroupDTO.java
===================================================================
--- src/main/java/org/sigmah/shared/dto/layout/LayoutGroupDTO.java (revision 1297)
+++ src/main/java/org/sigmah/shared/dto/layout/LayoutGroupDTO.java (working copy)
@@ -90,7 +90,7 @@
public Widget getWidget() {
final FieldSet fieldSet = new FieldSet();
- fieldSet.setHeading(getTitle());
+ fieldSet.setHeadingHtml(getTitle());
fieldSet.setCollapsible(true);
final FormLayout formLayout = new FormLayout();
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment