modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
| 6 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
| 8 ++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
| 9 +++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
| 17 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
| 8 ++++
5 files changed, 38 insertions(+), 10 deletions(-)
New commits:
commit b9b50704a663d86eb0f961aa45c09cc2cc40063a
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Mon Sep 13 17:23:27 2010 -0400
abstract out the save method since different SLSBs need to be called depending on the
type of alert def (resource, group, or template)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
index 657fd5c..ce834da 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
@@ -119,14 +119,14 @@ public abstract class AbstractAlertDefinitionsView extends
TableSection {
AlertDefinition alertDef = getAlertDefinitionDataSource().copyValues(record);
SingleAlertDefinitionView singleAlertDefinitionView = new
SingleAlertDefinitionView(this
- .extendLocatorId(alertDef.getName()), getResourceType(), alertDef);
+ .extendLocatorId(alertDef.getName()), this, alertDef);
return singleAlertDefinitionView;
}
@Override
public SingleAlertDefinitionView getDetailsView(int id) {
final SingleAlertDefinitionView singleAlertDefinitionView = new
SingleAlertDefinitionView(this
- .extendLocatorId("singleAlertDefinitionView"), getResourceType());
+ .extendLocatorId("singleAlertDefinitionView"), this);
if (id == 0) {
// create an empty one with all defaults
@@ -176,4 +176,6 @@ public abstract class AbstractAlertDefinitionsView extends
TableSection {
protected abstract void enableButtonPressed(ListGridRecord[] selection);
protected abstract void disableButtonPressed(ListGridRecord[] selection);
+
+ protected abstract void commitAlertDefinition(AlertDefinition alertDefinition);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
index ec67b08..0c7cdff 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/GroupAlertDefinitionsView.java
@@ -27,6 +27,7 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.resource.ResourceType;
import org.rhq.core.domain.resource.group.ResourceGroup;
@@ -106,4 +107,11 @@ public class GroupAlertDefinitionsView extends
AbstractAlertDefinitionsView {
}
SC.say(str);
}
+
+ @Override
+ protected void commitAlertDefinition(AlertDefinition alertDefinition) {
+ // TODO call into server SLSB to store alert def
+ // GroupAlertDefinitionManagerLocal groupAlertDefinitionManager =
LookupUtil.getGroupAlertDefinitionManager();
+ // groupAlertDefinitionManager.updateGroupAlertDefinitions(subject, alertDef,
true);
+ }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
index 83a8629..da46f44 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/ResourceAlertDefinitionsView.java
@@ -27,6 +27,7 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
@@ -101,4 +102,12 @@ public class ResourceAlertDefinitionsView extends
AbstractAlertDefinitionsView {
}
SC.say(str);
}
+
+ @Override
+ protected void commitAlertDefinition(AlertDefinition alertDefinition) {
+ System.out.println("=======================================>" +
alertDefinition);
+ // TODO call into server SLSB to store alert def
+ // AlertDefinitionManagerLocal alertDefinitionManager =
LookupUtil.getAlertDefinitionManager();
+ // alertDefinitionManager.updateAlertDefinition(subject, alertDef.getId(),
alertDef, true);
+ }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
index 7cf6356..bc7a8b0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
@@ -30,8 +30,6 @@ import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.tab.Tab;
import org.rhq.core.domain.alert.AlertDefinition;
-import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableButton;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
@@ -54,11 +52,12 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
private Button saveButton;
private Button cancelButton;
- public SingleAlertDefinitionView(String locatorId, ResourceType resourceType) {
- this(locatorId, resourceType, null);
+ public SingleAlertDefinitionView(String locatorId, AbstractAlertDefinitionsView
alertDefView) {
+ this(locatorId, alertDefView, null);
}
- public SingleAlertDefinitionView(String locatorId, ResourceType resourceType,
AlertDefinition alertDefinition) {
+ public SingleAlertDefinitionView(String locatorId, final AbstractAlertDefinitionsView
alertDefView,
+ AlertDefinition alertDefinition) {
super(locatorId);
this.alertDefinition = alertDefinition;
@@ -71,7 +70,8 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
generalPropertiesTab.setPane(generalProperties);
Tab conditionsTab = new
LocatableTab(tabSet.extendLocatorId("Conditions"), "Conditions");
- conditions = new ConditionsAlertDefinitionForm(this.getLocatorId(), resourceType,
alertDefinition);
+ conditions = new ConditionsAlertDefinitionForm(this.getLocatorId(),
alertDefView.getResourceType(),
+ alertDefinition);
conditionsTab.setPane(conditions);
Tab notificationsTab = new
LocatableTab(tabSet.extendLocatorId("Notifications"),
"Notifications");
@@ -117,8 +117,9 @@ public class SingleAlertDefinitionView extends LocatableVLayout {
setAlertDefinition(getAlertDefinition()); // loads data into static
fields
makeViewOnly();
- // TODO getAlertDefinition() should now have the new user data - commit
it to DB
- CoreGUI.refresh();
+ alertDefView.commitAlertDefinition(getAlertDefinition());
+
+ alertDefView.refresh();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
index d5a5e14..3ef3dfe 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/TemplateAlertDefinitionsView.java
@@ -27,6 +27,7 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+import org.rhq.core.domain.alert.AlertDefinition;
import org.rhq.core.domain.resource.ResourceType;
/**
@@ -105,4 +106,11 @@ public class TemplateAlertDefinitionsView extends
AbstractAlertDefinitionsView {
}
SC.say(str);
}
+
+ @Override
+ protected void commitAlertDefinition(AlertDefinition alertDefinition) {
+ // TODO call into server SLSB to store alert def
+ // AlertTemplateManagerLocal alertTemplateManager =
LookupUtil.getAlertTemplateManager();
+ // alertTemplateManager.updateAlertTemplate(subject, alertDef, true);
+ }
}