# HG changeset patch
# User casties
# Date 1491320631 -7200
# Node ID 3c585df9f87459bb486979c936855ae5ced47eff
# Parent  502ae5b1a07ddf3736e5f1b66963642e91e87668
improved merge import dialog. now with prev+next buttons.

diff -r 502ae5b1a07d -r 3c585df9f874 src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java
--- 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 {
diff -r 502ae5b1a07d -r 3c585df9f874 src/main/webapp/merge/importMerge.xhtml
--- 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>