[Registry-dev] svn commit r17825 - in
trunk/registry/modules/webapps/src/main:
java/org/wso2/registry/web java/org/wso2/registry/web/utils
webapp/admin webapp/admin/ajax webapp/admin/js
chanaka at wso2.com
chanaka at wso2.com
Mon Jun 2 23:55:03 PDT 2008
Author: chanaka
Date: Mon Jun 2 23:55:03 2008
New Revision: 17825
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17825
Log:
patch applied to trunk
------------------------------------------
1 - Associations splited in to 2 sections Dependencies, Associations.
2 - Associations, Dependencies removing functionality introduced to the UI.
Note: Association Tree and Dependency Tree will not function on this stage.
------------------------------------------
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AssociationUtil.java
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/association-list.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java?rev=17825&r1=17824&r2=17825&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/ControllerServlet.java Mon Jun 2 23:55:03 2008
@@ -331,9 +331,9 @@
PropertiesUtil.updateProperty(request, response);
- } else if (command.equals("/addAssociation")) {
+ } else if (command.equals("/addRemoveAssociation")) {
try {
- AssociationUtil.addAssociation(request, response);
+ AssociationUtil.addRemoveAssociation(request, response);
} catch (Exception e) {
// todo: implement a general AJAX error segment
setErrorMessage(request, e.getMessage());
Modified: trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AssociationUtil.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AssociationUtil.java?rev=17825&r1=17824&r2=17825&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AssociationUtil.java (original)
+++ trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/AssociationUtil.java Mon Jun 2 23:55:03 2008
@@ -15,7 +15,7 @@
import java.util.List;
public class AssociationUtil {
- public static void addAssociation(HttpServletRequest request, HttpServletResponse response)
+ public static void addRemoveAssociation(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
String resourcePath = request.getParameter("resourcePath");
@@ -25,9 +25,14 @@
String associationType = request.getParameter("type");
String associationPaths = request.getParameter("associationPaths");
+ String todo = request.getParameter("todo");
Registry registry = CommonUtil.getUserRegistry(request);
- registry.addAssociation(resourcePath, associationPaths, associationType);
+ if(todo.equals("add")){
+ registry.addAssociation(resourcePath, associationPaths, associationType);
+ } else {
+ registry.removeAssociation(resourcePath, associationPaths, associationType);
+ }
Association[] deps = registry.getAllAssociations(resourcePath);
List assoList = new ArrayList();
@@ -37,6 +42,11 @@
ResourceDetailsAction details = (ResourceDetailsAction)request.getSession()
.getAttribute(UIConstants.RESOURCE_BEAN);
details.setAssociations(assoList);
+ if(associationType.equals("dependency")) {
+ request.getSession().setAttribute("type","dep");
+ } else{
+ request.getSession().setAttribute("type","asso");
+ }
request.getRequestDispatcher(UIConstants.AJAX_ASSOCIATIONS_JSP)
.forward(request, response);
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/ajax/association-list.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/ajax/association-list.jsp?rev=17825&r1=17824&r2=17825&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/ajax/association-list.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/ajax/association-list.jsp Mon Jun 2 23:55:03 2008
@@ -17,7 +17,8 @@
Iterator forCount = depList.iterator();
Iterator deps = depList.iterator();
Iterator asso = depList.iterator();
-
+ int count = 0;
+
boolean hasAssociations = false;
boolean hasDependencies = false;
while (forCount.hasNext()) {
@@ -34,7 +35,7 @@
<th>
Dependency Path
</th>
- <th>
+ <th colspan="2">
</th>
</tr>
@@ -43,6 +44,7 @@
while (deps.hasNext()) {
Association association = (Association) deps.next();
if (association.getSourcePath().equals(details.getPath()) && association.getAssociationType().equals("dependency")) {
+ count++;
%>
@@ -57,8 +59,22 @@
<a href="<%=destLink%>"><%=destPath%>
</a>
</td>
- <td>
+ <td style="width:10px;">
+ <a style="margin-left: 5px;" title="Delete" onclick="showHideCommon('del_panelDep<%=count%>');">
+ <img border="0" src="/wso2registry/admin/images/icon-trash.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr id="del_panelDep<%=count%>" class="copy-move-panel" style="display:none;">
+ <td align="left" colspan="3">
+ <h3>Confirm dependency delete</h3>
+ <div style="padding-top: 5px; padding-bottom: 5px;">
+ Are you sure you want to remove the dependency (<a href="<%=destLink%>"><%=destPath%> </a>)?
+ <br/>
+ </div>
+ <input class="button" type="button" onclick="removeAssociation('<%=details.getPath()%>','<%=destPath%>','<%=association.getAssociationType()%>','dependenciesDiv');" value="Yes"/>
+ <input class="button" type="button" onclick="showHideCommon('del_panelDep<%=count%>')" value="No" style="margin-left: 5px;"/>
</td>
</tr>
<%
@@ -83,13 +99,14 @@
if (hasAssociations == true && type.equals("asso")) {
+ count = 0;
%>
<table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="data-table">
<tr>
<th>
Path
</th>
- <th>
+ <th colspan="2">
Type
</th>
</tr>
@@ -98,7 +115,7 @@
while (asso.hasNext()) {
Association association = (Association) asso.next();
if (association.getSourcePath().equals(details.getPath()) && !association.getAssociationType().equals("dependency")) {
-
+ count++;
%>
<tr>
@@ -115,6 +132,23 @@
<td>
<%=association.getAssociationType()%>
</td>
+ <td style="width:10px;">
+ <a style="margin-left: 5px;" title="Delete" onclick="showHideCommon('del_panelAsso<%=count%>');">
+ <img border="0" src="/wso2registry/admin/images/icon-trash.gif"/>
+ </a>
+ </td>
+ </tr>
+ <tr id="del_panelAsso<%=count%>" class="copy-move-panel" style="display:none;">
+ <td align="left" colspan="3">
+ <h3>Confirm dependency delete</h3>
+ <div style="padding-top: 5px; padding-bottom: 5px;">
+ Are you sure you want to remove the dependency (<a href="<%=destLink%>"><%=destPath%> </a>)?
+ <br/>
+ </div>
+
+ <input class="button" type="button" onclick="removeAssociation('<%=details.getPath()%>','<%=destPath%>','<%=association.getAssociationType()%>','associationDiv');" value="Yes"/>
+ <input class="button" type="button" onclick="showHideCommon('del_panelAsso<%=count%>')" value="No" style="margin-left: 5px;"/>
+ </td>
</tr>
<%
}
@@ -130,4 +164,4 @@
border="0"
width="30"/>Association
Tree</a></div>
-<% } %>
\ No newline at end of file
+<% } %>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js?rev=17825&r1=17824&r2=17825&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js Mon Jun 2 23:55:03 2008
@@ -475,32 +475,46 @@
function addAssociation(mainType){
var typeForm= document.forms[mainType];
- var reasonDiv=$('associationReason');
- var reason="";
+ var reasonDivId="associationReason";
+ var addDivId='associationsAddDiv';
+ var fillingDiv = 'associationDiv';
+ var assoType = "dependency";
+ var reason="";
+
if(mainType!="depForm"){
reason +=validateForInput(typeForm.type,"Name");
reason +=validateEmpty(typeForm.type,"Name");
- }
- reason +=validateForInput(typeForm.associationPaths,"Association Type:");
- reason +=validateEmpty(typeForm.associationPaths,"Association Path:");
+ assoType = typeForm.type.value;
+ } else{
+ reasonDivId="dependencyReason";
+ fillingDiv = 'dependenciesDiv';
+ addDivId = "dependenciesAddDiv";
+ }
+ var reasonDiv=$(reasonDivId);
+ reason +=validateForInput(typeForm.associationPaths,"Type:");
+ reason +=validateEmpty(typeForm.associationPaths,"Path:");
- reasonDiv.innerHTML=reason;
+
+ reasonDiv.innerHTML=reason;
if(reason=="") {
var resourcePath = $('resourcePath').value;
- var type = typeForm.type.value;
- var associationPaths = typeForm.associationPaths.value;
+ var associationPaths = typeForm.associationPaths.value;
typeForm.type.value="";
typeForm.associationPaths.value="";
- showHideCommon('dependenciesAddDiv');
- new Ajax.Updater('associationDiv','/wso2registry/system/addAssociation', {method:'post',parameters:{resourcePath:resourcePath,type:type,associationPaths:associationPaths}}) ;
- }
+ showHideCommon(addDivId);
+ new Ajax.Updater(fillingDiv,'/wso2registry/system/addRemoveAssociation', {method:'post',parameters:{resourcePath:resourcePath,type:assoType,associationPaths:associationPaths,todo:'add'}}) ;
+ reasonDiv.style.display = "none";
+
+ }
else{
reasonDiv.innerHTML = reason;
reasonDiv.style.display = "block";
- cleanField(typeForm.type);
- cleanField(typeForm.associationPaths);
}
}
+function removeAssociation(resourcePath,associationPaths,assoType,fillingDiv){
+
+ new Ajax.Updater(fillingDiv,'/wso2registry/system/addRemoveAssociation', {method:'post',parameters:{resourcePath:resourcePath,type:assoType,associationPaths:associationPaths,todo:'remove'}}) ;
+}
function hideOthers(id,type){
var renamePanel=$("rename_panel"+id);
@@ -1029,4 +1043,4 @@
}
-}
\ No newline at end of file
+}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp?rev=17825&r1=17824&r2=17825&view=diff
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp Mon Jun 2 23:55:03 2008
@@ -1243,6 +1243,7 @@
<!-- Start dependencies div -->
<div class="box1-head">
+
<table cellspacing="0" cellpadding="0" border="0" style="width:100%">
<tr>
@@ -1275,9 +1276,9 @@
</div>
<div class="box2-mid" id="dependenciesExpanded">
- <div id="dependenciesReason" class="validationError" style="display: none;"></div>
+ <div id="dependencyReason" class="validationError" style="display: none;"></div>
<div id="dependenciesAddDiv" style="display:none;">
- <form onsubmit="return addAssociation();" name="depForm">
+ <form onsubmit="return addAssociation('depForm');" name="depForm">
<input type="hidden" name="resourcePath" value="<%=details.getPath()%>"/>
<input type="hidden" name="type" value="dependency"/>
<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table">
@@ -1346,7 +1347,7 @@
<div class="box2-mid" id="associationsExpanded">
<div id="associationReason" class="validationError" style="display: none;"></div>
<div id="associationsAddDiv" style="display:none;">
- <form onsubmit="return addAssociation();" name="assoForm">
+ <form onsubmit="return addAssociation('assoForm');" name="assoForm">
<input type="hidden" name="resourcePath" id="resourcePath" value="<%=details.getPath()%>"/>
<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table">
<tr>
More information about the Registry-dev
mailing list