Skip to content

Commit

Permalink
reinstate the old method signatures for getSelectedRow and getSelecte…
Browse files Browse the repository at this point in the history 
…dRows to match BBj API
  • Loading branch information
Stephan Wald committed Feb 18, 2018
1 parent 6409352 commit 4be6774
Show file tree
Hide file tree
Showing 18 changed files with 160 additions and 92 deletions.
44 changes: 36 additions & 8 deletions BBjGridExWidget.bbj
View file
Expand Up @@ -146,7 +146,7 @@ class public BBjGridExWidget extends BBjWidget

field private DataRow ColumnDefinition!

field private HashMap SelectedRows! = new HashMap()
field private HashMap SelectedRowsMap! = new HashMap()

rem --------------------- constructors -------------------------------------
rem /**
Expand Down Expand Up @@ -408,10 +408,10 @@ class public BBjGridExWidget extends BBjWidget

if row!.getIsSelected() = 1 then
selected!.add(row!)
#SelectedRows!.put(row!.getId(),row!)
#SelectedRowsMap!.put(row!.getId(),row!)
else
deselected!.add(row!)
#SelectedRows!.remove(row!.getId())
#SelectedRowsMap!.remove(row!.getId())
fi
wend

Expand Down Expand Up @@ -996,23 +996,51 @@ rem --------------------api methods--------------------------------
rem /**
rem * @return Hashmap with the selected row indexes and items
rem */
method public BBjVector getSelectedRows()
methodret #SelectedRows!
method public BBjVector getSelectedRowsInfo()
methodret #SelectedRowsMap!
methodend

rem /**
rem * @return the selected row
rem */
method public BBjGridExWidgetRow getSelectedRow()
method public BBjGridExWidgetRow getSelectedRowInfo()

if #SelectedRows!.size() > 0 then
it! = #SelectedRows!.entrySet().iterator()
if #SelectedRowsMap!.size() > 0 then
it! = #SelectedRowsMap!.entrySet().iterator()
methodret it!.next().getValue()
fi

methodret null()
methodend

rem /**
rem * @return BBjVector with the selected row indexes and items
rem */
method public BBjVector getSelectedRows()
declare BBjVector ids!
ids! = new BBjVector()

it! = #SelectedRowsMap!.entrySet().iterator()
while it!.hasNext()
ids!.addItem(it!.next().getValue().getId())
wend
methodret ids!

methodend

rem /**
rem * @return the selected row
rem */
method public BBjNumber getSelectedRow()

if #SelectedRowsMap!.size() > 0 then
it! = #SelectedRowsMap!.entrySet().iterator()
methodret num(it!.next().getValue().getId())
fi

methodret -1
methodend

method public void setTheme(BBjString theme$)
if pos(theme$="dark#fresh#blue#bootstrap#material")>0 then
if info(3,6)="5" then
Expand Down
10 changes: 6 additions & 4 deletions Demo/SelectionDemo.bbj
View file
Expand Up @@ -61,10 +61,12 @@ onRowSelect:
ev! = BBjAPI().getLastEvent()
ev! = ev!.getObject()
print 'SHOW', ev!.getRowCount(), " ROW(s) AFFECTED By Event:" , ev!.getRows()
print 'SHOW', ev!.getSelectedRowCount()," ROW(S) SELECTED By Event: ",ev!.getSelectedIds()
print 'SHOW', ev!.getDeselectedRowCount()," ROW(S) DESELECTED By Event: ",ev!.getDeselectedIds()
print 'SHOW', grid!.getSelectedRows().size()," ROW(S) SELECTED SO FAR : ", grid!.getSelectedRows()
print 'SHOW', "------------------------------------------------------------------------"
print ev!.getSelectedRowCount()," ROW(S) SELECTED By Event: ",ev!.getSelectedIds()
print ev!.getDeselectedRowCount()," ROW(S) DESELECTED By Event: ",ev!.getDeselectedIds()
print 'BR',grid!.getSelectedRows().size()," GET SELECTED ROWS : ", grid!.getSelectedRows(),'ER'
print 'BR',grid!.getSelectedRows().size()," GET SELECTED ROW : ", grid!.getSelectedRow(),'ER'

print "------------------------------------------------------------------------"
return

onRowDoubleclick:
Expand Down
136 changes: 85 additions & 51 deletions docs/javadoc/BBjGridExWidget.html
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/javadoc/BBjGridExWidgetColumnState.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>BBjGridExWidgetColumnState</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/BBjGridExWidgetDoubleClickRowEvent.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>BBjGridExWidgetDoubleClickRowEvent</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/BBjGridExWidgetRow.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>BBjGridExWidgetRow</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/BBjGridExWidgetSelectRowEvent.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>BBjGridExWidgetSelectRowEvent</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/allclasses-frame.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>All Classes</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/allclasses-noframe.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>All Classes</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/constant-values.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>Constant Field Values</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/deprecated-list.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>Deprecated List</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/help-doc.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>API Help</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
8 changes: 6 additions & 2 deletions docs/javadoc/index-all.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>Index</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down Expand Up @@ -196,8 +196,12 @@ <h2 class="title">G</h2>
<dd>
<div class="block">Get the number of selected rows by the last event</div>
</dd>
<dt><span class="memberNameLink"><a href="BBjGridExWidget.html#getSelectedRowInfo--">getSelectedRowInfo()</a></span> - Method in class <a href="BBjGridExWidget.html" title="class in &lt;Unnamed&gt;">BBjGridExWidget</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="BBjGridExWidget.html#getSelectedRows--">getSelectedRows()</a></span> - Method in class <a href="BBjGridExWidget.html" title="class in &lt;Unnamed&gt;">BBjGridExWidget</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="BBjGridExWidget.html#getSelectedRowsInfo--">getSelectedRowsInfo()</a></span> - Method in class <a href="BBjGridExWidget.html" title="class in &lt;Unnamed&gt;">BBjGridExWidget</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="BBjGridExWidget.html#getThemes--">getThemes()</a></span> - Method in class <a href="BBjGridExWidget.html" title="class in &lt;Unnamed&gt;">BBjGridExWidget</a></dt>
<dd>&nbsp;</dd>
<dt><span class="memberNameLink"><a href="BBjGridExWidget.html#GRID_ALIGN_CENTER--">GRID_ALIGN_CENTER()</a></span> - Static method in class <a href="BBjGridExWidget.html" title="class in &lt;Unnamed&gt;">BBjGridExWidget</a></dt>
Expand Down
2 changes: 1 addition & 1 deletion docs/javadoc/index.html
View file
Expand Up @@ -2,7 +2,7 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>Generated Documentation (Untitled)</title>
<script type="text/javascript">
tmpTargetPage = "" + window.location.search;
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/overview-tree.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>Class Hierarchy</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/package-frame.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title>&lt;Unnamed&gt;</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/package-summary.html
View file
Expand Up @@ -2,8 +2,8 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<meta name="date" content="2018-02-16">
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/javadoc/package-tree.html
View file
Expand Up @@ -2,9 +2,9 @@
<!-- NewPage -->
<html lang="de">
<head>
<!-- Generated by javadoc (1.8.0_144) on Fri Feb 16 19:10:21 CET 2018 -->
<!-- Generated by javadoc (1.8.0_144) on Sun Feb 18 12:05:26 CET 2018 -->
<title> Class Hierarchy</title>
<meta name="date" content="2018-02-16">
<meta name="date" content="2018-02-18">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<script type="text/javascript" src="script.js"></script>
</head>
Expand Down

0 comments on commit 4be6774

Please sign in to comment.