Alona Kaplan has uploaded a new change for review. Change subject: webadmin: Network Main Tab- cleanup ......................................................................
webadmin: Network Main Tab- cleanup - Formatting the new classes. - Fix non-logic comments from previous reviews (data members names, methods order...) Change-Id: I8773ac1cb7131123fed4a91fe751308c3575abcd Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/network/NetworkSubTabPanelPresenter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java 13 files changed, 370 insertions(+), 376 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/9008/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java index 2ec44da..0c66ffa 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import java.util.Map; import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.businessentities.VDS; @@ -126,16 +127,16 @@ privateClusterMap = value; } - private HashMap<Guid, List<Network>> privateNetworkMap; + private Map<Guid, List<Network>> networkMap; - public HashMap<Guid, List<Network>> getNetworkMap() + public Map<Guid, List<Network>> getNetworkMap() { - return privateNetworkMap; + return networkMap; } - public void setNetworkMap(HashMap<Guid, List<Network>> value) + public void setNetworkMap(Map<Guid, List<Network>> value) { - privateNetworkMap = value; + networkMap = value; } private HashMap<Guid, ArrayList<VDS>> privateHostMap; @@ -287,8 +288,8 @@ systemTreeModel.setNetworkMap(new HashMap<Guid, List<Network>>()); List<VdcQueryReturnValue> returnValueList = result.getReturnValues(); - List<Network> dcNetworkList = null; - Guid dcId = null; + List<Network> dcNetworkList; + Guid dcId; for (int i = 0; i < returnValueList.size(); i++) { @@ -443,7 +444,7 @@ dataCenterItem.getChildren().add(networksItem); List<Network> dcNetworks = getNetworkMap().get(getDataCenters().get(count).getId()); - if (dcNetworks != null && dcNetworks.size() > 0) + if (dcNetworks != null) { for (Network network : dcNetworks) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java index 7db10dd..7836e5d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java @@ -9,13 +9,13 @@ public class ClusterNetworkModel extends EntityModel { private boolean management; - private boolean isAttached = true; + private boolean attached = true; private VDSGroup cluster = null; public ClusterNetworkModel(Network network) { setEntity(network); if (network.getCluster() == null){ - isAttached = false; + attached = false; // Init with default values getEntity().setCluster(new network_cluster()); } @@ -47,7 +47,7 @@ } public boolean isAttached() { - return isAttached; + return attached; } public boolean isDisplayNetwork() { @@ -67,7 +67,7 @@ } public void setAttached(boolean attached) { - isAttached = attached; + attached = attached; } public void setDisplayNetwork(boolean displayNetwork) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java index 2afee3f..087e13f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkClusterListModel.java @@ -33,23 +33,22 @@ @SuppressWarnings("unused") public class NetworkClusterListModel extends SearchableListModel { + private UICommand manageCommand; + + private final Comparator<ClusterNetworkModel> manageModelComparator = + new Comparator<ClusterNetworkModel>() { + @Override + public int compare(ClusterNetworkModel o1, ClusterNetworkModel o2) { + return o1.getCluster().getname().compareTo(o2.getCluster().getname()); + } + }; + + public NetworkClusterListModel() { setTitle(ConstantsManager.getInstance().getConstants().clustersTitle()); setHashName("clusters"); //$NON-NLS-1$ setManageCommand(new UICommand("Manage", this)); //$NON-NLS-1$ - } - - private UICommand privateManageCommand; - - public UICommand getManageCommand() - { - return privateManageCommand; - } - - private void setManageCommand(UICommand value) - { - privateManageCommand = value; } public void Manage() @@ -65,24 +64,17 @@ manageModel.setHashName("assign_network"); //$NON-NLS-1$ } - private final Comparator<ClusterNetworkModel> manageModelComparator = - new Comparator<ClusterNetworkModel>() { - @Override - public int compare(ClusterNetworkModel o1, ClusterNetworkModel o2) { - return o1.getCluster().getname().compareTo(o2.getCluster().getname()); - } - }; - private ClusterNetworkManageModel createManageList() { List<ClusterNetworkModel> networkManageModelList = new ArrayList<ClusterNetworkModel>(); - List<PairQueryable<VDSGroup, network_cluster>> items = (List<PairQueryable<VDSGroup, network_cluster>>) getItems(); + List<PairQueryable<VDSGroup, network_cluster>> items = + (List<PairQueryable<VDSGroup, network_cluster>>) getItems(); for (PairQueryable<VDSGroup, network_cluster> item : items) { Network network = (Network) Cloner.clone(getEntity().getNetwork()); - if (item.getSecond() != null){ + if (item.getSecond() != null) { network.setCluster((network_cluster) Cloner.clone(item.getSecond())); } - ClusterNetworkModel networkManageModel = new ClusterNetworkModel(network){ + ClusterNetworkModel networkManageModel = new ClusterNetworkModel(network) { @Override public String getDisplayedName() { return getCluster().getname(); @@ -95,7 +87,7 @@ Collections.sort(networkManageModelList, manageModelComparator); - ClusterNetworkManageModel listModel = new ClusterNetworkManageModel(){ + ClusterNetworkManageModel listModel = new ClusterNetworkManageModel() { @Override public boolean isMultiDisplay() { return true; @@ -176,7 +168,7 @@ private void doFinish() { windowModel.StopProgress(); - Cancel(); + cancel(); ForceRefresh(); } }; @@ -186,16 +178,17 @@ } private PairQueryable<VDSGroup, network_cluster> getItem(String clusterName) { - List<PairQueryable<VDSGroup, network_cluster>> items = (List<PairQueryable<VDSGroup, network_cluster>>) getItems(); - for (PairQueryable<VDSGroup, network_cluster> item : items){ - if (item.getFirst().getname().equals(clusterName)){ + List<PairQueryable<VDSGroup, network_cluster>> items = + (List<PairQueryable<VDSGroup, network_cluster>>) getItems(); + for (PairQueryable<VDSGroup, network_cluster> item : items) { + if (item.getFirst().getname().equals(clusterName)) { return item; } } return null; } - public void Cancel() + public void cancel() { setWindow(null); } @@ -234,9 +227,9 @@ return; } - AsyncQuery _asyncQuery = new AsyncQuery(); - _asyncQuery.setModel(this); - _asyncQuery.asyncCallback = new INewAsyncCallback() { + AsyncQuery asyncQuery = new AsyncQuery(); + asyncQuery.setModel(this); + asyncQuery.asyncCallback = new INewAsyncCallback() { @Override public void OnSuccess(Object model, Object ReturnValue) { @@ -246,7 +239,7 @@ NetworkIdParameters networkIdParams = new NetworkIdParameters(getEntity().getNetwork().getId()); networkIdParams.setRefresh(getIsQueryFirstTime()); - Frontend.RunQuery(VdcQueryType.GetVdsGroupsAndNetworksByNetworkId, networkIdParams, _asyncQuery); + Frontend.RunQuery(VdcQueryType.GetVdsGroupsAndNetworksByNetworkId, networkIdParams, asyncQuery); } @Override @@ -275,8 +268,18 @@ } else if (StringHelper.stringsEqual(command.getName(), "Cancel")) //$NON-NLS-1$ { - Cancel(); + cancel(); } + } + + public UICommand getManageCommand() + { + return manageCommand; + } + + private void setManageCommand(UICommand value) + { + manageCommand = value; } @Override @@ -284,4 +287,3 @@ return "NetworkClusterListModel"; //$NON-NLS-1$ } } - diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java index 399c1ab..ebd91f3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkGeneralModel.java @@ -1,6 +1,5 @@ package org.ovirt.engine.ui.uicommonweb.models.networks; - import org.ovirt.engine.core.common.businessentities.NetworkView; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.compat.Guid; @@ -12,111 +11,15 @@ public class NetworkGeneralModel extends EntityModel { - private final String ENGINE_NETWORK_NAME = (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); + private final String ENGINE_NETWORK_NAME = + (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); - private String privateName; - - public String getName() - { - return privateName; - } - - public void setName(String value) - { - if (!StringHelper.stringsEqual(privateName, value)) - { - privateName = value; - OnPropertyChanged(new PropertyChangedEventArgs("Name")); //$NON-NLS-1$ - } - } - - private String privateRole; - - public String getRole() - { - return privateRole; - } - - public void setRole(String value) - { - if (!StringHelper.stringsEqual(privateRole, value)) - { - privateRole = value; - OnPropertyChanged(new PropertyChangedEventArgs("Role")); //$NON-NLS-1$ - } - } - - private Integer privateVlan; - - public Integer getVlan() - { - return privateVlan; - } - - public void setVlan(Integer value) - { - if (privateVlan == null && value == null) - { - return; - } - if (privateVlan == null || !privateVlan.equals(value)) - { - privateVlan = value; - OnPropertyChanged(new PropertyChangedEventArgs("Vlan")); //$NON-NLS-1$ - } - } - - private Integer privateMtu; - - public Integer getMtu() - { - return privateMtu; - } - - public void setMtu(Integer value) - { - if (privateMtu == null && value == null) - { - return; - } - if (privateMtu == null || !privateMtu.equals(value)) - { - privateMtu = value; - OnPropertyChanged(new PropertyChangedEventArgs("Mtu")); //$NON-NLS-1$ - } - } - - private String privateDescription; - - public String getDescription() - { - return privateDescription; - } - - public void setDescription(String value) - { - if (!StringHelper.stringsEqual(privateDescription, value)) - { - privateDescription = value; - OnPropertyChanged(new PropertyChangedEventArgs("Description")); //$NON-NLS-1$ - } - } - - private Guid privateId; - - public Guid getId() - { - return privateId; - } - - public void setId(Guid value) - { - if ((privateId == null && value != null) || (privateId != null && !privateId.equals(value))) - { - privateId = value; - OnPropertyChanged(new PropertyChangedEventArgs("Id")); //$NON-NLS-1$ - } - } + private String name; + private String role; + private Integer vlan; + private Integer mtu; + private String description; + private Guid id; public NetworkGeneralModel() { @@ -147,18 +50,17 @@ { NetworkView extendedNetwork = (NetworkView) getEntity(); - setName(extendedNetwork.getNetwork().getName()); setId(extendedNetwork.getNetwork().getId()); setDescription(extendedNetwork.getNetwork().getdescription()); - String role = ""; //$NON-NLS-1$ + String role = ""; //$NON-NLS-1$ - if (ENGINE_NETWORK_NAME.equals(extendedNetwork.getNetwork().getName())){ + if (ENGINE_NETWORK_NAME.equals(extendedNetwork.getNetwork().getName())) { role = role.concat(ConstantsManager.getInstance().getConstants().mgmgtNetworkRole()); } - if (extendedNetwork.getNetwork().isVmNetwork()){ + if (extendedNetwork.getNetwork().isVmNetwork()) { if (!role.equals("")) //$NON-NLS-1$ { role = role.concat(" ,"); //$NON-NLS-1$ @@ -168,10 +70,102 @@ setRole(role); setVlan(extendedNetwork.getNetwork().getvlan_id()); - if (extendedNetwork.getNetwork().getMtu() == 0){ + if (extendedNetwork.getNetwork().getMtu() == 0) { setMtu(null); - }else{ + } else { setMtu(extendedNetwork.getNetwork().getMtu()); } } + + public String getName() + { + return name; + } + + public void setName(String value) + { + if (!StringHelper.stringsEqual(name, value)) + { + name = value; + OnPropertyChanged(new PropertyChangedEventArgs("Name")); //$NON-NLS-1$ + } + } + + public String getRole() + { + return role; + } + + public void setRole(String value) + { + if (!StringHelper.stringsEqual(role, value)) + { + role = value; + OnPropertyChanged(new PropertyChangedEventArgs("Role")); //$NON-NLS-1$ + } + } + + public Integer getVlan() + { + return vlan; + } + + public void setVlan(Integer value) + { + if (vlan == null && value == null) + { + return; + } + if (vlan == null || !vlan.equals(value)) + { + vlan = value; + OnPropertyChanged(new PropertyChangedEventArgs("Vlan")); //$NON-NLS-1$ + } + } + + public Integer getMtu() + { + return mtu; + } + + public void setMtu(Integer value) + { + if (mtu == null && value == null) + { + return; + } + if (mtu == null || !mtu.equals(value)) + { + mtu = value; + OnPropertyChanged(new PropertyChangedEventArgs("Mtu")); //$NON-NLS-1$ + } + } + + public String getDescription() + { + return description; + } + + public void setDescription(String value) + { + if (!StringHelper.stringsEqual(description, value)) + { + description = value; + OnPropertyChanged(new PropertyChangedEventArgs("Description")); //$NON-NLS-1$ + } + } + + public Guid getId() + { + return id; + } + + public void setId(Guid value) + { + if ((id == null && value != null) || (id != null && !id.equals(value))) + { + id = value; + OnPropertyChanged(new PropertyChangedEventArgs("Id")); //$NON-NLS-1$ + } + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java index dd8f0de..1f14ccd 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java @@ -24,47 +24,16 @@ @SuppressWarnings("unused") public class NetworkHostListModel extends SearchableListModel { + private UICommand setupNetworksCommand; + private NetworkHostFilter viewFilterType; + public NetworkHostListModel() { setTitle(ConstantsManager.getInstance().getConstants().hostsTitle()); setHashName("hosts"); //$NON-NLS-1$ setSetupNetworksCommand(new UICommand("SetupNetworks", this)); //$NON-NLS-1$ - UpdateActionAvailability(); - } - - private UICommand privateSetupNetworksCommand; - - public UICommand getSetupNetworksCommand() - { - return privateSetupNetworksCommand; - } - - private void setSetupNetworksCommand(UICommand value) - { - privateSetupNetworksCommand = value; - } - - private NetworkHostFilter viewFilterType; - - public NetworkHostFilter getViewFilterType() { - return viewFilterType; - } - - public void setViewFilterType(NetworkHostFilter viewFilterType) { - this.viewFilterType = viewFilterType; - Search(); - } - - @Override - public NetworkView getEntity() - { - return (NetworkView) ((super.getEntity() instanceof NetworkView) ? super.getEntity() : null); - } - - public void setEntity(NetworkView value) - { - super.setEntity(value); + updateActionAvailability(); } @Override @@ -91,19 +60,20 @@ return; } - AsyncQuery _asyncQuery = new AsyncQuery(); - _asyncQuery.setModel(getViewFilterType()); - _asyncQuery.asyncCallback = new INewAsyncCallback() { + AsyncQuery asyncQuery = new AsyncQuery(); + asyncQuery.setModel(getViewFilterType()); + asyncQuery.asyncCallback = new INewAsyncCallback() { @Override public void OnSuccess(Object model, Object ReturnValue) { - if (model.equals(getViewFilterType())){ + if (model.equals(getViewFilterType())) { Iterable returnList = (Iterable) ((VdcQueryReturnValue) ReturnValue).getReturnValue(); - List<PairQueryable<VdsNetworkInterface, VDS>> items = new ArrayList<PairQueryable<VdsNetworkInterface, VDS>>(); - for (Object obj : returnList){ - if (obj instanceof VDS){ - items.add(new PairQueryable<VdsNetworkInterface, VDS>(null, (VDS)obj)); - }else{ + List<PairQueryable<VdsNetworkInterface, VDS>> items = + new ArrayList<PairQueryable<VdsNetworkInterface, VDS>>(); + for (Object obj : returnList) { + if (obj instanceof VDS) { + items.add(new PairQueryable<VdsNetworkInterface, VDS>(null, (VDS) obj)); + } else { items.add((PairQueryable<VdsNetworkInterface, VDS>) obj); } } @@ -116,18 +86,20 @@ NetworkIdParameters networkIdParams = new NetworkIdParameters(getEntity().getNetwork().getId()); networkIdParams.setRefresh(getIsQueryFirstTime()); - if (NetworkHostFilter.unattached.equals(getViewFilterType())){ - Frontend.RunQuery(VdcQueryType.GetVdsWithoutNetwork, networkIdParams, _asyncQuery); - }else if (NetworkHostFilter.attached.equals(getViewFilterType())){ - Frontend.RunQuery(VdcQueryType.GetVdsAndNetworkInterfacesByNetworkId, networkIdParams, _asyncQuery); - }else if (NetworkHostFilter.all.equals(getViewFilterType())){ - Frontend.RunQuery(VdcQueryType.GetAllVdsByStoragePool, new GetAllVdsByStoragePoolParameters(getEntity().getNetwork().getstorage_pool_id().getValue()), _asyncQuery); + if (NetworkHostFilter.unattached.equals(getViewFilterType())) { + Frontend.RunQuery(VdcQueryType.GetVdsWithoutNetwork, networkIdParams, asyncQuery); + } else if (NetworkHostFilter.attached.equals(getViewFilterType())) { + Frontend.RunQuery(VdcQueryType.GetVdsAndNetworkInterfacesByNetworkId, networkIdParams, asyncQuery); + } else if (NetworkHostFilter.all.equals(getViewFilterType())) { + Frontend.RunQuery(VdcQueryType.GetAllVdsByStoragePool, + new GetAllVdsByStoragePoolParameters(getEntity().getNetwork().getstorage_pool_id().getValue()), + asyncQuery); } setIsQueryFirstTime(false); } - public void SetupNetworks() { + public void setupNetworks() { if (getWindow() != null) { return; @@ -153,40 +125,72 @@ } @Override - protected String getListName() { - return "NetworkHostListModel"; //$NON-NLS-1$ - } - - @Override public void ExecuteCommand(UICommand command) { super.ExecuteCommand(command); if (command == getSetupNetworksCommand()) { - SetupNetworks(); + setupNetworks(); } } - private void UpdateActionAvailability() + private void updateActionAvailability() { - List<PairQueryable<VdsNetworkInterface, VDS>> selectedItems = getSelectedItems() != null ? getSelectedItems() : new ArrayList(); + List<PairQueryable<VdsNetworkInterface, VDS>> selectedItems = + getSelectedItems() != null ? getSelectedItems() : new ArrayList(); - getSetupNetworksCommand().setIsExecutionAllowed(selectedItems.size() == 1 && selectedItems.get(0).getSecond().getvds_group_compatibility_version().compareTo(Version.v3_1) >= 0); + getSetupNetworksCommand().setIsExecutionAllowed(selectedItems.size() == 1 + && selectedItems.get(0).getSecond().getvds_group_compatibility_version().compareTo(Version.v3_1) >= 0); } @Override protected void OnSelectedItemChanged() { super.OnSelectedItemChanged(); - UpdateActionAvailability(); + updateActionAvailability(); } @Override protected void SelectedItemsChanged() { super.SelectedItemsChanged(); - UpdateActionAvailability(); + updateActionAvailability(); + } + + public UICommand getSetupNetworksCommand() + { + return setupNetworksCommand; + } + + private void setSetupNetworksCommand(UICommand value) + { + setupNetworksCommand = value; + } + + public NetworkHostFilter getViewFilterType() { + return viewFilterType; + } + + public void setViewFilterType(NetworkHostFilter viewFilterType) { + this.viewFilterType = viewFilterType; + Search(); + } + + @Override + public NetworkView getEntity() + { + return (NetworkView) ((super.getEntity() instanceof NetworkView) ? super.getEntity() : null); + } + + public void setEntity(NetworkView value) + { + super.setEntity(value); + } + + @Override + protected String getListName() { + return "NetworkHostListModel"; //$NON-NLS-1$ } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java index f7ea5ef..77d6116 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java @@ -35,43 +35,14 @@ public class NetworkListModel extends ListWithDetailsModel implements ISupportSystemTreeContext { - private static String ENGINE_NETWORK = (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); + private static String ENGINE_NETWORK = + (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); - private UICommand privateNewCommand; + private UICommand newCommand; + private UICommand editCommand; + private UICommand removeCommand; - public UICommand getNewCommand() - { - return privateNewCommand; - } - - private void setNewCommand(UICommand value) - { - privateNewCommand = value; - } - - private UICommand privateEditCommand; - - public UICommand getEditCommand() - { - return privateEditCommand; - } - - private void setEditCommand(UICommand value) - { - privateEditCommand = value; - } - - private UICommand privateRemoveCommand; - - public UICommand getRemoveCommand() - { - return privateRemoveCommand; - } - - private void setRemoveCommand(UICommand value) - { - privateRemoveCommand = value; - } + private SystemTreeItemModel systemTreeSelectedItem; public NetworkListModel() { @@ -90,28 +61,6 @@ getSearchNextPageCommand().setIsAvailable(true); getSearchPreviousPageCommand().setIsAvailable(true); - } - - @Override - public void setItems(Iterable value) { - - if (value != null){ - List<NetworkView> networksList = (List<NetworkView>) value; - Collections.sort(networksList, new Comparator<NetworkView>() { - - @Override - public int compare(NetworkView paramT1, NetworkView paramT2) { - int compareValue = paramT1.getStoragePoolName().compareTo(paramT2.getStoragePoolName()); - - if (compareValue!= 0){ - return compareValue; - } - - return paramT1.getNetwork().getName().compareTo(paramT2.getNetwork().getName()); - } - }); - } - super.setItems(value); } public void newNetwork() @@ -143,14 +92,11 @@ } - public void apply() { EditNetworkModel model = (EditNetworkModel) getWindow(); model.apply(); } - - boolean firstFinished; public void remove() { @@ -163,7 +109,7 @@ setConfirmWindow(model); } - private void initDcList(final NetworkModel networkModel){ + private void initDcList(final NetworkModel networkModel) { // Get all data centers AsyncDataProvider.GetDataCenterList(new AsyncQuery(NetworkListModel.this, new INewAsyncCallback() { @@ -173,10 +119,11 @@ ArrayList<storage_pool> dataCenters = (ArrayList<storage_pool>) returnValue; networkModel.getDataCenters().setItems(dataCenters); - if (networkModel instanceof EditNetworkModel){ - storage_pool currentDc = findDc(networkModel.getNetwork().getstorage_pool_id().getValue(), dataCenters); + if (networkModel instanceof EditNetworkModel) { + storage_pool currentDc = + findDc(networkModel.getNetwork().getstorage_pool_id().getValue(), dataCenters); networkModel.getDataCenters().setSelectedItem(currentDc); - }else{ + } else { networkModel.getDataCenters().setSelectedItem(Linq.FirstOrDefault(dataCenters)); } @@ -184,9 +131,9 @@ })); } - private storage_pool findDc(Guid dcId, List<storage_pool> dataCenters){ - for (storage_pool dc : dataCenters){ - if (dcId.equals(dc.getId())){ + private storage_pool findDc(Guid dcId, List<storage_pool> dataCenters) { + for (storage_pool dc : dataCenters) { + if (dcId.equals(dc.getId())) { return dc; } } @@ -233,7 +180,6 @@ setItems(getAsyncResult().getData()); } - @Override protected void OnSelectedItemChanged() { @@ -247,8 +193,6 @@ super.SelectedItemsChanged(); UpdateActionAvailability(); } - - private void UpdateActionAvailability() { @@ -295,8 +239,6 @@ } } - private SystemTreeItemModel systemTreeSelectedItem; - @Override public SystemTreeItemModel getSystemTreeSelectedItem() { @@ -319,6 +261,28 @@ } @Override + public void setItems(Iterable value) { + + if (value != null) { + List<NetworkView> networksList = (List<NetworkView>) value; + Collections.sort(networksList, new Comparator<NetworkView>() { + + @Override + public int compare(NetworkView paramT1, NetworkView paramT2) { + int compareValue = paramT1.getStoragePoolName().compareTo(paramT2.getStoragePoolName()); + + if (compareValue != 0) { + return compareValue; + } + + return paramT1.getNetwork().getName().compareTo(paramT2.getNetwork().getName()); + } + }); + } + super.setItems(value); + } + + @Override public NetworkView getEntity() { return (NetworkView) super.getEntity(); @@ -329,4 +293,33 @@ return "NetworkListModel"; //$NON-NLS-1$ } + public UICommand getNewCommand() + { + return newCommand; + } + + private void setNewCommand(UICommand value) + { + newCommand = value; + } + + public UICommand getEditCommand() + { + return editCommand; + } + + private void setEditCommand(UICommand value) + { + editCommand = value; + } + + public UICommand getRemoveCommand() + { + return removeCommand; + } + + private void setRemoveCommand(UICommand value) + { + removeCommand = value; + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java index 00c1c50..1119e32 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkTemplateListModel.java @@ -73,19 +73,22 @@ @Override public void setItems(Iterable value) { - if (value != null){ - List<PairQueryable<VmNetworkInterface, VmTemplate>> itemList = (List<PairQueryable<VmNetworkInterface, VmTemplate>>) value; + if (value != null) { + List<PairQueryable<VmNetworkInterface, VmTemplate>> itemList = + (List<PairQueryable<VmNetworkInterface, VmTemplate>>) value; Collections.sort(itemList, new Comparator<PairQueryable<VmNetworkInterface, VmTemplate>>() { @Override - public int compare(PairQueryable<VmNetworkInterface, VmTemplate> paramT1, PairQueryable<VmNetworkInterface, VmTemplate> paramT2) { - int compareValue = paramT1.getSecond().getvds_group_name().compareTo(paramT2.getSecond().getvds_group_name()); + public int compare(PairQueryable<VmNetworkInterface, VmTemplate> paramT1, + PairQueryable<VmNetworkInterface, VmTemplate> paramT2) { + int compareValue = + paramT1.getSecond().getvds_group_name().compareTo(paramT2.getSecond().getvds_group_name()); - if (compareValue!= 0){ - return compareValue; - } + if (compareValue != 0) { + return compareValue; + } - return paramT1.getSecond().getname().compareTo(paramT2.getSecond().getname()); + return paramT1.getSecond().getname().compareTo(paramT2.getSecond().getname()); } }); } @@ -109,9 +112,9 @@ return; } - AsyncQuery _asyncQuery = new AsyncQuery(); - _asyncQuery.setModel(this); - _asyncQuery.asyncCallback = new INewAsyncCallback() { + AsyncQuery asyncQuery = new AsyncQuery(); + asyncQuery.setModel(this); + asyncQuery.asyncCallback = new INewAsyncCallback() { @Override public void OnSuccess(Object model, Object ReturnValue) { @@ -122,9 +125,8 @@ NetworkIdParameters networkIdParams = new NetworkIdParameters(getEntity().getNetwork().getId()); networkIdParams.setRefresh(getIsQueryFirstTime()); - Frontend.RunQuery(VdcQueryType.GetVmTemplatesAndNetworkInterfacesByNetworkId, networkIdParams, _asyncQuery); + Frontend.RunQuery(VdcQueryType.GetVmTemplatesAndNetworkInterfacesByNetworkId, networkIdParams, asyncQuery); } - @Override protected void AsyncSearch() @@ -137,7 +139,6 @@ { getRemoveCommand().setIsExecutionAllowed(getSelectedItems() != null && !getSelectedItems().isEmpty()); } - @Override protected void OnSelectedItemChanged() @@ -187,4 +188,3 @@ return "NetworkTemplateListModel"; //$NON-NLS-1$ } } - diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java index b310c3b..9a9cfa0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkVmListModel.java @@ -28,18 +28,7 @@ @SuppressWarnings("unused") public class NetworkVmListModel extends SearchableListModel { - private UICommand removeCommand; - - public UICommand getRemoveCommand() - { - return removeCommand; - } - - private void setRemoveCommand(UICommand value) - { - removeCommand = value; - } public NetworkVmListModel() { setTitle(ConstantsManager.getInstance().getConstants().virtualMachinesTitle()); @@ -108,9 +97,9 @@ return; } - AsyncQuery _asyncQuery = new AsyncQuery(); - _asyncQuery.setModel(this); - _asyncQuery.asyncCallback = new INewAsyncCallback() { + AsyncQuery asyncQuery = new AsyncQuery(); + asyncQuery.setModel(this); + asyncQuery.asyncCallback = new INewAsyncCallback() { @Override public void OnSuccess(Object model, Object ReturnValue) { @@ -121,7 +110,7 @@ NetworkIdParameters networkIdParams = new NetworkIdParameters(getEntity().getNetwork().getId()); networkIdParams.setRefresh(getIsQueryFirstTime()); - Frontend.RunQuery(VdcQueryType.GetVmsAndNetworkInterfacesByNetworkId, networkIdParams, _asyncQuery); + Frontend.RunQuery(VdcQueryType.GetVmsAndNetworkInterfacesByNetworkId, networkIdParams, asyncQuery); } @Override @@ -210,6 +199,16 @@ } } + public UICommand getRemoveCommand() + { + return removeCommand; + } + + private void setRemoveCommand(UICommand value) + { + removeCommand = value; + } + @Override protected String getListName() { return "NetworkVmListModel"; //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index 04f266e..76ed162 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -130,9 +130,6 @@ @DefaultStringValue("Enable VLAN tagging") String clusterNewNetworkPopupVlanEnabledLabel(); - @DefaultStringValue("VLAN tag") - String clusterNewNetworkPopupVlanTagLabel(); - @DefaultStringValue("Override MTU") String clusterNewNetworkPopupMtuEnabledLabel(); @@ -1503,7 +1500,7 @@ @DefaultStringValue("Data Center") String dcNetwork(); - @DefaultStringValue("VLAN tagging") + @DefaultStringValue("VLAN tag") String vlanNetwork(); @DefaultStringValue("MTU") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/network/NetworkSubTabPanelPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/network/NetworkSubTabPanelPresenter.java index 6343820..09fc0b4 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/network/NetworkSubTabPanelPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/network/NetworkSubTabPanelPresenter.java @@ -15,6 +15,12 @@ public class NetworkSubTabPanelPresenter extends AbstractSubTabPanelPresenter<NetworkSubTabPanelPresenter.ViewDef, NetworkSubTabPanelPresenter.ProxyDef> { + @RequestTabs + public static final Type<RequestTabsHandler> TYPE_RequestTabs = new Type<RequestTabsHandler>(); + + @ContentSlot + public static final Type<RevealContentHandler<?>> TYPE_SetTabContent = new Type<RevealContentHandler<?>>(); + @ProxyCodeSplit public interface ProxyDef extends Proxy<NetworkSubTabPanelPresenter> { } @@ -22,16 +28,9 @@ public interface ViewDef extends TabView { } - @RequestTabs - public static final Type<RequestTabsHandler> TYPE_RequestTabs = new Type<RequestTabsHandler>(); - - @ContentSlot - public static final Type<RevealContentHandler<?>> TYPE_SetTabContent = new Type<RevealContentHandler<?>>(); - @Inject public NetworkSubTabPanelPresenter(EventBus eventBus, ViewDef view, ProxyDef proxy) { super(eventBus, view, proxy, TYPE_SetTabContent, TYPE_RequestTabs); } } - diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java index 3ae881e..c6e06f2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java @@ -29,7 +29,8 @@ ViewIdHandler idHandler = GWT.create(ViewIdHandler.class); } - private final String ENGINE_NETWORK_NAME = (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); + private final String ENGINE_NETWORK_NAME = + (String) AsyncDataProvider.GetConfigValuePreConverted(ConfigurationValues.ManagementNetwork); private final ApplicationConstants constants; private final ApplicationTemplates templates; @@ -39,7 +40,10 @@ private final SafeHtml emptyImage; @Inject - public MainTabNetworkView(MainModelProvider<NetworkView, NetworkListModel> modelProvider, ApplicationConstants constants, ApplicationTemplates templates, ApplicationResources resources) { + public MainTabNetworkView(MainModelProvider<NetworkView, NetworkListModel> modelProvider, + ApplicationConstants constants, + ApplicationTemplates templates, + ApplicationResources resources) { super(modelProvider); this.constants = constants; this.templates = templates; @@ -50,7 +54,6 @@ initTable(); initWidget(getTable()); } - void initTable() { @@ -80,55 +83,60 @@ }; getTable().addColumn(descriptionColumn, constants.descriptionNetwork()); - SafeHtmlWithSafeHtmlTooltipColumn<NetworkView> roleColumn = new SafeHtmlWithSafeHtmlTooltipColumn<NetworkView>(){ - @Override - public SafeHtml getValue(NetworkView networkView) { + SafeHtmlWithSafeHtmlTooltipColumn<NetworkView> roleColumn = + new SafeHtmlWithSafeHtmlTooltipColumn<NetworkView>() { + @Override + public SafeHtml getValue(NetworkView networkView) { - String images = ""; //$NON-NLS-1$ + String images = ""; //$NON-NLS-1$ - if (ENGINE_NETWORK_NAME.equals(networkView.getNetwork().getName())){ + if (ENGINE_NETWORK_NAME.equals(networkView.getNetwork().getName())) { - images = images.concat(mgmtImage.asString()); - }else{ - images = images.concat(emptyImage.asString()); - } + images = images.concat(mgmtImage.asString()); + } else { + images = images.concat(emptyImage.asString()); + } - if (networkView.getNetwork().isVmNetwork()){ + if (networkView.getNetwork().isVmNetwork()) { - images = images.concat(vmImage.asString()); - }else{ - images = images.concat(emptyImage.asString()); - } + images = images.concat(vmImage.asString()); + } else { + images = images.concat(emptyImage.asString()); + } - return templates.image(SafeHtmlUtils.fromTrustedString(images)); - } - - @Override - public SafeHtml getTooltip(NetworkView networkView) { - String tooltip = ""; //$NON-NLS-1$ - if (ENGINE_NETWORK_NAME.equals(networkView.getNetwork().getName())){ - tooltip = tooltip.concat(templates.imageTextSetupNetwork(mgmtImage, constants.managementItemInfo()).asString()); - } - - if (networkView.getNetwork().isVmNetwork()){ - if (!"".equals(tooltip)) //$NON-NLS-1$ - { - tooltip = tooltip.concat("<BR>"); //$NON-NLS-1$ + return templates.image(SafeHtmlUtils.fromTrustedString(images)); } - tooltip = tooltip.concat(templates.imageTextSetupNetwork(vmImage, constants.vmItemInfo()).asString()); - } + @Override + public SafeHtml getTooltip(NetworkView networkView) { + String tooltip = ""; //$NON-NLS-1$ + if (ENGINE_NETWORK_NAME.equals(networkView.getNetwork().getName())) { + tooltip = + tooltip.concat(templates.imageTextSetupNetwork(mgmtImage, + constants.managementItemInfo()).asString()); + } - return SafeHtmlUtils.fromTrustedString(tooltip); - } - }; + if (networkView.getNetwork().isVmNetwork()) { + if (!"".equals(tooltip)) //$NON-NLS-1$ + { + tooltip = tooltip.concat("<BR>"); //$NON-NLS-1$ + } + tooltip = + tooltip.concat(templates.imageTextSetupNetwork(vmImage, constants.vmItemInfo()) + .asString()); + + } + + return SafeHtmlUtils.fromTrustedString(tooltip); + } + }; getTable().addColumn(roleColumn, constants.roleNetwork(), "60px"); //$NON-NLS-1$ TextColumnWithTooltip<NetworkView> vlanColumn = new TextColumnWithTooltip<NetworkView>() { @Override public String getValue(NetworkView object) { - return object.getNetwork().getvlan_id()== null ? "-" : object.getNetwork().getvlan_id().toString(); //$NON-NLS-1$ + return object.getNetwork().getvlan_id() == null ? "-" : object.getNetwork().getvlan_id().toString(); //$NON-NLS-1$ } }; getTable().addColumn(vlanColumn, constants.vlanNetwork()); @@ -154,4 +162,3 @@ } } - diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.ui.xml index 1c47097..c69ac54 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.ui.xml @@ -4,13 +4,12 @@ xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:e="urn:import:com.google.gwt.editor.ui.client" xmlns:f="urn:import:org.ovirt.engine.ui.common.widget.form"> - <ui:style> + <ui:style> .formPanel { padding-top: 10px; } </ui:style> - + <f:GeneralFormPanel ui:field="formPanel" addStyleNames="{style.formPanel}"/> - + </ui:UiBinder> - \ No newline at end of file diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java index 4d2f749..1d67c54 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/SafeHtmlWithSafeHtmlTooltipColumn.java @@ -23,7 +23,6 @@ SafeHtml value, NativeEvent event, ValueUpdater<SafeHtml> valueUpdater) { - // TODO Auto-generated method stub super.onBrowserEvent(context, parent, value, event, valueUpdater); } -- To view, visit http://gerrit.ovirt.org/9008 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8773ac1cb7131123fed4a91fe751308c3575abcd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
