]> source.dussan.org Git - archiva.git/commitdiff
merged -r686665 (MRM-905: replace EL exepressions containing "empty(" with "empty...
authorMaria Odea B. Ching <oching@apache.org>
Thu, 4 Sep 2008 04:01:58 +0000 (04:01 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Thu, 4 Sep 2008 04:01:58 +0000 (04:01 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-1.1.x@691864 13f79535-47bb-0310-9956-ffa450edef68

19 files changed:
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/database.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/include/proxyConnectorForm.jspf
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/legacyArtifactPath.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/networkProxies.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/proxyConnectors.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositories.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryGroups.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/repositoryScanning.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/components/companyLogo.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/artifactDecorator.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactDependencies.jspf
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactInfo.jspf
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/artifactReports.jspf
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/mailingLists.jspf
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/projectDependees.jspf
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/showArtifact.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/currentWWUrl.tag
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactLink.tag
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/tags/showArtifactTitle.tag

index 3d53b7e5f83b3dab02e74b4997623d23e81b86e5..6359c4e12d59aeff76481d93a1f67ea32972fbae 100644 (file)
@@ -64,7 +64,7 @@
 <h2>Database - Unprocessed Artifacts Scanning</h2>
 
 <c:choose>
-  <c:when test="${empty(unprocessedConsumers)}">
+  <c:when test="${empty (unprocessedConsumers)}">
     <%-- No Consumers. Eeek! --%>
     <strong>There are no consumers for unprocessed artifacts.</strong>
   </c:when>
 <h2>Database - Artifact Cleanup Scanning</h2>
 
 <c:choose>
-  <c:when test="${empty(cleanupConsumers)}">
+  <c:when test="${empty (cleanupConsumers)}">
     <%-- No Consumers. Eeek! --%>
     <strong>There are no consumers for artifact cleanup.</strong>
   </c:when>
index 6e04cee2daebefc35c8ed8fa79d5bf4bae590242..4a6b29101594e3c988f0a257fb7ad6b99af66074 100644 (file)
@@ -81,7 +81,7 @@
   </td>
   <td>
     <c:choose>
-      <c:when test="${empty(connector.properties)}">
+      <c:when test="${empty (connector.properties)}">
         <i>No properties have been set.</i>
       </c:when>
       <c:otherwise>
   </td>
   <td>
     <c:choose>
-      <c:when test="${empty(connector.blackListPatterns)}">
+      <c:when test="${empty (connector.blackListPatterns)}">
         <i>No black list patterns have been set.</i>
       </c:when>
       <c:otherwise>
   </td>
   <td>
     <c:choose>
-      <c:when test="${empty(connector.whiteListPatterns)}">
+      <c:when test="${empty (connector.whiteListPatterns)}">
         <i>No white list patterns have been set.</i>
       </c:when>
       <c:otherwise>
index b68a4a58a105b708093d87db3522a75a13dc8c8d..6c64cabf5214ace70ad8e71ffb8ea6dda1e497bd 100644 (file)
@@ -50,7 +50,7 @@
 <h2>Path Mappings</h2>\r
 \r
 <c:choose>\r
-<c:when test="${empty(legacyArtifactPaths)}">\r
+<c:when test="${empty (legacyArtifactPaths)}">\r
   <%-- No paths. --%>\r
   <p><strong>There are no legacy artifact paths configured yet.</strong></p>\r
 </c:when>\r
index 46a2e93352e0e3b6f6b24823f8e8a128d5ebb858..a7aeea1c797ec53ebfe79bd03e0f27f6e4f2cff5 100644 (file)
@@ -48,7 +48,7 @@
 <h2>Network Proxies</h2>
 
 <c:choose>
-  <c:when test="${empty(networkProxies)}">
+  <c:when test="${empty (networkProxies)}">
     <%-- No Local Repositories. --%>
     <strong>There are no network proxies configured yet.</strong>
   </c:when>
           <th>Port</th>
           <td>${proxy.port}</td>
         </tr>
-        <c:if test="${not empty(proxy.username)}">
+        <c:if test="${not empty (proxy.username)}">
           <tr>
             <th>Username</th>
             <td>${proxy.username}</td>
           </tr>
-          <c:if test="${not empty(proxy.password)}">
+          <c:if test="${not empty (proxy.password)}">
             <tr>
               <th>Password</th>
               <td>&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;</td>
index f3362bc29095e8548d8fb202475612288cceffe5..78963a1fa49db3995f730788f5789556844b567b 100644 (file)
@@ -57,7 +57,7 @@
 <h2>Repository Proxy Connectors</h2>
 
 <c:choose>
-<c:when test="${empty(proxyConnectorMap)}">
+<c:when test="${empty (proxyConnectorMap)}">
   <strong>No Repository Proxy Connectors Defined.</strong>
 </c:when>
 <c:otherwise>
         <th nowrap="nowrap">Network Proxy:</th>
         <td>
           <c:choose>
-            <c:when test="${empty(connector.proxyId)}">
+            <c:when test="${empty (connector.proxyId)}">
               <span class="directConnection">(Direct Connection)</span>
             </c:when>
             <c:otherwise>
         </td>
       </tr>
 
-      <c:if test="${not(empty(connector.whiteListPatterns))}">
+      <c:if test="${not (empty (connector.whiteListPatterns))}">
         <tr>
           <th nowrap="nowrap">White List:</th>
           <td nowrap="nowrap">
         </tr>
       </c:if>
 
-      <c:if test="${not(empty(connector.blackListPatterns))}">
+      <c:if test="${not (empty (connector.blackListPatterns))}">
         <tr>
           <th nowrap="nowrap">Black List:</th>
           <td>
         </tr>
       </c:if>
 
-      <c:if test="${not(empty(connector.properties))}">
+      <c:if test="${not (empty (connector.properties))}">
         <tr>
           <th>Properties:</th>
           <td>
index deafd9fc8fdd46c66dd828adb6909174171b7abf..ecd8719b0d6b39bea1d4bc78953e1dcc7c688e73 100644 (file)
@@ -50,7 +50,7 @@
 <h2>Managed Repositories</h2>
 
 <c:choose>
-<c:when test="${empty(managedRepositories)}">
+<c:when test="${empty (managedRepositories)}">
   <%-- No Managed Repositories. --%>
   <strong>There are no managed repositories configured yet.</strong>
 </c:when>
   <th>Directory</th>
   <td>${repository.location}</td>
 </tr>
-<c:if test="${!empty(repository.indexDir)}">
+<c:if test="${!empty (repository.indexDir)}">
        <tr>
          <th>Index Directory</th>
          <td>${repository.indexDir}</td>
     </c:choose>
   </td>
 </tr>
-<c:if test="${!empty(repositoryToGroupMap[repository.id])}">
+<c:if test="${!empty (repositoryToGroupMap[repository.id])}">
   <tr>
     <th>Groups</th>
     <td>
     <td>
       <c:set var="stats" value="${repositoryStatistics[repository.id]}"/>
       <c:choose>
-        <c:when test="${empty(stats)}">
+        <c:when test="${empty (stats)}">
           No Statistics Available.
         </c:when>
         <c:otherwise>
 <h2>Remote Repositories</h2>
 
 <c:choose>
-  <c:when test="${empty(remoteRepositories)}">
+  <c:when test="${empty (remoteRepositories)}">
     <%-- No Remote Repositories. --%>
     <strong>There are no remote repositories configured yet.</strong>
   </c:when>
index a7adb53fec93a2914b5f5682ea5e8c18a5ab3f2c..85c78aeeab0242b3ca1f24e318d2c0f458be529f 100644 (file)
@@ -57,7 +57,7 @@
 <h2>Repository Groups</h2>
 
 <c:choose>
-<c:when test="${empty(repositoryGroups)}">
+<c:when test="${empty (repositoryGroups)}">
   <strong>No Repository Groups Defined.</strong>
 </c:when>
 <c:otherwise>
@@ -83,7 +83,7 @@
     <p><a href="${baseUrl}/${repositoryGroup.key}/">${baseUrl}/${repositoryGroup.key}/</a></p>
   </div>
 
-  <c:if test="${!empty(groupToRepositoryMap[repositoryGroup.key])}">
+  <c:if test="${!empty (groupToRepositoryMap[repositoryGroup.key])}">
   <div class="repos">
     <ww:form name="form${i}" action="addRepositoryToGroup" namespace="/admin" validate="true">
       <ww:hidden name="repoGroupId" value="%{'${repositoryGroup.key}'}"/>
index 84a2c4acbc8203cd92151871621407d67fd858bd..4450bee1ebdc69b8fe707887a947b28f802ed067 100644 (file)
@@ -71,7 +71,7 @@
 <h2>Repository Scanning - File Types</h2>
 
 <c:choose>
-  <c:when test="${empty(fileTypeMap)}">
+  <c:when test="${empty (fileTypeMap)}">
     <%-- No File Types. Eeek! --%>
     <strong>There are no file types configured.</strong>
   </c:when>
 <h2>Repository Scanning - Consumers of Known Content</h2>
 
 <c:choose>
-  <c:when test="${empty(knownContentConsumers)}">
+  <c:when test="${empty (knownContentConsumers)}">
     <%-- No Good Consumers. Eeek! --%>
     <strong>There are no consumers of known content available.</strong>
   </c:when>
 <h2>Repository Scanning - Consumers of Invalid Content</h2>
 
 <c:choose>
-  <c:when test="${empty(invalidContentConsumers)}">
+  <c:when test="${empty (invalidContentConsumers)}">
     <%-- No Consumers. Eeek! --%>
     <strong>There are no consumers of invalid content available.</strong>
   </c:when>
index 5627e26313051aeda9c3c2f6361bcf20668e58d3..ce3bbe85f3a0027606e11c03f45fe281d3b36f21 100644 (file)
 
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<c:if test="${!empty(organisationLogo)}">
+<c:if test="${!empty (organisationLogo)}">
   <ww:set name="organisationUrl" value="organisationUrl"/>
   <c:choose>
-    <c:when test="${!empty(organisationUrl)}">
+    <c:when test="${!empty (organisationUrl)}">
       <a href="${companyUrl}">
         <img src="${organisationLogo}" title="${organisationName}" border="0" alt=""/>
       </a>
index 58678f0717d082327132b28c93fddc7be0b64a54..256e46f6ee2b1f763bcd6e6d4ce2e072fd16bad3 100644 (file)
@@ -68,7 +68,7 @@
 
 <h1>
   <c:choose>
-    <c:when test="${empty(model.name)}">
+    <c:when test="${empty (model.name)}">
       ${model.artifactId}
     </c:when>
     <c:otherwise>
index a92f9cc4ff71e19acabe82b45896507839e10da3..cbafc98296913aa711d1072a8da35ebf11db67be 100644 (file)
@@ -35,6 +35,6 @@
                          classifier="${dependency.classifier}"/>
   </p>
 </c:forEach>
-<c:if test="${empty(dependencies)}">
+<c:if test="${empty (dependencies)}">
   <strong>No results</strong>
 </c:if>
index c440fea846e095905753f3bc590b5fe60dcd4215..d1509266529bbd85d28f4ee226e51a04f5db8022 100644 (file)
@@ -39,7 +39,7 @@
   --%>
 </p>
 
-<c:if test="${!empty(model.description)}">
+<c:if test="${!empty (model.description)}">
   <blockquote>${model.description}</blockquote>
 </c:if>
 
 </pre>
 </c:if>
 
-<c:if test="${!empty(model.url) || model.organization != null || !empty(model.licenses)
+<c:if test="${!empty (model.url) || model.organization != null || !empty (model.licenses)
     || model.issueManagement != null || model.ciManagement != null}">
 
   <h2>Other Details</h2>
   <table class="infoTable">
-    <c:if test="${!empty(model.url)}">
+    <c:if test="${!empty (model.url)}">
       <tr>
         <th>URL</th>
         <td>
         </td>
       </tr>
     </c:if>
-    <c:if test="${!empty(model.licenses)}">
+    <c:if test="${!empty (model.licenses)}">
       <c:forEach items="${model.licenses}" var="license">
         <tr>
           <th>License</th>
           <td>
             <c:choose>
-              <c:when test="${!empty(license.url)}">
+              <c:when test="${!empty (license.url)}">
                 <a href="${license.url}">${license.name}</a>
               </c:when>
               <c:otherwise>
         <th>Issue Tracker</th>
         <td>
           <c:choose>
-            <c:when test="${!empty(model.issueManagement.url)}">
+            <c:when test="${!empty (model.issueManagement.url)}">
               <a href="${model.issueManagement.url}">${model.issueManagement.system}</a>
             </c:when>
             <c:otherwise>
         <th>Continuous Integration</th>
         <td>
           <c:choose>
-            <c:when test="${!empty(model.ciManagement.url)}">
+            <c:when test="${!empty (model.ciManagement.url)}">
               <a href="${model.ciManagement.url}">${model.ciManagement.system}</a>
             </c:when>
             <c:otherwise>
 <c:if test="${model.scm != null}">
   <h2>SCM</h2>
   <table class="infoTable">
-    <c:if test="${!empty(model.scm.connection)}">
+    <c:if test="${!empty (model.scm.connection)}">
       <tr>
         <th>Connection</th>
         <td>
         </td>
       </tr>
     </c:if>
-    <c:if test="${!empty(model.scm.developerConnection)}">
+    <c:if test="${!empty (model.scm.developerConnection)}">
       <tr>
         <th>Dev. Connection</th>
         <td>
         </td>
       </tr>
     </c:if>
-    <c:if test="${!empty(model.scm.url)}">
+    <c:if test="${!empty (model.scm.url)}">
       <tr>
         <th>Viewer</th>
         <td>
index 1a9d41638463f5c340a61f7cfe79a6b631a9d446..e983a292df2635ffd86d1a1a3cd09acdb69d7532 100644 (file)
@@ -33,6 +33,6 @@
     </c:forEach>
   </ul>
 </c:forEach>
-<c:if test="${empty(reports)}">
+<c:if test="${empty (reports)}">
   <strong>No reports for this artifact.</strong>
 </c:if>
index 69d30630c8c3cd3fb042716cdafd48821ee39e8a..949af7580e9c16392eec0e4df3fcb43053b69f04 100644 (file)
     </p>
   --%>
   <ul>
-    <c:if test="${!empty(mailingList.subscribeAddress)}">
+    <c:if test="${!empty (mailingList.subscribeAddress)}">
       <li>
         <b>Subscribe:</b>
         <a href="mailto:${mailingList.subscribeAddress}">${mailingList.subscribeAddress}</a>
       </li>
     </c:if>
-    <c:if test="${!empty(mailingList.postAddress)}">
+    <c:if test="${!empty (mailingList.postAddress)}">
       <li>
         <b>Post:</b>
         <a href="mailto:${mailingList.postAddress}">${mailingList.postAddress}</a>
       </li>
     </c:if>
-    <c:if test="${!empty(mailingList.unsubscribeAddress)}">
+    <c:if test="${!empty (mailingList.unsubscribeAddress)}">
       <li>
         <b>Unsubscribe:</b>
         <a href="mailto:${mailingList.unsubscribeAddress}">${mailingList.unsubscribeAddress}</a>
@@ -55,7 +55,7 @@
             <a href="mailto:${mailingList.owner}">${mailingList.owner}</a>
           </li>
       --%>
-    <c:if test="${!empty(mailingList.mainArchiveUrl)}">
+    <c:if test="${!empty (mailingList.mainArchiveUrl)}">
       <li>
         <b>Archive:</b>
         <ul>
@@ -65,7 +65,7 @@
         </ul>
       </li>
     </c:if>
-    <%-- <c:if test="${!empty(mailingList.otherArchives)}">
+    <%-- <c:if test="${!empty (mailingList.otherArchives)}">
       <li>
         <b>Other Archives:</b>
         <ul>
@@ -79,6 +79,6 @@
     </c:if> --%>
   </ul>
 </c:forEach>
-<c:if test="${empty(mailingLists)}">
+<c:if test="${empty (mailingLists)}">
   <strong>No mailing lists</strong>
 </c:if>
index fcaa38bb6b0eb3da63b8f7ebf0d503c99f06431d..4287a26c982f043684e96948d54c5ea81f08a7ef 100644 (file)
@@ -34,6 +34,6 @@
                          version="${project.version}"/>
   </p>
 </c:forEach>
-<c:if test="${empty(dependees)}">
+<c:if test="${empty (dependees)}">
   <strong>No results</strong>
 </c:if>
index fdc50d485deddc9b125599f4a2638a3a4059f963..8960e1cba9662da3f77087dbc890b30ca9f66b8f 100644 (file)
@@ -64,7 +64,7 @@
 
 <h1>
   <c:choose>
-    <c:when test="${empty(model.name)}">
+    <c:when test="${empty (model.name)}">
       ${model.artifactId}
     </c:when>
     <c:otherwise>
index 761ff6640c55e910ed909840cd36b4f0a97d028c..d3e738b43224f45400a25347ebcdca53c6748f90 100644 (file)
@@ -26,7 +26,7 @@
 <c:set var="currentUrl">\r
   <ww:url/>\r
 </c:set>\r
-<c:if test="${!empty(action) && !empty(namespace)}">\r
+<c:if test="${!empty (action) && !empty (namespace)}">\r
   <c:set var="url">\r
     <ww:url action="${action}" namespace="${namespace}"/>\r
   </c:set>\r
index ba4558adc1383a1c498905af6aaed53f5fc6dc3d..b2289e52e791acdf1ee9502f4040871813b99074 100644 (file)
@@ -34,7 +34,7 @@
   <strong> : </strong>
   <archiva:groupIdLink var="${groupId}" includeTop="false" />
   
-  <c:if test="${!empty(artifactId)}">    
+  <c:if test="${!empty (artifactId)}">    
     <c:set var="url">
       <ww:url action="browseArtifact" namespace="/">
         <ww:param name="groupId" value="%{'${groupId}'}"/>
   </c:if>
   | <strong>Version(s):</strong>
   <c:choose>
-    <c:when test="${!empty(version)}">
+    <c:when test="${!empty (version)}">
       <c:set var="url">
         <ww:url action="showArtifact" namespace="/">
           <ww:param name="groupId" value="%{'${groupId}'}"/>
           <ww:param name="artifactId" value="%{'${artifactId}'}"/>
-          <c:if test="${!empty(version)}">
+          <c:if test="${!empty (version)}">
             <ww:param name="version" value="%{'${version}'}"/>
           </c:if>
         </ww:url>
       </c:forEach>
     </c:otherwise>
   </c:choose>
-  <c:if test="${!empty(scope)}">
+  <c:if test="${!empty (scope)}">
     | <strong>Scope:</strong> ${scope}
   </c:if>
-  <c:if test="${!empty(classifier)}">
+  <c:if test="${!empty (classifier)}">
     | <strong>Classifier:</strong> ${classifier}
   </c:if>  
 </span>
index 5ecea37d7ba6be0582dee040225167fe023be725..f11c0ee02355d4318b8179f5fb9ce446e3dfbc59 100644 (file)
@@ -26,7 +26,7 @@
   <span class="artifact-title">\r
     <c:set var="url">\r
       <c:choose>\r
-        <c:when test="${!empty(version)}">\r
+        <c:when test="${!empty (version)}">\r
           <ww:url action="showArtifact" namespace="/">\r
             <ww:param name="groupId" value="%{'${groupId}'}"/>\r
             <ww:param name="artifactId" value="%{'${artifactId}'}"/>\r