Commit 2c93ac8e authored by Malo Toudic's avatar Malo Toudic
Browse files
parent 4cf3e58b
......@@ -74,13 +74,13 @@ public class CallingToolManager {
List<CallingTool> callingToolList = CallingTool.getAllTool();
if (callingToolList != null) {
for (CallingTool callingTool : callingToolList) {
if (callingToolToMerge.getLabel().equals(callingTool.getLabel()) && callingToolToMerge.getId() != callingTool.getId()) {
if (callingToolToMerge.getLabel().equals(callingTool.getLabel()) && callingToolToMerge.getId().equals(callingTool.getId())) {
FacesMessages.instance().add(StatusMessage.Severity.ERROR, "There is already a calling tool with this name");
return;
} else if (callingToolToMerge.getOid().equals(callingTool.getOid()) && callingToolToMerge.getId() != callingTool.getId()) {
} else if (callingToolToMerge.getOid().equals(callingTool.getOid()) && callingToolToMerge.getId().equals(callingTool.getId())) {
FacesMessages.instance().add(StatusMessage.Severity.ERROR, "There is already a calling tool with this OID");
return;
} else if (callingToolToMerge.getUrl().equals(callingTool.getUrl()) && callingToolToMerge.getId() != callingTool.getId()) {
} else if (callingToolToMerge.getUrl().equals(callingTool.getUrl()) && callingToolToMerge.getId().equals(callingTool.getId())) {
FacesMessages.instance().add(StatusMessage.Severity.ERROR, "There is already a calling tool with this URL");
return;
}
......
......@@ -88,7 +88,7 @@ public class KeystoreManager {
List<Keystore> keystoreList = KeystoreDao.getAllKeystores();
if (keystoreList != null) {
for (Keystore callingTool : keystoreList) {
if (keystoreToMerge.getLabel().equals(callingTool.getLabel()) && keystoreToMerge.getId() != callingTool.getId()) {
if (keystoreToMerge.getLabel().equals(callingTool.getLabel()) && keystoreToMerge.getId().equals(callingTool.getId())) {
FacesMessages.instance().add(StatusMessage.Severity.ERROR, "There is already a keystore with this name");
return;
}
......
......@@ -2,13 +2,11 @@
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"
xmlns="http://www.w3.org/1999/xhtml">
<!-- ADT -->
<li>
<h:outputLink value="/gazelle-webservice-tester/administration/callingTools.seam">
<h:outputText value="Manage calling tools"/>
</h:outputLink>
<h:outputLink value="/gazelle-webservice-tester/administration/callingTools.seam">
<h:outputText value="Manage calling tools"/>
</h:outputLink>
<h:outputLink value="/gazelle-webservice-tester/administration/keystore.seam">
<h:outputText value="Manage keystore"/>
</h:outputLink>
</li>
<h:outputLink value="/gazelle-webservice-tester/administration/keystore.seam">
<h:outputText value="Manage keystore"/>
</h:outputLink>
</ui:composition>
\ No newline at end of file
......@@ -2,19 +2,21 @@
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html"
xmlns="http://www.w3.org/1999/xhtml">
<!-- ADT -->
<li>
<h:outputLink value="/gazelle-webservice-tester/project/projectList.seam">
<h:outputText value="Project List"/>
</h:outputLink>
</li>
<li>
<h:outputLink value="/gazelle-webservice-tester/executionList.seam" rendered="#{identity.loggedIn}">
<h:outputText value="Execution List"/>
</h:outputLink>
</li>
<li>
<h:outputLink value="/gazelle-webservice-tester/runInstance.seam" rendered="#{identity.loggedIn}">
<h:outputText value="Run"/>
</h:outputLink>
</li>
<ul>
<li>
<h:outputLink value="/gazelle-webservice-tester/project/projectList.seam">
<h:outputText value="Project List"/>
</h:outputLink>
</li>
<li>
<h:outputLink value="/gazelle-webservice-tester/executionList.seam" rendered="#{identity.loggedIn}">
<h:outputText value="Execution List"/>
</h:outputLink>
</li>
<li>
<h:outputLink value="/gazelle-webservice-tester/runInstance.seam" rendered="#{identity.loggedIn}">
<h:outputText value="Run"/>
</h:outputLink>
</li>
</ul>
</ui:composition>
\ No newline at end of file
......@@ -203,7 +203,7 @@
value="#{testSuite.getTestCasesWithCustomPropertiesToModify()}"
var="testCase">
<s:div>
<b>#{testCase.label}</b>
<strong>#{testCase.label}</strong>
<a4j:repeat value="#{testCase.getCustomPropertiesToModify()}"
var="customProperty">
<ui:decorate
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment