modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java | 17 ++--- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 4 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java | 10 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java | 34 ++++------ 4 files changed, 30 insertions(+), 35 deletions(-)
New commits: commit 4274a46c50244c0b29ed0d82cfd74272d223f164 Author: Joseph Marques joseph@redhat.com Date: Sun Dec 12 22:52:30 2010 -0500
cosmetic - relayout according to formatting conventions
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java index beebe28..19994ec 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java @@ -42,8 +42,8 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName; * @author Greg Hinkle */ public class ConfigurationHistoryView extends TableSection { - public static final ViewName VIEW_ID = new ViewName("RecentConfigurationChanges", MSG - .view_configurationHistoryList_title()); + public static final ViewName VIEW_ID = new ViewName("RecentConfigurationChanges", + MSG.view_configurationHistoryList_title());
private Integer resourceId;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java index e232b0d..fb649cc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java @@ -76,8 +76,8 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc }
public OperationHistoryView(String locatorId, ResourceComposite resourceComposite) { - super(locatorId, VIEW_ID.getTitle(), new Criteria(OperationHistoryDataSource.CriteriaField.RESOURCE_ID, String - .valueOf(resourceComposite.getResource().getId()))); + super(locatorId, VIEW_ID.getTitle(), new Criteria(OperationHistoryDataSource.CriteriaField.RESOURCE_ID, + String.valueOf(resourceComposite.getResource().getId()))); this.composite = resourceComposite;
setDataSource(new OperationHistoryDataSource()); @@ -87,14 +87,14 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc protected void configureTable() { ListGridField idField = new ListGridField(OperationHistoryDataSource.Field.ID, MSG.common_title_id());
- ListGridField opNameField = new ListGridField(OperationHistoryDataSource.Field.OPERATION_NAME, MSG - .dataSource_operationHistory_operationName()); + ListGridField opNameField = new ListGridField(OperationHistoryDataSource.Field.OPERATION_NAME, + MSG.dataSource_operationHistory_operationName());
- ListGridField subjectField = new ListGridField(OperationHistoryDataSource.Field.SUBJECT, MSG - .common_title_user()); + ListGridField subjectField = new ListGridField(OperationHistoryDataSource.Field.SUBJECT, + MSG.common_title_user());
- ListGridField statusField = new ListGridField(OperationHistoryDataSource.Field.STATUS, MSG - .common_title_status()); + ListGridField statusField = new ListGridField(OperationHistoryDataSource.Field.STATUS, + MSG.common_title_status()); statusField.setAlign(Alignment.CENTER); statusField.setCellAlign(Alignment.CENTER); statusField.setShowHover(true); @@ -170,8 +170,8 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc } });
- ListGridField startedTimeField = new ListGridField(OperationHistoryDataSource.Field.STARTED_TIME, MSG - .dataSource_operationHistory_startedTime()); + ListGridField startedTimeField = new ListGridField(OperationHistoryDataSource.Field.STARTED_TIME, + MSG.dataSource_operationHistory_startedTime()); startedTimeField.setType(ListGridFieldType.DATE); startedTimeField.setDateFormatter(DateDisplayFormat.TOLOCALESTRING); startedTimeField.setAlign(Alignment.LEFT); @@ -180,8 +180,8 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc final Resource resource = this.composite.getResource();
if (resource == null) { // if null, we aren't viewing op history for a single resource - ListGridField resourceField = new ListGridField(OperationHistoryDataSource.Field.RESOURCE, MSG - .common_title_resource()); + ListGridField resourceField = new ListGridField(OperationHistoryDataSource.Field.RESOURCE, + MSG.common_title_resource()); resourceField.setAlign(Alignment.LEFT); resourceField.setCellAlign(Alignment.LEFT); resourceField.setCellFormatter(new CellFormatter() { @@ -227,8 +227,8 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc } });
- IMenuButton operationsButton = new LocatableIMenuButton(this.extendLocatorId("Run"), MSG - .view_operationHistoryList_button_runOperation(), operationMenu); + IMenuButton operationsButton = new LocatableIMenuButton(this.extendLocatorId("Run"), + MSG.view_operationHistoryList_button_runOperation(), operationMenu); operationsButton.setShowMenuBelow(false); operationsButton.setAutoFit(true); addExtraWidget(operationsButton);
commit 995e5ac70be8f2b3ca0384c04e23abc08debcad6 Author: Joseph Marques joseph@redhat.com Date: Sun Dec 12 22:51:53 2010 -0500
improve hyperlink implementation to navigation from master to details view
* instead of subclasses having to override a method that knows how to get the ListGridField for the column they wish to link to the details view, just have them return the string name of the column. this centralizes the error handling (null checks for ListGrid and ListGridField), and makes the contract easier to implement for subclasses.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java index 5ab13b6..7a4c292 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java @@ -40,7 +40,6 @@ import com.smartgwt.client.widgets.layout.VLayout; import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; import org.rhq.enterprise.gui.coregui.client.DetailsView; -import org.rhq.enterprise.gui.coregui.client.LinkManager; import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton; import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource; @@ -111,13 +110,14 @@ public abstract class TableSection<DS extends RPCDataSource> extends Table<DS> i protected void onDraw() { super.onDraw();
- // Make the value of the name field a link to the details view for the corresponding record. - ListGridField nameField = getNameField(); - if (nameField != null) { - nameField.setCellFormatter(new CellFormatter() { + // Make the value of some specific field a link to the details view for the corresponding record + ListGrid grid = getListGrid(); + ListGridField field = (grid != null) ? grid.getField(getDetailsLinkColumnName()) : null; + if (field != null) { + field.setCellFormatter(new CellFormatter() { public String format(Object value, ListGridRecord record, int i, int i1) { Integer recordId = getId(record); - String detailsUrl = "#" + TableSection.this.basePath + "/" + recordId; + String detailsUrl = "#" + getBasePath() + "/" + recordId; return SeleniumUtility.getLocatableHref(detailsUrl, value.toString(), null); } }); @@ -132,9 +132,8 @@ public abstract class TableSection<DS extends RPCDataSource> extends Table<DS> i }); }
- protected ListGridField getNameField() { - ListGrid grid = getListGrid(); - return (grid != null) ? grid.getField(FIELD_NAME) : null; + protected String getDetailsLinkColumnName() { + return FIELD_NAME; }
/** diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java index 860339b..beebe28 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java @@ -24,7 +24,6 @@ import java.util.List; import com.smartgwt.client.data.Criteria; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.grid.CellFormatter; -import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord;
@@ -143,9 +142,8 @@ public class ConfigurationHistoryView extends TableSection { }
@Override - protected ListGridField getNameField() { - ListGrid grid = getListGrid(); - return (grid != null) ? grid.getField(FIELD_ID) : null; + protected String getDetailsLinkColumnName() { + return FIELD_ID; }
@Override diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java index 9e8d660..e232b0d 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/OperationHistoryView.java @@ -32,7 +32,6 @@ import com.smartgwt.client.widgets.events.CloseClickHandler; import com.smartgwt.client.widgets.events.CloseClientEvent; import com.smartgwt.client.widgets.grid.CellFormatter; import com.smartgwt.client.widgets.grid.HoverCustomizer; -import com.smartgwt.client.widgets.grid.ListGrid; import com.smartgwt.client.widgets.grid.ListGridField; import com.smartgwt.client.widgets.grid.ListGridRecord; import com.smartgwt.client.widgets.grid.events.RecordClickEvent; @@ -238,9 +237,8 @@ public class OperationHistoryView extends TableSection<OperationHistoryDataSourc }
@Override - protected ListGridField getNameField() { - // TODO: What field if any should we return here? - return null; + protected String getDetailsLinkColumnName() { + return OperationHistoryDataSource.Field.OPERATION_NAME; }
@Override
commit afd18a628eb1a8e101a005b1be96f65f2b453763 Author: Joseph Marques joseph@redhat.com Date: Sun Dec 12 22:45:59 2010 -0500
rollback part of b20dc08 (BZ-661528) -- master/details navigation is otherwise broken
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java index 91f42a8..6040959 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java @@ -236,8 +236,8 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo this.tabSet.selectTab(tab); }
- Canvas subView = subtab.getCanvas(); - if (subView instanceof BookmarkableView && !viewPath.isEnd()) { + Canvas subView = subtab.getCanvas(); + if (subView instanceof BookmarkableView) { // Handle any remaining view items (e.g. id of a selected item in a subtab that contains a Master-Details view). ((BookmarkableView) subView).renderView(viewPath); } else if (subView instanceof RefreshableView) {
rhq-commits@lists.fedorahosted.org