Mercurial > hg > ismi-richfaces
changeset 137:3c585df9f874
improved merge import dialog. now with prev+next buttons.
author | casties |
---|---|
date | Tue, 04 Apr 2017 17:43:51 +0200 |
parents | 502ae5b1a07d |
children | 15c26735fff7 |
files | src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java src/main/webapp/merge/importMerge.xhtml |
diffstat | 2 files changed, 24 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java Thu Mar 02 19:48:58 2017 +0100 +++ b/src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java Tue Apr 04 17:43:51 2017 +0200 @@ -272,6 +272,17 @@ loadImportNode(); } + public void skipToPrevNode(ActionEvent event) { + importNodeIdx -= 1; + if (importNodeIdx >= importNodeList.size()) { + importNodeIdx = importNodeList.size() - 1; + } + if (importNodeIdx < 0) { + importNodeIdx = 0; + } + loadImportNode(); + } + public void loadFirstEntity(ActionEvent event) { reset(); try {
--- a/src/main/webapp/merge/importMerge.xhtml Thu Mar 02 19:48:58 2017 +0100 +++ b/src/main/webapp/merge/importMerge.xhtml Tue Apr 04 17:43:51 2017 +0200 @@ -46,13 +46,10 @@ <h:outputText value="Import Nodes" /> - <h:panelGrid columns="3"> + <h:panelGrid columns="2"> <h:outputText value="Node #{Session.importMerge.importNodeIdx + 1} / #{Session.importMerge.importNodeListLength}" styleClass="textBack"/> - <a4j:commandButton value="Skip" - actionListener="#{Session.importMerge.skipCurrentNode}" - render="loadingPanel,mergingPanel" /> <h:column> <h:outputText value="#{Session.importMerge.importNodeAsText}" @@ -60,14 +57,23 @@ styleClass="textBack"/> </h:column> - <h:outputText/> - <a4j:commandButton value="Load" - actionListener="#{Session.importMerge.loadFirstEntity}" + <h:column> + <a4j:commandButton value="Previous" + actionListener="#{Session.importMerge.skipToPrevNode}" render="loadingPanel,mergingPanel" /> + <a4j:commandButton value="Next" + actionListener="#{Session.importMerge.skipCurrentNode}" + render="loadingPanel,mergingPanel" /> + </h:column> + <h:column> <h:outputText value="#{Session.importMerge.importNodeMsg}" rendered="#{! empty Session.importMerge.importNodeMsg}" styleClass="textBack"/> + <a4j:commandButton value="Load" + actionListener="#{Session.importMerge.loadFirstEntity}" + render="loadingPanel,mergingPanel" /> + </h:column> </h:panelGrid> </h:panelGrid>