xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1431 - Fix Dual List filter problem." into development

Browse source 
Former-commit-id: bed085536e [formerly e329929bd2] [formerly bed085536e [formerly e329929bd2] [formerly 9ab999ed33 [formerly d0bcfbc3ce548ef84dff78ba50de8b44627bf8a8]]]
Former-commit-id: 9ab999ed33
Former-commit-id: 1cb120525b [formerly 13fac27c76]
Former-commit-id: 1f5f1c5950
This commit is contained in:
Richard Peter 2013-01-07 13:15:32 -06:00 • committed by Gerrit Code Review
commit 7ef0bc956c
2 changed files with 100 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualList.java
View file

@ -42,11 +42,11 @@ import com.raytheon.viz.ui.widgets.duallist.ButtonImages.ButtonImage;
/**
* SWT Dual List Widget.
*
*
* <pre>
*
*
* SOFTWARE HISTORY
*
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 13, 2012 mpduff Initial creation
@ -54,9 +54,10 @@ import com.raytheon.viz.ui.widgets.duallist.ButtonImages.ButtonImage;
* Aug 08, 2012 863 jpiatt Added checks for selection changes.
* Aug 10, 2012 1002 mpduff Fixed sorting of numeric data on move left.
* Sep 07, 2012 684 mpduff Deselect selection prior to selecting new items.
*
* Dec 17, 2012 1431 mpduff Fix filter problem when deselecting items.
*
* </pre>
*
*
* @author mpduff
* @version 1.0
*/
@ -145,7 +146,7 @@ public class DualList extends Composite {
/**
* Constructor
*
*
* @param parent
* Parent container
* @param style
@ -159,7 +160,7 @@ public class DualList extends Composite {
/**
* Constructor
*
*
* @param parent
* Parent container
* @param style
@ -168,7 +169,7 @@ public class DualList extends Composite {
* Data/Configuration object
* @param cb
* Update Callback
*
*
*/
public DualList(Composite parent, int style, DualListConfig config,
IUpdate cb) {
@ -438,7 +439,7 @@ public class DualList extends Composite {
/**
* Set FullList.
*
*
* @param fullList
* all users listed in notification table
*/
@ -685,7 +686,7 @@ public class DualList extends Composite {
/**
* Reload the availableList data preserving the original order of the list.
*/
private void reloadAvailableList() {
public void reloadAvailableList() {
String[] selectedStrings = availableList.getSelection();
ArrayList<String> availableListNew = new ArrayList<String>();
@ -729,20 +730,34 @@ public class DualList extends Composite {
}
} else {
if (moveAllLeft) {
availableList.removeAll();
// Add all matching search field text to available list
for (String s : config.getFullList()) {
if (s.contains(search)) {
availableList.add(s);
if (!config.isCaseFlag()) {
if (s.toLowerCase().contains(search.toLowerCase())) {
if (!config.isExcludeFlag()) {
availableList.add(s);
}
} else {
if (config.isExcludeFlag()) {
availableList.add(s);
}
}
} else {
if (s.contains(search)) {
if (!config.isExcludeFlag()) {
availableList.add(s);
}
} else {
if (config.isExcludeFlag()) {
availableList.add(s);
}
}
}
}
} else if (moveLeft) {
// Add selected item matching search field text to available
// list
for (String s : selectedList.getSelection()) {
@ -839,7 +854,7 @@ public class DualList extends Composite {
/**
* Clear Available Users list.
*
*
* @param clearSelectionList
*/
public void clearAvailableList(boolean clearSelectionList) {
@ -852,7 +867,7 @@ public class DualList extends Composite {
/**
* Set the Available List items.
*
*
* @param items
* the list items.
*/
@ -862,7 +877,7 @@ public class DualList extends Composite {
/**
* Get the number of items in the list.
*
*
* @return the number of items.
*/
public int getItemCount() {
@ -871,7 +886,7 @@ public class DualList extends Composite {
/**
* Get the Selected List items.
*
*
* @return the items in the selected list.
*/
public String[] getSelectedListItems() {
@ -880,7 +895,7 @@ public class DualList extends Composite {
/**
* Get the selection.
*
*
* @return the selections.
*/
public String[] getSelectedSelection() {
@ -889,7 +904,7 @@ public class DualList extends Composite {
/**
* Get the configuration.
*
*
* @return items in available list.
*/
public String[] getAvailableListItems() {
@ -898,7 +913,7 @@ public class DualList extends Composite {
/**
* Set the Selected List items.
*
*
* @param items
* the list items.
*/
@ -909,7 +924,7 @@ public class DualList extends Composite {
/**
* Selected User items.
*
*
* @param selection
* selected user items
*/
@ -926,7 +941,7 @@ public class DualList extends Composite {
/**
* Get the configuration.
*
*
* @return the configuration.
*/
public DualListConfig getConfig() {
@ -935,7 +950,7 @@ public class DualList extends Composite {
/**
* Set the configuration.
*
*
* @param config
* the configuration.
*/

78
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/widgets/duallist/DualListConfig.java
View file

@ -23,23 +23,23 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
/**
* Config file for DualList class. Reused from Data Delivery.
* Config file for DualList class. Reused from Data Delivery.
*
* <pre>
*
*
* SOFTWARE HISTORY
*
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 31, 2012 mpduff Initial creation.
* Aug 10, 2012 1002 mpduff Added numeric flag for sorting.
*
* Jan 07, 2013 1431 mpduff Add case sensitive and exclude flags.
*
* </pre>
*
*
* @author mpduff
* @version 1.0
* @version 1.0
*/
public class DualListConfig {
@ -78,19 +78,29 @@ public class DualListConfig {
* Full list of available items.
*/
private List<String> fullList = new ArrayList<String>();
/**
* The list to include.
*/
private HashSet<String> includeList = new HashSet<String>();
/**
* The search field.
*/
private String searchField = null;
/**
* Case Sensitive search flag.
*/
private boolean caseFlag = false;
/**
* Exclude search flag.
*/
private boolean excludeFlag = false;
private IMenuData menuData;
/** Flag for numeric data */
private boolean numericData = false;
@ -100,7 +110,7 @@ public class DualListConfig {
public DualListConfig() {
}
/**
* Get the include list.
*
@ -252,12 +262,11 @@ public class DualListConfig {
public void setFullList(List<String> fullList) {
this.fullList = fullList;
}
/**
* Get the search field text.
*
* @return the String
* the search field text.
* @return the String the search field text.
*/
public String getSearchField() {
return searchField;
@ -267,22 +276,23 @@ public class DualListConfig {
* Set the search field text.
*
* @param searchField
* the search field text.
* the search field text.
*/
public void setSearchField(String searchField) {
this.searchField = searchField;
}
public IMenuData getMenuData() {
return menuData;
}
public void setMenuData(IMenuData menuData) {
this.menuData = menuData;
}
/**
* @param numericData the numericData to set
* @param numericData
* the numericData to set
*/
public void setNumericData(boolean numericData) {
this.numericData = numericData;
@ -294,4 +304,34 @@ public class DualListConfig {
public boolean isNumericData() {
return numericData;
}
/**
* @return the caseFlag
*/
public boolean isCaseFlag() {
return caseFlag;
}
/**
* @return the excludeFlag
*/
public boolean isExcludeFlag() {
return excludeFlag;
}
/**
* @param caseFlag
* the caseFlag to set
*/
public void setCaseFlag(boolean caseFlag) {
this.caseFlag = caseFlag;
}
/**
* @param excludeFlag
* the excludeFlag to set
*/
public void setExcludeFlag(boolean excludeFlag) {
this.excludeFlag = excludeFlag;
}
}