# HG changeset patch
# User casties
# Date 1478868543 -3600
# Node ID c03527c428f5285a419dcbfe2f1e642a07b0b0dd
# Parent  99f9a55a495778a54a5030406b03acf1c1b514b7
fix for EL warnings in importMerge template.

diff -r 99f9a55a4957 -r c03527c428f5 src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java
--- a/src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java	Mon Nov 07 19:59:49 2016 +0100
+++ b/src/main/java/de/mpiwg/itgroup/ismi/merge/ImportMerge.java	Fri Nov 11 13:49:03 2016 +0100
@@ -830,6 +830,20 @@
     }
 
     /**
+     * @return the importNodeList
+     */
+    public List<Node> getImportNodeList() {
+        return importNodeList;
+    }
+
+    /**
+     * @param importNodeList the importNodeList to set
+     */
+    public void setImportNodeList(List<Node> importNodeList) {
+        this.importNodeList = importNodeList;
+    }
+
+    /**
      * @return the importNodeListLength
      */
     public int getImportNodeListLength() {
diff -r 99f9a55a4957 -r c03527c428f5 src/main/webapp/merge/importMerge.xhtml
--- a/src/main/webapp/merge/importMerge.xhtml	Mon Nov 07 19:59:49 2016 +0100
+++ b/src/main/webapp/merge/importMerge.xhtml	Fri Nov 11 13:49:03 2016 +0100
@@ -42,7 +42,7 @@
 
 				<h:panelGrid columns="2" styleClass="createPanel"
 					columnClasses="createPanelFirstColumn" id="loadingPanel" 
-					rendered="#{Session.importMerge.getImportNodeListLength() > 0}">
+					rendered="#{!empty Session.importMerge.importNodeList}">
 
 					<h:outputText value="Import Nodes" />
 
@@ -83,16 +83,16 @@
 						rendered="#{Session.importMerge.entitiesLoaded}">
 
                         <h:outputText value="ID" />
-                        <h:outputText value="#{Session.importMerge.firstEntity.getId()}" />
-                        <h:outputText value="#{Session.importMerge.secondEntity.getId()}" />
+                        <h:outputText value="#{Session.importMerge.firstEntity.id}" />
+                        <h:outputText value="#{Session.importMerge.secondEntity.id}" />
 
                         <h:outputText value="Class" />
-                        <h:outputText value="#{Session.importMerge.firstEntity.getObjectClass()}" />
-                        <h:outputText value="#{Session.importMerge.secondEntity.getObjectClass()}" />
+                        <h:outputText value="#{Session.importMerge.firstEntity.objectClass}" />
+                        <h:outputText value="#{Session.importMerge.secondEntity.objectClass}" />
                         
                         <h:outputText value="Own Value" />
-                        <h:outputText value="#{Session.importMerge.firstEntity.getOwnValue()}" />
-                        <h:outputText value="#{Session.importMerge.secondEntity.getOwnValue()}" />
+                        <h:outputText value="#{Session.importMerge.firstEntity.ownValue}" />
+                        <h:outputText value="#{Session.importMerge.secondEntity.ownValue}" />
 
                     </h:panelGrid>
 
@@ -309,10 +309,10 @@
 						rendered="#{Session.importMerge.entResult != null}">
 
                         <h:outputText value="ID"/>
-                        <h:outputText value="#{Session.importMerge.entResult.getId()}" styleClass="textBack"/>
+                        <h:outputText value="#{Session.importMerge.entResult.id}" styleClass="textBack"/>
 
                         <h:outputText value="Class"/>
-                        <h:outputText value="#{Session.importMerge.entResult.getObjectClass()}" styleClass="textBack"/>
+                        <h:outputText value="#{Session.importMerge.entResult.objectClass}" styleClass="textBack"/>
 
 						<h:outputText value="Attributes" />
 						<rich:dataTable