svn commit: r571548 - in /lenya/trunk/src: java/org/apache/lenya/cms/workflow/ modules-core/ac/java/src/org/apache/lenya/ac/impl/ modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/ modules-core/usecase/java/src/org/apache/lenya/cms/...

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]> 
Author: rfrovarp
Date: Fri Aug 31 12:16:21 2007
New Revision: 571548

URL: http://svn.apache.org/viewvc?rev=571548&view=rev
Log:
Performance increase. Use StringBuffer instead of straight string concatenation inside of loops.

Modified:
    lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
    lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
    lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java
    lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/IndexStructure.java
    lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java?rev=571548&r1=571547&r2=571548&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java Fri Aug 31 12:16:21 2007
@@ -200,25 +200,26 @@
 
     protected String encodeVersion(Workflow workflow, Version version) {
 
-        String string = "event:" + version.getEvent();
-        string += " state:" + version.getState();
+        StringBuffer stringBuf = new StringBuffer("event:").append(version.getEvent());
+        stringBuf.append(" state:").append(version.getState());
 
         Identity identity = getSession().getIdentity();
         User user = identity.getUser();
         if (user != null) {
-            string += " user:" + identity.getUser().getId();
+            stringBuf.append(" user:").append(identity.getUser().getId());
         }
-        string += " machine:" + identity.getMachine().getIp();
+        stringBuf.append(" machine:").append(identity.getMachine().getIp());
 
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
-        string += " date:" + format.format(new Date());
+        stringBuf.append(" date:").append(format.format(new Date()));
 
         String names[] = workflow.getVariableNames();
         for (int i = 0; i < names.length; i++) {
             String value = Boolean.toString(version.getValue(names[i]));
-            string += " var:" + names[i] + "=" + value;
+            stringBuf.append(" var:").append(names[i]);
+            stringBuf.append("=").append(value);
         }
-        return string;
+        return stringBuf.toString();
     }
 
     protected Version decodeVersion(String string) {

Modified: lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java?rev=571548&r1=571547&r2=571548&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java (original)
+++ lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java Fri Aug 31 12:16:21 2007
@@ -159,11 +159,13 @@
      * @param roles The roles.
      */
     protected void saveRoles(Request request, Role[] roles) {
-        String rolesString = "";
-        for (int i = 0; i < roles.length; i++) {
-            rolesString += " " + roles[i];
+         if(getLogger().isDebugEnabled()) {
+            StringBuffer rolesBuffer = new StringBuffer();
+            for (int i = 0; i < roles.length; i++) {
+               rolesBuffer.append(" ").append(roles[i]);
+            }
+            getLogger().debug("Adding roles [" + rolesBuffer + " ] to request [" + request + "]");
         }
-        getLogger().debug("Adding roles [" + rolesString + " ] to request [" + request + "]");
         request.setAttribute(Role.class.getName(), Arrays.asList(roles));
     }
 

Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java?rev=571548&r1=571547&r2=571548&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AddIPRange.java Fri Aug 31 12:16:21 2007
@@ -65,24 +65,24 @@
         ipRange.setName(name);
         ipRange.setDescription(description);
 
-        String networkString = "";
-        String subnetString = "";
+        StringBuffer networkBuffer = new StringBuffer();
+        StringBuffer subnetBuffer = new StringBuffer();
 
         for (int i = 0; i < 4; i++) {
             if (i > 0) {
-                networkString += ".";
-                subnetString += ".";
+                networkBuffer.append(".");
+                subnetBuffer.append(".");
             }
             Part netPart = (Part) getParameter(IPRangeProfile.NETWORK_ADDRESS + "-" + i);
-            networkString += netPart.getValue();
+            networkBuffer.append(netPart.getValue());
             Part subPart = (Part) getParameter(IPRangeProfile.SUBNET_MASK + "-" + i);
-            subnetString += subPart.getValue();
+            subnetBuffer.append(subPart.getValue());
         }
 
-        InetAddress networkAddress = InetAddress.getByName(networkString);
+        InetAddress networkAddress = InetAddress.getByName(networkBuffer.toString());
         ipRange.setNetworkAddress(networkAddress.getAddress());
 
-        InetAddress subnetMask = InetAddress.getByName(subnetString);
+        InetAddress subnetMask = InetAddress.getByName(subnetBuffer.toString());
         ipRange.setSubnetMask(subnetMask.getAddress());
 
         ipRange.save();
@@ -103,4 +103,4 @@
         }
         setParameter(IPRangeProfile.PART_NUMBERS, partNumbers);
     }
-}
\ No newline at end of file
+}

Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java?rev=571548&r1=571547&r2=571548&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/IPRangeProfile.java Fri Aug 31 12:16:21 2007
@@ -57,24 +57,24 @@
         ipRange.setName(name);
         ipRange.setDescription(description);
 
-        String networkString = "";
-        String subnetString = "";
+        StringBuffer networkBuffer = new StringBuffer();
+        StringBuffer subnetBuffer = new StringBuffer();
 
         for (int i = 0; i < 4; i++) {
             if (i > 0) {
-                networkString += ".";
-                subnetString += ".";
+                networkBuffer.append(".");
+                subnetBuffer.append(".");
             }
             Part netPart = (Part) getParameter(IPRangeProfile.NETWORK_ADDRESS + "-" + i);
-            networkString += netPart.getValue();
+            networkBuffer.append(netPart.getValue());
             Part subPart = (Part) getParameter(IPRangeProfile.SUBNET_MASK + "-" + i);
-            subnetString += subPart.getValue();
+            subnetBuffer.append(subPart.getValue());
         }
 
