Eliraz Levi has uploaded a new change for review. Change subject: webadmin: VLanPanel refactoring ......................................................................
webadmin: VLanPanel refactoring moving shared code of row creation for preventing code duplication With multiple paragraphs if necessary. Change-Id: Iefa12d6d2876cdd1c2120a3a7667c729bd3183f9 Signed-off-by: Eliraz Levi <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java 1 file changed, 32 insertions(+), 48 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/39008/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java index 97e82df..bf77d9b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/VLanPanel.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.webadmin.widget.host; +import com.google.gwt.user.client.ui.Widget; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.common.widget.TogglePanel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterfaceLineModel; @@ -62,72 +63,55 @@ } Grid createRow(final HostVLan hostVLan) { - Grid row = new Grid(1, 3); - row.getColumnFormatter().setWidth(0, VLanPanel.CHECK_BOX_COLUMN_WIDTH); - row.getColumnFormatter().setWidth(1, VLanPanel.NETWORK_NAME_COLUMN_WIDTH); - row.getColumnFormatter().setWidth(2, VLanPanel.ADDRESS_COLUMN_WIDTH); + // Check box, icon and name + HorizontalPanel checkboxPanel = new HorizontalPanel(); + checkboxPanel.setWidth("100%"); //$NON-NLS-1$ - row.setWidth("100%"); //$NON-NLS-1$ - row.setHeight("100%"); //$NON-NLS-1$ + if (isSelectionAvailable) { + checkboxPanel.add(getCheckBox()); + } + checkboxPanel.add(new Image(resources.splitRotateImage())); + checkboxPanel.add(new Label(new HostVLanNameRenderer().render(hostVLan))); + + Grid row = + createVlanRowColumn(checkboxPanel, + hostVLan.getInterface().getIsManagement(), + hostVLan.getNetworkName(), + new Label(hostVLan.getAddress())); Style gridStyle = row.getElement().getStyle(); gridStyle.setBorderColor("white"); //$NON-NLS-1$ gridStyle.setBorderWidth(1, Unit.PX); gridStyle.setBorderStyle(BorderStyle.SOLID); - // Check box, icon and name - HorizontalPanel chekboxPanel = new HorizontalPanel(); - chekboxPanel.setWidth("100%"); //$NON-NLS-1$ - - if (isSelectionAvailable) { - chekboxPanel.add(getCheckBox()); - } - chekboxPanel.add(new Image(resources.splitRotateImage())); - chekboxPanel.add(new Label(new HostVLanNameRenderer().render(hostVLan))); - - row.setWidget(0, 0, chekboxPanel); - - // Network name - Label networkName = new Label(hostVLan.getNetworkName()); - - if (hostVLan.getInterface().getIsManagement()) { - networkName.getElement().getStyle().setFontWeight(FontWeight.BOLD); - networkName.setText("* " + hostVLan.getNetworkName()); //$NON-NLS-1$ - } - - row.setWidget(0, 1, networkName); - - // Address - row.setWidget(0, 2, new Label(hostVLan.getAddress())); - return row; } Grid createBlankRow(final HostInterfaceLineModel lineModel) { + return createVlanRowColumn(new Label(), + lineModel.getIsManagement(), + lineModel.getNetworkName(), + new Label(lineModel.getAddress())); + } + + private Grid createVlanRowColumn(Widget checkBoxWidget, + boolean networkManagementFlag, + String networkName, + Label addressLabel) { Grid row = new Grid(1, 3); row.getColumnFormatter().setWidth(0, VLanPanel.CHECK_BOX_COLUMN_WIDTH); row.getColumnFormatter().setWidth(1, VLanPanel.NETWORK_NAME_COLUMN_WIDTH); row.getColumnFormatter().setWidth(2, VLanPanel.ADDRESS_COLUMN_WIDTH); - row.setWidth("100%"); //$NON-NLS-1$ row.setHeight("100%"); //$NON-NLS-1$ - - // Empty name - row.setWidget(0, 0, new Label()); - - // Network name - Label networkName = new Label(lineModel.getNetworkName()); - - if (lineModel.getIsManagement()) { - networkName.getElement().getStyle().setFontWeight(FontWeight.BOLD); - networkName.setText("* " + lineModel.getNetworkName()); //$NON-NLS-1$ + row.setWidget(0, 0, checkBoxWidget); + Label networkNameLabel = new Label(networkName); + if (networkManagementFlag) { + networkNameLabel.getElement().getStyle().setFontWeight(FontWeight.BOLD); + networkNameLabel.setText("* " + networkName); //$NON-NLS-1$ } - - row.setWidget(0, 1, networkName); - - // Address - row.setWidget(0, 2, new Label(lineModel.getAddress())); - + row.setWidget(0, 1, networkNameLabel); + row.setWidget(0, 2, addressLabel); return row; } -- To view, visit https://gerrit.ovirt.org/39008 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iefa12d6d2876cdd1c2120a3a7667c729bd3183f9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eliraz Levi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
