Hello Arik Hadas,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/23615
to review the following change.
Change subject: frontend: minor refactoring in make template code
......................................................................
frontend: minor refactoring in make template code
Change-Id: I059662024475acb184046e138a31fc1931642de6
Signed-off-by: Arik Hadas <[email protected]>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
4 files changed, 35 insertions(+), 41 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/23615/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
index 956bcb1..9ff8ea8 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java
@@ -526,14 +526,15 @@
windowModel.initialize(null);
windowModel.getIsTemplatePublic().setEntity(false);
- UICommand tempVar = new UICommand("OnNewTemplate", this); //$NON-NLS-1$
- tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok());
- tempVar.setIsDefault(true);
- windowModel.getCommands().add(tempVar);
- UICommand tempVar2 = new UICommand("Cancel", this); //$NON-NLS-1$
-
tempVar2.setTitle(ConstantsManager.getInstance().getConstants().cancel());
- tempVar2.setIsCancel(true);
- windowModel.getCommands().add(tempVar2);
+ windowModel.getCommands().add(
+ new UICommand("OnNewTemplate", this) //$NON-NLS-1$)
+ .setTitle(ConstantsManager.getInstance().getConstants().ok())
+ .setIsDefault(true));
+
+ windowModel.getCommands().add(
+ new UICommand("Cancel", this) //$NON-NLS-1$
+
.setTitle(ConstantsManager.getInstance().getConstants().cancel())
+ .setIsCancel(true));
}
private void onNewTemplate()
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
index ddd5fe0..e48f048 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java
@@ -309,10 +309,8 @@
Object[] array2 = (Object[])
target2;
NewVmModelBehavior behavior2 =
(NewVmModelBehavior) array2[0];
- ArrayList<VmTemplate>
templatesByDataCenter =
- (ArrayList<VmTemplate>)
array2[1];
- ArrayList<VmTemplate>
templatesByStorage =
- (ArrayList<VmTemplate>)
returnValue2;
+ List<VmTemplate>
templatesByDataCenter = (List<VmTemplate>) array2[1];
+ List<VmTemplate>
templatesByStorage = (List<VmTemplate>) returnValue2;
VmTemplate blankTemplate =
Linq.firstOrDefault(templatesByDataCenter,
new
Linq.TemplatePredicate(Guid.Empty));
@@ -321,7 +319,7 @@
templatesByStorage.add(0,
blankTemplate);
}
- ArrayList<VmTemplate> templateList
= AsyncDataProvider.filterTemplatesByArchitecture(templatesByStorage,
+ List<VmTemplate> templateList =
AsyncDataProvider.filterTemplatesByArchitecture(templatesByStorage,
dataCenterWithCluster.getCluster().getArchitecture());
behavior2.postInitTemplate(templateList);
@@ -343,7 +341,7 @@
NewVmModelBehavior behavior = (NewVmModelBehavior)
target;
- ArrayList<VmTemplate> templates =
(ArrayList<VmTemplate>) returnValue;
+ List<VmTemplate> templates = (List<VmTemplate>)
returnValue;
behavior.postInitTemplate(AsyncDataProvider.filterTemplatesByArchitecture(templates,
dataCenterWithCluster.getCluster().getArchitecture()));
@@ -355,16 +353,15 @@
private void postInitTemplate(List<VmTemplate> templates)
{
- List<VmTemplate> rootTemplates = filterNotBaseTemplates(templates);
+ List<VmTemplate> baseTemplates = filterNotBaseTemplates(templates);
// If there was some template selected before, try select it again.
- VmTemplate oldTemplate =
getModel().getBaseTemplate().getSelectedItem();
+ VmTemplate prevBaseTemplate =
getModel().getBaseTemplate().getSelectedItem();
- getModel().getBaseTemplate().setItems(rootTemplates);
+ getModel().getBaseTemplate().setItems(baseTemplates);
-
getModel().getBaseTemplate().setSelectedItem(Linq.firstOrDefault(rootTemplates,
- oldTemplate != null ? new
Linq.TemplatePredicate(oldTemplate.getId())
- : new Linq.TemplatePredicate(Guid.Empty)));
+
getModel().getBaseTemplate().setSelectedItem(Linq.firstOrDefault(baseTemplates,
+ new Linq.TemplatePredicate(prevBaseTemplate != null ?
prevBaseTemplate.getId() : Guid.Empty)));
updateIsDisksAvailable();
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
index e3fab96..71242e3 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
@@ -1214,12 +1214,7 @@
private void newTemplate()
{
VM vm = (VM) getSelectedItem();
- if (vm == null)
- {
- return;
- }
-
- if (getWindow() != null)
+ if (vm == null || getWindow() != null)
{
return;
}
@@ -1233,14 +1228,15 @@
model.initialize(getSystemTreeSelectedItem());
- UICommand tempVar = new UICommand("OnNewTemplate", this); //$NON-NLS-1$
- tempVar.setTitle(ConstantsManager.getInstance().getConstants().ok());
- tempVar.setIsDefault(true);
- model.getCommands().add(tempVar);
- UICommand tempVar2 = new UICommand("Cancel", this); //$NON-NLS-1$
-
tempVar2.setTitle(ConstantsManager.getInstance().getConstants().cancel());
- tempVar2.setIsCancel(true);
- model.getCommands().add(tempVar2);
+ model.getCommands().add(
+ new UICommand("OnNewTemplate", this) //$NON-NLS-1$
+ .setTitle(ConstantsManager.getInstance().getConstants().ok())
+ .setIsDefault(true));
+
+ model.getCommands().add(
+ new UICommand("Cancel", this) //$NON-NLS-1$
+
.setTitle(ConstantsManager.getInstance().getConstants().cancel())
+ .setIsCancel(true));
model.getIsHighlyAvailable().setEntity(vm.getStaticData().isAutoStartup());
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
index 356e83d..ed12cff 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
@@ -52,7 +52,7 @@
private final UIConstants constants =
ConstantsManager.getInstance().getConstants();
private TModel privateModel;
- private HashMap<Guid, List<VmTemplate>> templateToSubVersions = new
HashMap<Guid, List<VmTemplate>>();
+ private HashMap<Guid, List<VmTemplate>> baseTemplateToSubTemplates = new
HashMap<Guid, List<VmTemplate>>();
public TModel getModel() {
return privateModel;
@@ -131,19 +131,19 @@
for (VmTemplate template : templates) {
if (template.getId().equals(template.getBaseTemplateId())) {
baseTemplates.add(template);
- templateToSubVersions.put(template.getId(),
+ baseTemplateToSubTemplates.put(template.getId(),
new ArrayList<VmTemplate>());
}
}
for (VmTemplate template : templates) {
Guid baseTemplateId = template.getBaseTemplateId();
- if (templateToSubVersions.containsKey(baseTemplateId)) {
- templateToSubVersions.get(baseTemplateId).add(template);
+ if (baseTemplateToSubTemplates.containsKey(baseTemplateId)) {
+ baseTemplateToSubTemplates.get(baseTemplateId).add(template);
}
}
- for (List<VmTemplate> subversions : (Collection<List<VmTemplate>>)
templateToSubVersions.values()) {
+ for (List<VmTemplate> subversions : (Collection<List<VmTemplate>>)
baseTemplateToSubTemplates.values()) {
Collections.sort(subversions, new Comparator<VmTemplate>() {
@Override
public int compare(VmTemplate o1, VmTemplate o2) {
@@ -152,7 +152,7 @@
});
}
- for (List<VmTemplate> subversions : templateToSubVersions.values()) {
+ for (List<VmTemplate> subversions :
baseTemplateToSubTemplates.values()) {
subversions.add(0, createLatestTemplate(subversions.get(0)));
}
@@ -175,7 +175,7 @@
protected void baseTemplateSelectedItemChanged() {
VmTemplate baseTemplate =
getModel().getBaseTemplate().getSelectedItem();
if (baseTemplate != null) {
- List<VmTemplate> subVersions =
templateToSubVersions.get(baseTemplate.getId());
+ List<VmTemplate> subVersions =
baseTemplateToSubTemplates.get(baseTemplate.getId());
getModel().getTemplate().setItems(new
ArrayList<VmTemplate>(subVersions));
// it's safe because in index 0 there's the latest version and
--
To view, visit http://gerrit.ovirt.org/23615
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I059662024475acb184046e138a31fc1931642de6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Arik Hadas <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
