Mercurial > hg > ismi-richfaces

diff src/main/webapp/merge/importMerge.xhtml @ 108:c03527c428f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for EL warnings in importMerge template.
author casties
date Fri, 11 Nov 2016 13:49:03 +0100
parents 16cbff5deb09
children 3c585df9f874
line wrap: on
line diff
--- 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