[ \t]+$ => "" (empty) Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg) Of course this effort to remove trailing spaces has no functional implications. Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135 In the meantime I did some refactoring also in *.java and *.groovy files : ){ => ) { if( => if ( while( => while ( }else => } else else{ => else { switch( => switch ( try{ => try { }catch => } catch catch( => catch ( }finally{ => } finally { So these changes are also in this commit, should not be a problem anyway. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@763175 13f79535-47bb-0310-9956-ffa450edef68
42 lines
1.7 KiB
Groovy
42 lines
1.7 KiB
Groovy
/*
|
|
* Licensed to the Apache Software Foundation (ASF) under one
|
|
* or more contributor license agreements. See the NOTICE file
|
|
* distributed with this work for additional information
|
|
* regarding copyright ownership. The ASF licenses this file
|
|
* to you under the Apache License, Version 2.0 (the
|
|
* "License"); you may not use this file except in compliance
|
|
* with the License. You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing,
|
|
* software distributed under the License is distributed on an
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the
|
|
* specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
|
|
import java.util.*;
|
|
import org.ofbiz.base.util.*;
|
|
import org.ofbiz.entity.*;
|
|
import org.ofbiz.product.catalog.CatalogWorker;
|
|
import org.ofbiz.product.store.ProductStoreWorker;
|
|
import org.ofbiz.common.CommonWorkers;
|
|
import org.ofbiz.order.shoppingcart.*;
|
|
import org.ofbiz.webapp.control.*;
|
|
|
|
productStore = ProductStoreWorker.getProductStore(request);
|
|
|
|
prodCatalog = CatalogWorker.getProdCatalog(request);
|
|
if (prodCatalog) {
|
|
catalogStyleSheet = prodCatalog.styleSheet;
|
|
if (catalogStyleSheet) globalContext.catalogStyleSheet = catalogStyleSheet;
|
|
catalogHeaderLogo = prodCatalog.headerLogo;
|
|
if (catalogHeaderLogo) globalContext.catalogHeaderLogo = catalogHeaderLogo;
|
|
}
|
|
|
|
globalContext.productStore = productStore;
|
|
globalContext.checkLoginUrl = LoginWorker.makeLoginUrl(request, "checkLogin");
|
|
globalContext.catalogQuickaddUse = CatalogWorker.getCatalogQuickaddUse(request);
|