You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Jacques Le Roux <ja...@les7arts.com> on 2011/01/18 23:30:29 UTC
Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
Marco,
Have you seen Adam's remark about long lines splitted. I guess you are using a tool for format those lines. Anyway we prefer to keep
them reasonnably long. At least I agree with Adam we should not uselessly change already long lines
Thanks
Jacques
> Author: mrisaliti
> Date: Tue Jan 18 22:20:48 2011
> New Revision: 1060599
>
> URL: http://svn.apache.org/viewvc?rev=1060599&view=rev
> Log:
> Internationalization of ServiceUtil.returnSuccess, ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)
>
> Modified:
> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>
> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1060599&r1=1060598&r2=1060599&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jan 18 22:20:48 2011
> @@ -9470,6 +9470,10 @@
> <value xml:lang="en">Exception in calling SagePayPaymentAuthorisation: ${errorString}</value>
> <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentAuthorisation: ${errorString}</value>
> </property>
> + <property key="AccountingSagePayOrderPaymenPreferenceIsNull">
> + <value xml:lang="en">OrderPaymentPreference for order : ${orderId } is null: ${orderPaymentPreference}</value>
> + <value xml:lang="it">Preferenze pagamento per l'ordine : ${orderId } è nullo: ${orderPaymentPreference}</value>
> + </property>
> <property key="AccountingSagePayPaymentRefundException">
> <value xml:lang="en">Exception in calling SagePayPaymentRefund: ${errorString}</value>
> <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentRefund: ${errorString}</value>
>
> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
> URL:
> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java?rev=1060599&r1=1060598&r2=1060599&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java (original)
> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java Tue Jan 18
> 22:20:48 2011
> @@ -153,11 +153,14 @@ public class SagePayPaymentServices {
> Debug.logInfo("SagePay - Entered ccAuth", module);
> Debug.logInfo("SagePay ccAuth context : " + context, module);
> Map<String, Object> response = null;
> + String orderId = (String) context.get("orderId");
> Locale locale = (Locale) context.get("locale");
> GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
> +
> if (orderPaymentPreference == null) {
> response = ServiceUtil.returnError(UtilProperties.getMessage(resource,
> - "AccountingProblemGettingOrderPaymentPreferences", locale));
> + "AccountingSagePayOrderPaymenPreferenceIsNull",
> + UtilMisc.toMap("orderId", orderId, "orderPaymentPreference", orderPaymentPreference), locale));
> } else {
> response = processCardAuthorisationPayment(dctx, context);
> }
>
>
Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting:
config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
Posted by Adam Heath <do...@brainfood.com>.
On 01/18/2011 04:30 PM, Jacques Le Roux wrote:
> Marco,
>
> Have you seen Adam's remark about long lines splitted. I guess you are
> using a tool for format those lines. Anyway we prefer to keep
> them reasonnably long. At least I agree with Adam we should not
> uselessly change already long lines
>
> Thanks
>
> Jacques
Please don't summarize. Your summary left out a very important
comment, the fact that the $orderId is no longer being printed in the
message.
And anyone who is putting commits into ofbiz should be subscribed to
this list; this list is where buildbot messages are sent, and
discussions about commits happen.
>
>> Author: mrisaliti
>> Date: Tue Jan 18 22:20:48 2011
>> New Revision: 1060599
>>
>> URL: http://svn.apache.org/viewvc?rev=1060599&view=rev
>> Log:
>> Internationalization of ServiceUtil.returnSuccess,
>> ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)
>>
>> Modified:
>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>>
>>
>> Modified:
>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1060599&r1=1060598&r2=1060599&view=diff
>>
>> ==============================================================================
>>
>> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>> (original)
>> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>> Tue Jan 18 22:20:48 2011
>> @@ -9470,6 +9470,10 @@
>> <value xml:lang="en">Exception in calling SagePayPaymentAuthorisation:
>> ${errorString}</value>
>> <value xml:lang="it">Eccezione durante la chiamata a
>> SagePayPaymentAuthorisation: ${errorString}</value>
>> </property>
>> + <property key="AccountingSagePayOrderPaymenPreferenceIsNull">
>> + <value xml:lang="en">OrderPaymentPreference for order : ${orderId }
>> is null: ${orderPaymentPreference}</value>
>> + <value xml:lang="it">Preferenze pagamento per l'ordine : ${orderId }
>> è nullo: ${orderPaymentPreference}</value>
>> + </property>
>> <property key="AccountingSagePayPaymentRefundException">
>> <value xml:lang="en">Exception in calling SagePayPaymentRefund:
>> ${errorString}</value>
>> <value xml:lang="it">Eccezione durante la chiamata a
>> SagePayPaymentRefund: ${errorString}</value>
>>
>> Modified:
>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>>
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java?rev=1060599&r1=1060598&r2=1060599&view=diff
>>
>> ==============================================================================
>>
>> ---
>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>> (original)
>> +++
>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>> Tue Jan 18
>> 22:20:48 2011
>> @@ -153,11 +153,14 @@ public class SagePayPaymentServices {
>> Debug.logInfo("SagePay - Entered ccAuth", module);
>> Debug.logInfo("SagePay ccAuth context : " + context, module);
>> Map<String, Object> response = null;
>> + String orderId = (String) context.get("orderId");
>> Locale locale = (Locale) context.get("locale");
>> GenericValue orderPaymentPreference = (GenericValue)
>> context.get("orderPaymentPreference");
>> +
>> if (orderPaymentPreference == null) {
>> response = ServiceUtil.returnError(UtilProperties.getMessage(resource,
>> - "AccountingProblemGettingOrderPaymentPreferences", locale));
>> + "AccountingSagePayOrderPaymenPreferenceIsNull",
>> + UtilMisc.toMap("orderId", orderId, "orderPaymentPreference",
>> orderPaymentPreference), locale));
>> } else {
>> response = processCardAuthorisationPayment(dctx, context);
>> }
>>
>>
>
>
Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting:
config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
Posted by Adam Heath <do...@brainfood.com>.
On 01/18/2011 04:57 PM, Jacques Le Roux wrote:
> What Adam asked is especially to no cut existing long lines... This
> makes sense because it's easier to read patches...
Let's say we set the line length to 100. Lines then get split. Now,
a change comes in, that adds or removes parameters, or adds casting,
etc. The line then has to be resplit. That is very ugly.
My terminal width is at X characters. Your terminal width is at Y
characters. Which width is correct? Time goes by, I upgrade my
hardware. Now my width is at X1. I get older, my eyesight gets
worse. I now have to use a larger font, so can't see as many
characters. The width gets reduced.
Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
Posted by Jacques Le Roux <ja...@les7arts.com>.
What Adam asked is especially to no cut existing long lines... This makes sense because it's easier to read patches...
Thanks
Jacques
From: <ri...@gmail.com>
> Ok, I will use long lines but a lot of sources having long lines splitted.
> This is the standard formatting preference in use by Eclipse but not by OFBiz standards.
>
> Thanks
> Marco
>
> Il giorno 18/gen/2011, alle ore 23.30, Jacques Le Roux ha scritto:
>
>> Marco,
>>
>> Have you seen Adam's remark about long lines splitted. I guess you are using a tool for format those lines. Anyway we prefer to
>> keep
>> them reasonnably long. At least I agree with Adam we should not uselessly change already long lines
>>
>> Thanks
>>
>> Jacques
>>
>>> Author: mrisaliti
>>> Date: Tue Jan 18 22:20:48 2011
>>> New Revision: 1060599
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1060599&view=rev
>>> Log:
>>> Internationalization of ServiceUtil.returnSuccess, ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)
>>>
>>> Modified:
>>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>>>
>>> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1060599&r1=1060598&r2=1060599&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
>>> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jan 18 22:20:48 2011
>>> @@ -9470,6 +9470,10 @@
>>> <value xml:lang="en">Exception in calling SagePayPaymentAuthorisation: ${errorString}</value>
>>> <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentAuthorisation: ${errorString}</value>
>>> </property>
>>> + <property key="AccountingSagePayOrderPaymenPreferenceIsNull">
>>> + <value xml:lang="en">OrderPaymentPreference for order : ${orderId } is null: ${orderPaymentPreference}</value>
>>> + <value xml:lang="it">Preferenze pagamento per l'ordine : ${orderId } è nullo: ${orderPaymentPreference}</value>
>>> + </property>
>>> <property key="AccountingSagePayPaymentRefundException">
>>> <value xml:lang="en">Exception in calling SagePayPaymentRefund: ${errorString}</value>
>>> <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentRefund: ${errorString}</value>
>>>
>>> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java?rev=1060599&r1=1060598&r2=1060599&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java (original)
>>> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java Tue Jan 18
>>> 22:20:48 2011
>>> @@ -153,11 +153,14 @@ public class SagePayPaymentServices {
>>> Debug.logInfo("SagePay - Entered ccAuth", module);
>>> Debug.logInfo("SagePay ccAuth context : " + context, module);
>>> Map<String, Object> response = null;
>>> + String orderId = (String) context.get("orderId");
>>> Locale locale = (Locale) context.get("locale");
>>> GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
>>> +
>>> if (orderPaymentPreference == null) {
>>> response = ServiceUtil.returnError(UtilProperties.getMessage(resource,
>>> - "AccountingProblemGettingOrderPaymentPreferences", locale));
>>> + "AccountingSagePayOrderPaymenPreferenceIsNull",
>>> + UtilMisc.toMap("orderId", orderId, "orderPaymentPreference", orderPaymentPreference), locale));
>>> } else {
>>> response = processCardAuthorisationPayment(dctx, context);
>>> }
>>>
>>>
>>
>>
>
>
Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting:
config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
Posted by Adrian Crum <ad...@hlmksw.com>.
Marco,
You can change the line length in Eclipse. I set mine to 300 characters.
-Adrian
On 1/18/2011 2:38 PM, risalitim@gmail.com wrote:
> Ok, I will use long lines but a lot of sources having long lines splitted.
> This is the standard formatting preference in use by Eclipse but not by OFBiz standards.
>
> Thanks
> Marco
>
> Il giorno 18/gen/2011, alle ore 23.30, Jacques Le Roux ha scritto:
>
>> Marco,
>>
>> Have you seen Adam's remark about long lines splitted. I guess you are using a tool for format those lines. Anyway we prefer to keep
>> them reasonnably long. At least I agree with Adam we should not uselessly change already long lines
>>
>> Thanks
>>
>> Jacques
>>
>>> Author: mrisaliti
>>> Date: Tue Jan 18 22:20:48 2011
>>> New Revision: 1060599
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1060599&view=rev
>>> Log:
>>> Internationalization of ServiceUtil.returnSuccess, ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)
>>>
>>> Modified:
>>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>>>
>>> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1060599&r1=1060598&r2=1060599&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
>>> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jan 18 22:20:48 2011
>>> @@ -9470,6 +9470,10 @@
>>> <value xml:lang="en">Exception in calling SagePayPaymentAuthorisation: ${errorString}</value>
>>> <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentAuthorisation: ${errorString}</value>
>>> </property>
>>> +<property key="AccountingSagePayOrderPaymenPreferenceIsNull">
>>> +<value xml:lang="en">OrderPaymentPreference for order : ${orderId } is null: ${orderPaymentPreference}</value>
>>> +<value xml:lang="it">Preferenze pagamento per l'ordine : ${orderId } è nullo: ${orderPaymentPreference}</value>
>>> +</property>
>>> <property key="AccountingSagePayPaymentRefundException">
>>> <value xml:lang="en">Exception in calling SagePayPaymentRefund: ${errorString}</value>
>>> <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentRefund: ${errorString}</value>
>>>
>>> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java?rev=1060599&r1=1060598&r2=1060599&view=diff
>>> ==============================================================================
>>> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java (original)
>>> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java Tue Jan 18
>>> 22:20:48 2011
>>> @@ -153,11 +153,14 @@ public class SagePayPaymentServices {
>>> Debug.logInfo("SagePay - Entered ccAuth", module);
>>> Debug.logInfo("SagePay ccAuth context : " + context, module);
>>> Map<String, Object> response = null;
>>> + String orderId = (String) context.get("orderId");
>>> Locale locale = (Locale) context.get("locale");
>>> GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
>>> +
>>> if (orderPaymentPreference == null) {
>>> response = ServiceUtil.returnError(UtilProperties.getMessage(resource,
>>> - "AccountingProblemGettingOrderPaymentPreferences", locale));
>>> + "AccountingSagePayOrderPaymenPreferenceIsNull",
>>> + UtilMisc.toMap("orderId", orderId, "orderPaymentPreference", orderPaymentPreference), locale));
>>> } else {
>>> response = processCardAuthorisationPayment(dctx, context);
>>> }
>>>
>>>
>>
>>
>
>
Re: svn commit: r1060599 - in /ofbiz/trunk/applications/accounting: config/AccountingUiLabels.xml src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
Posted by "risalitim@gmail.com" <ri...@gmail.com>.
Ok, I will use long lines but a lot of sources having long lines splitted.
This is the standard formatting preference in use by Eclipse but not by OFBiz standards.
Thanks
Marco
Il giorno 18/gen/2011, alle ore 23.30, Jacques Le Roux ha scritto:
> Marco,
>
> Have you seen Adam's remark about long lines splitted. I guess you are using a tool for format those lines. Anyway we prefer to keep
> them reasonnably long. At least I agree with Adam we should not uselessly change already long lines
>
> Thanks
>
> Jacques
>
>> Author: mrisaliti
>> Date: Tue Jan 18 22:20:48 2011
>> New Revision: 1060599
>>
>> URL: http://svn.apache.org/viewvc?rev=1060599&view=rev
>> Log:
>> Internationalization of ServiceUtil.returnSuccess, ServiceUtil.returnFailure, ServiceUtil.returnError (OFBIZ-4091)
>>
>> Modified:
>> ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>> ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>>
>> Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=1060599&r1=1060598&r2=1060599&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
>> +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jan 18 22:20:48 2011
>> @@ -9470,6 +9470,10 @@
>> <value xml:lang="en">Exception in calling SagePayPaymentAuthorisation: ${errorString}</value>
>> <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentAuthorisation: ${errorString}</value>
>> </property>
>> + <property key="AccountingSagePayOrderPaymenPreferenceIsNull">
>> + <value xml:lang="en">OrderPaymentPreference for order : ${orderId } is null: ${orderPaymentPreference}</value>
>> + <value xml:lang="it">Preferenze pagamento per l'ordine : ${orderId } è nullo: ${orderPaymentPreference}</value>
>> + </property>
>> <property key="AccountingSagePayPaymentRefundException">
>> <value xml:lang="en">Exception in calling SagePayPaymentRefund: ${errorString}</value>
>> <value xml:lang="it">Eccezione durante la chiamata a SagePayPaymentRefund: ${errorString}</value>
>>
>> Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java?rev=1060599&r1=1060598&r2=1060599&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java (original)
>> +++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java Tue Jan 18
>> 22:20:48 2011
>> @@ -153,11 +153,14 @@ public class SagePayPaymentServices {
>> Debug.logInfo("SagePay - Entered ccAuth", module);
>> Debug.logInfo("SagePay ccAuth context : " + context, module);
>> Map<String, Object> response = null;
>> + String orderId = (String) context.get("orderId");
>> Locale locale = (Locale) context.get("locale");
>> GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
>> +
>> if (orderPaymentPreference == null) {
>> response = ServiceUtil.returnError(UtilProperties.getMessage(resource,
>> - "AccountingProblemGettingOrderPaymentPreferences", locale));
>> + "AccountingSagePayOrderPaymenPreferenceIsNull",
>> + UtilMisc.toMap("orderId", orderId, "orderPaymentPreference", orderPaymentPreference), locale));
>> } else {
>> response = processCardAuthorisationPayment(dctx, context);
>> }
>>
>>
>
>