[esb-java-dev] svn commit r32062 - in branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources: org/wso2/carbon/mediator/validate/ui/i18n web/validate-mediator web/validate-mediator/js
rajika at wso2.com
rajika at wso2.com
Fri Mar 13 00:53:14 PDT 2009
Author: rajika
Date: Fri Mar 13 00:52:53 2009
New Revision: 32062
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=32062
Log:
Fixed CARBON-3405
Modified:
branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/org/wso2/carbon/mediator/validate/ui/i18n/JSResources.properties
branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/edit-mediator.jsp
branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/js/mediator-util.js
Modified: branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/org/wso2/carbon/mediator/validate/ui/i18n/JSResources.properties
URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/org/wso2/carbon/mediator/validate/ui/i18n/JSResources.properties?rev=32062&r1=32061&r2=32062&view=diff
==============================================================================
--- branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/org/wso2/carbon/mediator/validate/ui/i18n/JSResources.properties (original)
+++ branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/org/wso2/carbon/mediator/validate/ui/i18n/JSResources.properties Fri Mar 13 00:52:53 2009
@@ -15,4 +15,5 @@
#
mediator.validate.feature.name.empty=Name of a feature of validate mediator cannot be empty
-mediator.validate.schema.key.empty=Schema key value cannot be empty
\ No newline at end of file
+mediator.validate.schema.key.empty=Schema key value cannot be empty
+mediator.validate.delete.confirm=Are you sure, you want to delete this?
\ No newline at end of file
Modified: branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/edit-mediator.jsp
URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/edit-mediator.jsp?rev=32062&r1=32061&r2=32062&view=diff
==============================================================================
--- branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/edit-mediator.jsp (original)
+++ branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/edit-mediator.jsp Fri Mar 13 00:52:53 2009
@@ -37,80 +37,97 @@
%>
<fmt:bundle basename="org.wso2.carbon.mediator.validate.ui.i18n.Resources">
-<carbon:jsi18n
+ <carbon:jsi18n
resourceBundle="org.wso2.carbon.mediator.validate.ui.i18n.JSResources"
request="<%=request%>"
i18nObjectName="validate18n"/>
-<div>
-<script type="text/javascript" src="../validate-mediator/js/mediator-util.js"></script>
-<table class="normal" width="100%">
-<tr>
- <td>
- <h2><fmt:message key="mediator.validate.header"/></h2>
- </td>
-</tr>
-<tr>
- <td>
- <h3 class="mediator"><fmt:message key="mediator.validate.keys"/></h3>
- <table id="keytable" class="normal">
- <tbody id="keytbody">
- <%
- int i = 0;
- if (!keys.isEmpty()) {
- for (String schemaKey : keys) {
- if (schemaKey != null) {
- %>
- <tr id="keyRaw<%=i%>">
- <td>
- <fmt:message key="mediator.validate.key"/> <span class="required">*</span>
- </td>
- <td>
- <input class="longInput" type="text" id="key<%=i%>"
- name="key<%=i%>"
- value="<%=schemaKey%>" disabled="true"/>
- <input type="hidden" id="key<%=i%>_hidden"
- name="key<%=i%>_hidden"
- value="<%=schemaKey%>"/>
- </td>
- <td>
- <a href="#registryBrowserLink"
- class="registry-picker-icon-link"
- style="padding-left:40px"
- onclick="showInLinedRegistryBrowser('key<%=i%>')"><fmt:message
- key="mediator.validate.regkeys"/></a>
- </td>
- </tr>
- <%
- }
- i++;
- }
- } else {
- %>
- <tr id="keyRaw<%=i%>">
- <td>
- <fmt:message key="mediator.validate.key"/><span class="required">*</span>
- </td>
- <td>
- <input class="longInput" type="text" id="key<%=i%>"
- name="key<%=i%>"
- value="" disabled="true"/>
- <input type="hidden" id="key<%=i%>_hidden"
- name="key<%=i%>_hidden"
- value=""/>
- </td>
- <td>
- <a href="#registryBrowserLink"
- class="registry-picker-icon-link"
- style="padding-left:40px"
- onclick="showInLinedRegistryBrowser('key<%=i%>')"><fmt:message
- key="mediator.validate.regkeys"/></a>
- </td>
- </tr>
- <%
- }
- %>
- <input type="hidden" name="keyCount" id="keyCount" value="<%=i%>"/>
- </tbody>
+ <div>
+ <script type="text/javascript" src="../validate-mediator/js/mediator-util.js"></script>
+ <table class="normal" width="100%">
+ <tr>
+ <td>
+ <h2><fmt:message key="mediator.validate.header"/></h2>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <h3 class="mediator"><fmt:message key="mediator.validate.keys"/></h3>
+
+ <div style="margin-top:0px;">
+ <table id="keytable" class="normal">
+ <thead>
+ <tbody id="keytbody">
+ <%
+ int i = 0;
+ if (!keys.isEmpty()) {
+ for (String schemaKey : keys) {
+ if (schemaKey != null) {
+ %>
+ <tr id="keyRaw<%=i%>">
+ <td>
+ <fmt:message key="mediator.validate.key"/> <span class="required">*</span>
+ </td>
+ <td>
+ <input class="longInput" type="text" id="key<%=i%>"
+ name="key<%=i%>"
+ value="<%=schemaKey%>" disabled="true"/>
+ <input type="hidden" id="key<%=i%>_hidden"
+ name="key<%=i%>_hidden"
+ value="<%=schemaKey%>"/>
+ </td>
+ <td>
+ <a href="#registryBrowserLink"
+ class="registry-picker-icon-link"
+ style="padding-left:40px"
+ onclick="showInLinedRegistryBrowser('key<%=i%>')"><fmt:message
+ key="mediator.validate.regkeys"/></a>
+ </td>
+ <td><a href="#" class="delete-icon-link" style="padding-left:40px"
+ onclick="deleteKey(<%=i%>);return false;"><fmt:message
+ key="mediator.validator.delete"/></a>
+ </td>
+ </tr>
+ <%
+ }
+ i++;
+ }
+ } else {
+ %>
+ <tr id="keyRaw<%=i%>">
+ <td>
+ <fmt:message key="mediator.validate.key"/><span class="required">*</span>
+ </td>
+ <td>
+ <input class="longInput" type="text" id="key<%=i%>"
+ name="key<%=i%>"
+ value="" disabled="true"/>
+ <input type="hidden" id="key<%=i%>_hidden"
+ name="key<%=i%>_hidden"
+ value=""/>
+ </td>
+ <td>
+ <a href="#registryBrowserLink"
+ class="registry-picker-icon-link"
+ style="padding-left:40px"
+ onclick="showInLinedRegistryBrowser('key<%=i%>')"><fmt:message
+ key="mediator.validate.regkeys"/></a>
+ </td>
+ <td><a href="#" class="delete-icon-link" style="padding-left:40px"
+ onclick="deleteKey(<%=i%>);return false;"><fmt:message
+ key="mediator.validator.delete"/></a>
+ </td>
+ </tr>
+ <%
+ }
+ %>
+ <input type="hidden" name="keyCount" id="keyCount" value="<%=i%>"/>
+ </tbody>
+ </thead>
+ </table>
+ </div>
+ </td>
+ </tr>
+
<tr>
<td>
<div style="margin-top:0px;">
@@ -122,83 +139,93 @@
</div>
</td>
</tr>
+
+
<tr>
<td>
- <fmt:message key="mediator.validate.source"/>
+ <table class="normal">
+ <thead>
+ <tbody>
+ <tr>
+ <td>
+ <fmt:message key="mediator.validate.source"/>
+ </td>
+ <td>
+ <input class="longInput" type="text" id="mediator.validate.source"
+ name="mediator.validate.source"
+ value="<%=source%>"/>
+ </td>
+ <td>
+ <a href="#nsEditorLink" class="nseditor-icon-link"
+ style="padding-left:40px"
+ onclick="showNameSpaceEditor('mediator.validate.source')"><fmt:message
+ key="mediator.validate.namespace"/></a>
+ </td>
+ </tr>
+ </tbody>
+ </thead>
+ </table>
</td>
+ </tr>
+
+ <tr>
<td>
- <input class="longInput" type="text" id="mediator.validate.source"
- name="mediator.validate.source"
- value="<%=source%>"/>
+ <h3 class="mediator"><fmt:message key="mediator.validator.features"/></h3>
+
+ <div style="margin-top:0px;">
+ <table id="featuretable" style="<%=featureTableStyle%>;" class="styledInner">
+ <thead>
+ <tr>
+ <th width="15%"><fmt:message key="mediator.validator.feature.name"/></th>
+ <th><fmt:message key="mediator.validator.action"/></th>
+ </tr>
+ <tbody id="featuretbody">
+ <%
+ int l = 0;
+ for (MediatorProperty property : featureList) {
+ if (property != null) {
+ %>
+ <tr id="featureRaw<%=l%>">
+ <td><input type="text" name="featureName<%=l%>" id="featureName<%=l%>"
+ value="<%=property.getName()%>"/>
+ </td>
+ <td><a href="#" href="#" class="delete-icon-link" style="padding-left:40px"
+ onclick="deletefeature('<%=l%>');return false;"><fmt:message
+ key="mediator.validator.delete"/></a>
+ </td>
+ </tr>
+ <%
+ }
+ l++;
+ }
+ %>
+ <input type="hidden" name="featureCount" id="featureCount" value="<%=l%>"/>
+ </tbody>
+ </thead>
+ </table>
+ </div>
</td>
+ </tr>
+ <tr>
<td>
- <a href="#nsEditorLink" class="nseditor-icon-link"
- style="padding-left:40px"
- onclick="showNameSpaceEditor('mediator.validate.source')"><fmt:message
- key="mediator.validate.namespace"/></a>
+ <div style="margin-top:0px;">
+ <a name="addFeatureLink"></a>
+ <a class="add-icon-link"
+ href="#addFeatureLink"
+ onclick="addfeature('<fmt:message key="mediator.validator.emptyerror"/>')">
+ <fmt:message key="mediator.validator.addfeature"/></a>
+ </div>
</td>
</tr>
</table>
- </td>
-</tr>
-<tr>
- <td>
- <h3 class="mediator"><fmt:message key="mediator.validator.features"/></h3>
-
- <div style="margin-top:0px;">
- <table id="featuretable" style="<%=featureTableStyle%>;" class="styledInner">
- <thead>
- <tr>
- <th width="15%"><fmt:message key="mediator.validator.feature.name"/></th>
- <th><fmt:message key="mediator.validator.action"/></th>
- </tr>
- <tbody id="featuretbody">
- <%
- int l = 0;
- for (MediatorProperty property : featureList) {
- if (property != null) {
- %>
- <tr id="featureRaw<%=l%>">
- <td><input type="text" name="featureName<%=l%>" id="featureName<%=l%>"
- value="<%=property.getName()%>"/>
- </td>
- <td><a href="#" href="#" class="delete-icon-link" style="padding-left:40px"
- onclick="deletefeature('<%=l%>');return false;"><fmt:message
- key="mediator.validator.delete"/></a>
- </td>
- </tr>
- <%
- }
- l++;
- }
- %>
- <input type="hidden" name="featureCount" id="featureCount" value="<%=l%>"/>
- </tbody>
- </thead>
- </table>
- </div>
- </td>
-</tr>
-<tr>
- <td>
- <div style="margin-top:0px;">
- <a name="addFeatureLink"></a>
- <a class="add-icon-link"
- href="#addFeatureLink"
- onclick="addfeature('<fmt:message key="mediator.validator.emptyerror"/>')">
- <fmt:message key="mediator.validator.addfeature"/></a>
- </div>
- </td>
-</tr>
-</table>
-<a name="nsEditorLink"></a>
+ <a name="nsEditorLink"></a>
-<div id="nsEditor" style="display:none;"></div>
+ <div id="nsEditor" style="display:none;"></div>
-<a name="registryBrowserLink"></a>
+ <a name="registryBrowserLink"></a>
-<div id="registryBrowser" style="display:none;"></div>
+ <div id="registryBrowser" style="display:none;"></div>
-</div>
+ </div>
</fmt:bundle>
\ No newline at end of file
Modified: branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/js/mediator-util.js
URL: http://wso2.org/svn/browse/wso2/branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/js/mediator-util.js?rev=32062&r1=32061&r2=32062&view=diff
==============================================================================
--- branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/js/mediator-util.js (original)
+++ branches/esb/java/2.0.1/carbon-components/mediators/validate/org.wso2.carbon.mediator.validate.ui/src/main/resources/web/validate-mediator/js/mediator-util.js Fri Mar 13 00:52:53 2009
@@ -43,9 +43,13 @@
var registryID = document.createElement("td");
registryID.innerHTML = "<a href='#registryBrowserLink' class='registry-picker-icon-link' style='padding-left:40px' onclick=\"showInLinedRegistryBrowser('key" + currentCount + "')\">Registry Keys</a>";
+ var deleteID = document.createElement("td");
+ deleteID.innerHTML = "<a href='#' class='delete-icon-link' style='padding-left:40px' onclick='deleteKey(" + currentCount + ");return false;'>Delete</a>";
+
keyRaw.appendChild(keyTD);
keyRaw.appendChild(inputTD);
keyRaw.appendChild(registryID);
+ keyRaw.appendChild(deleteID);
keytbody.appendChild(keyRaw);
return true;
@@ -56,8 +60,9 @@
var nsCount = document.getElementById("keyCount");
var i = nsCount.value;
var currentCount = parseInt(i);
- if (currentCount >= 0) {
- for (var k = 0; k <= currentCount; k++) {
+ currentCount = currentCount + 1;
+ if (currentCount > 0) {
+ for (var k = 0; k < currentCount; k++) {
var prefix = document.getElementById("key" + k);
if (prefix != null && prefix != undefined) {
if (prefix.value == "") {
@@ -70,6 +75,24 @@
return true;
}
+function isValidFeatures(nameemptymsg) {
+ var nsCount = document.getElementById("featureCount");
+ var i = nsCount.value;
+ var currentCount = parseInt(i);
+ if (currentCount >= 1) {
+ for (var k = 0; k < currentCount; k++) {
+ var prefix = document.getElementById("featureName" + k);
+ if (prefix != null && prefix != undefined) {
+ if (prefix.value == "") {
+ CARBON.showWarningDialog(nameemptymsg)
+ return false;
+ }
+ }
+ }
+ }
+ return true;
+}
+
function addfeature(nameempty) {
if (!isValidFeatures(nameempty)) {
return false;
@@ -114,28 +137,8 @@
return input;
}
-function isValidFeatures(nameemptymsg) {
-
- var nsCount = document.getElementById("featureCount");
- var i = nsCount.value;
-
- var currentCount = parseInt(i);
-
- if (currentCount >= 1) {
- for (var k = 0; k < currentCount; k++) {
- var prefix = document.getElementById("featureName" + k);
- if (prefix != null && prefix != undefined) {
- if (prefix.value == "") {
- CARBON.showWarningDialog(nameemptymsg)
- return false;
- }
- }
- }
- }
- return true;
-}
-
function deletefeature(i) {
+ CARBON.showConfirmationDialog(validate18n["mediator.validate.delete.confirm"],function(){
var featureRow = document.getElementById("featureRaw" + i);
if (featureRow != undefined && featureRow != null) {
var parentTBody = featureRow.parentNode;
@@ -147,6 +150,23 @@
}
}
}
+ });
+}
+
+function deleteKey(i) {
+ CARBON.showConfirmationDialog(validate18n["mediator.validate.delete.confirm"],function(){
+ var propRow = document.getElementById("keyRaw" + i);
+ if (propRow != undefined && propRow != null) {
+ var parentTBody = propRow.parentNode;
+ if (parentTBody != undefined && parentTBody != null) {
+ parentTBody.removeChild(propRow);
+ if (!isContainRaw(parentTBody)) {
+ var propertyTable = document.getElementById("keytable");
+ propertyTable.style.display = "none";
+ }
+ }
+ }
+ });
}
function isContainRaw(tbody) {
@@ -168,7 +188,7 @@
function validateMediatorValidate() {
var nameemptymsg = validate18n["mediator.validate.feature.name.empty"];
var keyemptymsg = validate18n["mediator.validate.schema.key.empty"];
-
+
var nsCount = document.getElementById("keyCount");
var i = nsCount.value;
currentCount = parseInt(i);
@@ -199,4 +219,5 @@
}
}
return true;
-}
\ No newline at end of file
+}
+
More information about the Esb-java-dev
mailing list