modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
| 13 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
| 87 +++-------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
| 9 -
3 files changed, 35 insertions(+), 74 deletions(-)
New commits:
commit 29ab38ed60b29c7d3ce0e01fa9d778b8c8bb161b
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Mon Nov 29 09:47:56 2010 -0500
remove some obsolete code from AbstractSelector
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
index 8f9a192..3cc5e4b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleLdapGroupSelector.java
@@ -56,6 +56,7 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableDynamicForm;
* @author Simeon Pinder
*/
public class RoleLdapGroupSelector extends
AbstractSelector<PageList<LdapGroup>> {
+
public static final String id = "id";
public static final String name = "name";
public static final String description = "description";
@@ -124,7 +125,7 @@ public class RoleLdapGroupSelector extends
AbstractSelector<PageList<LdapGroup>>
if (loaded != null) {
ArrayList<Integer> located =
new ArrayList<Integer>();
for (LdapGroup group :
currentlyAssignedLdapGroups) {
- int index =
loaded.findIndex(name, (String) group.getName());
+ int index =
loaded.findIndex(name, group.getName());
if (index > -1) {
group.setId(index);//overwrite RHQ Resource ID to match ldap fabricated id.
located.add(Integer.valueOf(index));
@@ -137,11 +138,8 @@ public class RoleLdapGroupSelector extends
AbstractSelector<PageList<LdapGroup>>
}
availableGrid.selectRecords(records);
//now simulate button push
-
assignedGrid.transferSelectedData(availableGrid);
initialLdapSelectionsLoad = false;
- select(assignedGrid.getSelection());
- updateButtonEnablement();
- assignedGrid.deselectAllRecords();
+ addSelectedRows();
}
}
}
@@ -386,9 +384,7 @@ public class RoleLdapGroupSelector extends
AbstractSelector<PageList<LdapGroup>>
}
getAssignedGrid().selectRecords(records);
//now simulate button push
- assignedGrid.transferSelectedData(availableGrid);
- select(assignedGrid.getSelection());
- updateButtonEnablement();
+ addSelectedRows();
//entry count
if (null != currentlyAssignedLdapGroups) {
@@ -435,4 +431,5 @@ public class RoleLdapGroupSelector extends
AbstractSelector<PageList<LdapGroup>>
public int getCurrentRoleId() {
return currentRoleId;
}
+
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
index daae8b2..9bf6088 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
@@ -48,6 +48,7 @@ import com.smartgwt.client.widgets.events.KeyPressHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.ItemChangedEvent;
import com.smartgwt.client.widgets.form.events.ItemChangedHandler;
+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.DataArrivedEvent;
@@ -71,10 +72,8 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Ian Springer
*/
public abstract class AbstractSelector<T> extends LocatableVLayout {
- private static String SELECTOR_KEY = "id";
- protected Set<Integer> selection = new HashSet<Integer>();
- protected Set<String> selectionAlternateIds = new HashSet<String>();
+ private static String SELECTOR_KEY = "id";
Set<AssignedItemsChangedHandler> assignedItemsChangedHandlers = new
HashSet<AssignedItemsChangedHandler>();
@@ -157,10 +156,6 @@ public abstract class AbstractSelector<T> extends
LocatableVLayout {
return ids;
}
- public Set<String> getSelectionAlternateIds() {
- return selectionAlternateIds;
- }
-
protected abstract DynamicForm getAvailableFilterForm();
protected abstract RPCDataSource<T> getDataSource();
@@ -296,10 +291,15 @@ public abstract class AbstractSelector<T> extends
LocatableVLayout {
public void execute(DSResponse response, Object rawData, DSRequest request)
{
availableRecords = new ArrayList<Record>();
Record[] allRecords = response.getData();
- if (selection != null) {
+ if (initialSelection != null) {
+ Set<Integer> selectedRecordIds = new
HashSet<Integer>(initialSelection.length);
+ for (Record record : initialSelection) {
+ Integer id = record.getAttributeAsInt(getSelectorKey());
+ selectedRecordIds.add(id);
+ }
for (Record record : allRecords) {
- int id = record.getAttributeAsInt("id");
- if (!selection.contains(id)) {
+ int id = record.getAttributeAsInt(getSelectorKey());
+ if (!selectedRecordIds.contains(id)) {
availableRecords.add(record);
}
}
@@ -392,13 +392,6 @@ public abstract class AbstractSelector<T> extends
LocatableVLayout {
// Load data.
if (initialSelection != null) {
assignedGrid.setData(initialSelection);
- for (ListGridRecord record : initialSelection) {
- if (getSelectorKey().equalsIgnoreCase("id")) {
- selection.add(record.getAttributeAsInt(getSelectorKey()));
- } else {
-
selectionAlternateIds.add(record.getAttributeAsString(getSelectorKey()));
- }
- }
}
if (!this.isReadOnly) {
@@ -440,7 +433,8 @@ public abstract class AbstractSelector<T> extends
LocatableVLayout {
}
public void reset() {
- select(initialSelection);
+ this.assignedGrid.setData(this.initialSelection);
+ populateAvailableGrid(getLatestCriteria(getAvailableFilterForm()));
}
public HandlerRegistration addAssignedItemsChangedHandler(final
AssignedItemsChangedHandler handler) {
@@ -453,22 +447,29 @@ public abstract class AbstractSelector<T> extends
LocatableVLayout {
};
}
- private void removeSelectedRows() {
- availableGrid.transferSelectedData(assignedGrid);
- deselect(assignedGrid.getSelection());
- assignedGrid.removeSelectedData();
+ /**
+ * Moves the rows selected in the assigned grid to the available grid.
+ */
+ public void removeSelectedRows() {
+ moveSelectedData(this.assignedGrid, this.availableGrid);
notifyAssignedItemsChangedHandlers();
updateButtonEnablement();
}
- private void addSelectedRows() {
- assignedGrid.transferSelectedData(availableGrid);
- select(assignedGrid.getSelection());
- availableGrid.removeSelectedData();
+ /**
+ * Moves the rows selected in the available grid to the assigned grid.
+ */
+ public void addSelectedRows() {
+ moveSelectedData(this.availableGrid, this.assignedGrid);
notifyAssignedItemsChangedHandlers();
updateButtonEnablement();
}
+ private void moveSelectedData(ListGrid sourceGrid, ListGrid targetGrid) {
+ targetGrid.transferSelectedData(sourceGrid);
+ sourceGrid.removeSelectedData();
+ }
+
protected String getItemName() {
return "name";
}
@@ -512,40 +513,8 @@ public abstract class AbstractSelector<T> extends
LocatableVLayout {
removeAllButton.setDisabled(assignedGrid.getDataAsRecordList().isEmpty());
}
+ @Deprecated
protected void select(ListGridRecord[] records) {
- availableGrid.deselectAllRecords();
- for (ListGridRecord record : records) {
- if (getSelectorKey().equalsIgnoreCase("id")) {
- selection.add(record.getAttributeAsInt(getSelectorKey()));
- } else {
-
selectionAlternateIds.add(record.getAttributeAsString(getSelectorKey()));
- }
- }
- assignedGrid.markForRedraw();
- }
-
- protected void deselect(ListGridRecord[] records) {
- Set<Integer> toRemove = new HashSet<Integer>();
- Set<String> toRemoveStringIds = new HashSet<String>();
- if (getSelectorKey().equalsIgnoreCase("id")) {//integer id based
- for (ListGridRecord record : records) {
- toRemove.add(record.getAttributeAsInt(getSelectorKey()));
- }
- selection.removeAll(toRemove);
-
- for (Integer id : toRemove) {
- Record record =
availableGrid.getDataAsRecordList().find(getSelectorKey(), id);
- if (record != null) {
- ((ListGridRecord) record).setEnabled(true);
- }
- }
- } else {//not using 'id' as selection criteria
- for (ListGridRecord record : records) {
- toRemoveStringIds.add(record.getAttributeAsString(getSelectorKey()));
- }
- selectionAlternateIds.removeAll(toRemoveStringIds);
- }
- availableGrid.markForRedraw();
}
@Deprecated
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
index a81c97f..689fd25 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
@@ -62,7 +62,6 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableLabel;
public class RecentAlertsPortlet extends AlertHistoryView implements
CustomSettingsPortlet {
public static final String KEY = MSG.view_portlet_recentAlerts_title();
- public static final String TITLE = KEY;
//widget keys also used in form population
public static final String ALERT_RANGE_DISPLAY_AMOUNT_VALUE =
"alert-range-display-amount-value";
public static final String ALERT_RANGE_PRIORITY_VALUE =
"alert-range-priority-value";
@@ -512,7 +511,7 @@ public class RecentAlertsPortlet extends AlertHistoryView implements
CustomSetti
PropertySimple prop =
storedPortlet.getConfiguration().getSimple(ALERT_RANGE_RESOURCES_VALUE);
//check to see if "Selected Resources" or "All
Resources"
- if (prop.getStringValue().equals(RESOURCES_SELECTED)) {
+ if (prop != null &&
RESOURCES_SELECTED.equals(prop.getStringValue())) {
//retrieve currentlyAssignedIds
Integer[] valuesToPersist = resourceSelector.getListGridValues();
resourceSelector.setCurrentlyAssignedIds(valuesToPersist);
@@ -631,11 +630,7 @@ class AlertResourceSelectorRegion {
}
}
//simulate 'add' button push.
- selector.addAvailableGridSelectionsToAssignedGrid();
- selector.getAssignedGrid().invalidateCache();
- selector.getAssignedGrid().markForRedraw();
- } else {//no selected resources found
-
selector.getAvailableGrid().setEmptyMessage(MSG.common_msg_noItemsToShow());
+ selector.addSelectedRows();
}
}
});
Show replies by date