-        InetAddress networkAddress = InetAddress.getByName(networkString);
+        InetAddress networkAddress = InetAddress.getByName(networkBuffer.toString());
         ipRange.setNetworkAddress(networkAddress.getAddress());
 
-        InetAddress subnetMask = InetAddress.getByName(subnetString);
+        InetAddress subnetMask = InetAddress.getByName(subnetBuffer.toString());
         ipRange.setSubnetMask(subnetMask.getAddress());
 
         ipRange.save();
@@ -210,4 +210,4 @@
 
     }
 
-}
\ No newline at end of file
+}

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java?rev=571548&r1=571547&r2=571548&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/AbstractUsecase.java Fri Aug 31 12:16:21 2007
@@ -865,21 +865,21 @@
      *         <code>?lenya.usecase=...&amp;param1=foo&amp;param2=bar</code>.
      */
     protected String getExitQueryString() {
-        String queryString = "";
+        StringBuffer queryBuffer = new StringBuffer();
         if (this.exitUsecaseName != null) {
-            queryString = "?lenya.usecase=" + this.exitUsecaseName;
+            queryBuffer.append("?lenya.usecase=").append(this.exitUsecaseName);
             for (Iterator i = this.exitUsecaseParameters.keySet().iterator(); i.hasNext();) {
                 String key = (String) i.next();
                 String value = (String) this.exitUsecaseParameters.get(key);
-                queryString += "&" + key + "=" + value;
+                queryBuffer.append("&").append(key).append("=").append(value);
             }
         } else {
             String exitUsecase = getParameterAsString("lenya.exitUsecase");
             if (exitUsecase != null && !"".equals(exitUsecase)) {
-                queryString = "?lenya.usecase=" + exitUsecase;
+                queryBuffer.append("?lenya.usecase=").append(exitUsecase);
             }
         }
-        return queryString;
+        return queryBuffer.toString();
     }
 
     public Session getSession() {
@@ -916,4 +916,4 @@
         return getParameterAsBoolean(PARAMETER_CHECKOUT_RESTRICTED_TO_SESSION, true);
     }
 
-}
\ No newline at end of file
+}

Modified: lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java?rev=571548&r1=571547&r2=571548&view=diff
==============================================================================
--- lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java (original)
+++ lenya/trunk/src/modules/editors/java/src/org/apache/lenya/cms/editors/forms/FormsEditor.java Fri Aug 31 12:16:21 2007
@@ -506,7 +506,7 @@
     private XUpdateAttributes getAttributes(String update, String tagID) {
         getLogger().debug(update);
 
-        String xupdateString = "<xupdate:attribute name=\"tagID\">temp</xupdate:attribute>";
+        StringBuffer xupdateBuffer = new StringBuffer("<xupdate:attribute name=\"tagID\">temp</xupdate:attribute>");
 
         String[] attributes = update.substring(0, update.indexOf(">")).split(" ");
         for (int i = 1; i < attributes.length; i++) {
@@ -516,15 +516,15 @@
                 String name = attributes[i].substring(0, index);
                 String value = attributes[i].substring(index + 2, attributes[i].length() - 1);
                 if (name.indexOf("xmlns") < 0) {
-                    xupdateString = xupdateString + "<xupdate:attribute name=\"" + name + "\">"
-                            + value + "</xupdate:attribute>";
+                    xupdateBuffer.append("<xupdate:attribute name=\"" + name + "\">");
+                    xupdateBuffer.append(value).append("</xupdate:attribute>");
                 }
             }
         }
 
-        getLogger().debug("Attributes: " + xupdateString);
+        getLogger().debug("Attributes: " + xupdateBuffer.toString());
 
-        return new XUpdateAttributes(xupdateString, tagID);
+        return new XUpdateAttributes(xupdateBuffer.toString(), tagID);
     }
 
     /**

Modified: lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/IndexStructure.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/IndexStructure.java?rev=571548&r1=571547&r2=571548&view=diff
==============================================================================
--- lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/IndexStructure.java (original)
+++ lenya/trunk/src/modules/lucene/java/src/org/apache/cocoon/components/search/IndexStructure.java Fri Aug 31 12:16:21 2007
@@ -101,13 +101,13 @@
     }
 
     public String toString() {
-        String result = "DocumentFactory:";
+        StringBuffer result = new StringBuffer("DocumentFactory:");
         Iterator iter = this.fielddefs.values().iterator();
         while (iter.hasNext()) {
             FieldDefinition item = (FieldDefinition) iter.next();
-            result += "\n" + item.toString();
+            result.append("\n").append(item.toString());
         }
-        return result;
+        return result.toString();
     }
 
 }

Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java?rev=571548&r1=571547&r2=571548&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/cocoon/generation/SitetreeFragmentGenerator.java Fri Aug 31 12:16:21 2007
@@ -150,11 +150,11 @@
             this.getLogger().debug("Parameter area: " + this.area);
             this.getLogger().debug("Parameter path: " + this.path);
             this.getLogger().debug("Parameter initialTree: " + this.initialTree);
-            String areasStr = "";
+            StringBuffer areasStr = new StringBuffer();
             for (int i = 0; i < this.areas.length; i++) {
-                areasStr += this.areas[i] + " ";
+                areasStr.append(this.areas[i]).append(" ");
             }
-            this.getLogger().debug("Parameter areas: " + areasStr);
+            this.getLogger().debug("Parameter areas: " + areasStr.toString());
         }
 
         try {
@@ -510,4 +510,4 @@
         this.contentHandler.endElement(URI, NODE_LABEL, PREFIX + ':' + NODE_LABEL);
     }
 
-}
\ No newline at end of file
+}
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.