svn commit: r1230478 - in /ofbiz/trunk: applications/content/src/org/o
Locked
svn commit: r1230478 - in /ofbiz/trunk: applications/content/src/org/o
 
|
Author: erwan
Date: Thu Jan 12 10:37:35 2012 New Revision: 1230478 URL: http://svn.apache.org/viewvc?rev=1230478&view=rev Log: tabs to spaces, no functional changes - java files Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java ofbiz/trunk/framework/common/src/org/ofbiz/common/UrlServletHelper.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearch.java Thu Jan 12 10:37:35 2012 @@ -460,7 +460,7 @@ public class ContentSearch { // ====================================================================== @SuppressWarnings("serial") - public static abstract class ContentSearchConstraint implements java.io.Serializable { + public static abstract class ContentSearchConstraint implements java.io.Serializable { public ContentSearchConstraint() { } public abstract void addConstraint(ContentSearchContext contentSearchContext); @@ -470,7 +470,7 @@ public class ContentSearch { @SuppressWarnings("serial") - public static class ContentAssocConstraint extends ContentSearchConstraint { + public static class ContentAssocConstraint extends ContentSearchConstraint { public static final String constraintName = "ContentAssoc"; protected String contentId; protected String contentAssocTypeId; Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentSearchSession.java Thu Jan 12 10:37:35 2012 @@ -43,7 +43,7 @@ public class ContentSearchSession { public static final String module = ContentSearchSession.class.getName(); @SuppressWarnings("serial") - public static class ContentSearchOptions implements java.io.Serializable { + public static class ContentSearchOptions implements java.io.Serializable { protected List<ContentSearchConstraint> constraintList = null; protected ResultSortOrder resultSortOrder = null; protected Integer viewIndex = null; Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CatalogUrlServlet.java Thu Jan 12 10:37:35 2012 @@ -189,7 +189,7 @@ public class CatalogUrlServlet extends H urlBuilder.append(CATALOG_URL_MOUNT_POINT); if (UtilValidate.isNotEmpty(currentCategoryId)) { - crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId, previousCategoryId); + crumb = CategoryWorker.adjustTrail(crumb, currentCategoryId, previousCategoryId); for (String trailCategoryId: crumb) { if ("TOP".equals(trailCategoryId)) continue; urlBuilder.append("/"); Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Thu Jan 12 10:37:35 2012 @@ -69,7 +69,7 @@ public class WorkEffortKeywordIndex { if (!"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortNoteAndData.noteInfo", "1"))) { List<GenericValue> workEffortNotes = delegator.findByAnd("WorkEffortNoteAndData", UtilMisc.toMap("workEffortId", workEffortId)); - for (GenericValue workEffortNote : workEffortNotes) { + for (GenericValue workEffortNote : workEffortNotes) { addWeightedKeywordSourceString(workEffortNote, "noteInfo", strings); } } Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Thu Jan 12 10:37:35 2012 @@ -483,7 +483,7 @@ public class WorkEffortSearch { // ====================================================================== @SuppressWarnings("serial") - public static abstract class WorkEffortSearchConstraint implements java.io.Serializable { + public static abstract class WorkEffortSearchConstraint implements java.io.Serializable { public WorkEffortSearchConstraint() { } public abstract void addConstraint(WorkEffortSearchContext workEffortSearchContext); @@ -493,7 +493,7 @@ public class WorkEffortSearch { @SuppressWarnings("serial") - public static class WorkEffortAssocConstraint extends WorkEffortSearchConstraint { + public static class WorkEffortAssocConstraint extends WorkEffortSearchConstraint { public static final String constraintName = "WorkEffortAssoc"; protected String workEffortId; protected String workEffortAssocTypeId; @@ -809,7 +809,7 @@ public class WorkEffortSearch { } @SuppressWarnings("serial") - public static class ProductSetConstraint extends WorkEffortSearchConstraint { + public static class ProductSetConstraint extends WorkEffortSearchConstraint { public static final String constraintName = "ProductSet"; protected Set<String> productIdSet; Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Thu Jan 12 10:37:35 2012 @@ -43,7 +43,7 @@ public class WorkEffortSearchSession { public static final String module = WorkEffortSearchSession.class.getName(); @SuppressWarnings("serial") - public static class WorkEffortSearchOptions implements java.io.Serializable { + public static class WorkEffortSearchOptions implements java.io.Serializable { protected List<WorkEffortSearchConstraint> constraintList = null; protected ResultSortOrder resultSortOrder = null; protected Integer viewIndex = null; Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original) +++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Thu Jan 12 10:37:35 2012 @@ -65,7 +65,7 @@ import com.googlecode.concurrentlinkedha */ @SuppressWarnings("serial") public class UtilCache<K, V> implements Serializable, EvictionListener<Object, CacheLine<V>> { - + public static final String module = UtilCache.class.getName(); /** A static Map to keep track of all of the UtilCache instances. */ @@ -190,11 +190,11 @@ public class UtilCache<K, V> implements public static String getPropertyParam(ResourceBundle res, String[] propNames, String parameter) { try { for (String propName: propNames) { - if(res.containsKey(propName+ '.' + parameter)) { - try { - return res.getString(propName + '.' + parameter); - } catch (MissingResourceException e) {} - } + if(res.containsKey(propName+ '.' + parameter)) { + try { + return res.getString(propName + '.' + parameter); + } catch (MissingResourceException e) {} + } } // don't need this, just return null //if (value == null) { @@ -1032,8 +1032,8 @@ public class UtilCache<K, V> implements return (UtilCache<K, V>) UtilCache.utilCacheTable.get(cacheName); } - @Override - public void onEviction(Object key, CacheLine<V> value) { - ExecutionPool.removePulse(value); - } + @Override + public void onEviction(Object key, CacheLine<V> value) { + ExecutionPool.removePulse(value); + } } Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/UrlServletHelper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/UrlServletHelper.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/framework/common/src/org/ofbiz/common/UrlServletHelper.java (original) +++ ofbiz/trunk/framework/common/src/org/ofbiz/common/UrlServletHelper.java Thu Jan 12 10:37:35 2012 @@ -55,7 +55,6 @@ public class UrlServletHelper extends Co // get tenant delegator by domain name String serverName = request.getServerName(); try { - // if tenant was specified, replace delegator with the new per-tenant delegator and set tenantId to session attribute delegator = getDelegator(servletContext); List<GenericValue> tenants = delegator.findList("Tenant", EntityCondition.makeCondition("domainName", serverName), null, UtilMisc.toList("-createdStamp"), null, false); Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Thu Jan 12 10:37:35 2012 @@ -265,12 +265,12 @@ public class HtmlMenuRenderer extends Ht appendWhitespace(writer); } if (modelMenu.renderedMenuItemCount(context) > 0) { - writer.append("<ul>"); - appendWhitespace(writer); - writer.append("<li>"); - appendWhitespace(writer); - writer.append(" <ul>"); - appendWhitespace(writer); + writer.append("<ul>"); + appendWhitespace(writer); + writer.append("<li>"); + appendWhitespace(writer); + writer.append(" <ul>"); + appendWhitespace(writer); } } @@ -278,19 +278,19 @@ public class HtmlMenuRenderer extends Ht * @see org.ofbiz.widget.menu.MenuStringRenderer#renderMenuClose(java.io.Writer, java.util.Map, org.ofbiz.widget.menu.ModelMenu) */ public void renderMenuClose(Appendable writer, Map<String, Object> context, ModelMenu modelMenu) throws IOException { - // TODO: div can't be directly inside an UL + // TODO: div can't be directly inside an UL String fillStyle = modelMenu.getFillStyle(); if (UtilValidate.isNotEmpty(fillStyle)) { writer.append("<div class=\"").append(fillStyle).append("\"> </div>"); } //String menuContainerStyle = modelMenu.getMenuContainerStyle(context); if (modelMenu.renderedMenuItemCount(context) > 0) { - writer.append(" </ul>"); - appendWhitespace(writer); - writer.append("</li>"); - appendWhitespace(writer); - writer.append("</ul>"); - appendWhitespace(writer); + writer.append(" </ul>"); + appendWhitespace(writer); + writer.append("</li>"); + appendWhitespace(writer); + writer.append("</ul>"); + appendWhitespace(writer); } writer.append(" <br class=\"clear\"/>"); appendWhitespace(writer); @@ -599,7 +599,3 @@ public class HtmlMenuRenderer extends Ht writer.append("/>"); } } - - - - Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java?rev=1230478&r1=1230477&r2=1230478&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java (original) +++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Thu Jan 12 10:37:35 2012 @@ -324,10 +324,10 @@ public class ModelMenu extends ModelWidg public int renderedMenuItemCount(Map<String, Object> context) { - int count = 0; + int count = 0; for (ModelMenuItem item : this.menuItemList) { if (item.shouldBeRendered(context)) - count++; + count++; } return count; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |