From baa863e45ff452bfa679d3efbb077915725d1ee9 Mon Sep 17 00:00:00 2001 From: Salvatore La Manna Date: Tue, 3 Aug 2021 17:56:58 +0200 Subject: [PATCH] Merge --- .../it/mwg/sismica/bo/util/SismicaUtil.java | 2 +- .../impl/IntPraticaLocalServiceImpl.java | 30 +++++++++---------- .../docroot/WEB-INF/src/service.properties | 4 +-- .../docroot/WEB-INF/.gitignore | 1 + .../org.eclipse.wst.common.component | 4 +-- .../org.eclipse.wst.common.component | 3 ++ 6 files changed, 24 insertions(+), 20 deletions(-) create mode 100644 liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/.gitignore diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java index 64c47680..ce6142a5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/mwg/sismica/bo/util/SismicaUtil.java @@ -378,7 +378,7 @@ public class SismicaUtil { _log.info("Reindicizzate " + start + " pratiche"); } } while (pratiche.size() > 0); - esitoLog(esito, "" + start + " pratiche reindicizzate."); + esitoLog(esito, start + " pratiche reindicizzate."); return esito; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java index cf0b62d6..985bd0d5 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/it/tref/liferay/portos/bo/service/impl/IntPraticaLocalServiceImpl.java @@ -130,29 +130,29 @@ public class IntPraticaLocalServiceImpl extends IntPraticaLocalServiceBaseImpl { private static Log _log = LogFactoryUtil.getLog(IntPraticaLocalServiceImpl.class); - private static final Map tipiProcedure = new LinkedHashMap<>(); - static { - putTipoProcedura(Constants.PROCEDURA_P0); - putTipoProcedura(Constants.PROCEDURA_P1); - putTipoProcedura(Constants.PROCEDURA_P2); - putTipoProcedura(Constants.PROCEDURA_P3); - putTipoProcedura(Constants.PROCEDURA_P4); - putTipoProcedura(Constants.PROCEDURA_P5); - putTipoProcedura(Constants.PROCEDURA_P6); - putTipoProcedura(Constants.PROCEDURA_P7); - putTipoProcedura(Constants.PROCEDURA_P8); - putTipoProcedura(Constants.PROCEDURA_P9); - putTipoProcedura(Constants.PROCEDURA_P10); - } + private static Map tipiProcedure = null; private static void putTipoProcedura(String tipo) { - tipiProcedure.put(tipo, LanguageUtil.get(LocaleUtil.ITALIAN, "tipo_procedura_" + tipo)); } @Override public Map getTipiProcedure() { + if (null == tipiProcedure) { + tipiProcedure = new LinkedHashMap<>(); + putTipoProcedura(Constants.PROCEDURA_P0); + putTipoProcedura(Constants.PROCEDURA_P1); + putTipoProcedura(Constants.PROCEDURA_P2); + putTipoProcedura(Constants.PROCEDURA_P3); + putTipoProcedura(Constants.PROCEDURA_P4); + putTipoProcedura(Constants.PROCEDURA_P5); + putTipoProcedura(Constants.PROCEDURA_P6); + putTipoProcedura(Constants.PROCEDURA_P7); + putTipoProcedura(Constants.PROCEDURA_P8); + putTipoProcedura(Constants.PROCEDURA_P9); + putTipoProcedura(Constants.PROCEDURA_P10); + } return tipiProcedure; } diff --git a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties index aa480c6b..55275b58 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties +++ b/liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties @@ -13,8 +13,8 @@ ## build.namespace=portos_bo - build.number=3146 - build.date=1623939194375 + build.number=3147 + build.date=1627659608232 build.auto.upgrade=true ## diff --git a/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/.gitignore b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/.gitignore new file mode 100644 index 00000000..840e7d31 --- /dev/null +++ b/liferay-plugins-sdk-6.2/portlets/portos-company-configuration-portlet/docroot/WEB-INF/.gitignore @@ -0,0 +1 @@ +/classes/ diff --git a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component index e1d846ac..26b0e067 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/.settings/org.eclipse.wst.common.component @@ -2,10 +2,10 @@ - + uses - + uses diff --git a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component index c01cc188..c095d951 100644 --- a/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component +++ b/liferay-plugins-sdk-6.2/portlets/portos-kaleo-controller-portlet/.settings/org.eclipse.wst.common.component @@ -2,6 +2,9 @@ + + uses + uses