details: https://code.openbravo.com/erp/devel/pi/rev/497c2b94c060
changeset: 19806:497c2b94c060
user: Javier Etxarri <javier.echarri <at> openbravo.com>
date: Tue Feb 26 23:49:00 2013 +0100
summary: issue 23175: Wrong name in folder src/org/openbravo/Event and more
things
diffstat:
src/org/openbravo/event/PeriodEnventHandler.java | 76 -------------------
src/org/openbravo/event/PeriodEventHandler.java | 94 ++++++++++++++++++++++++
2 files changed, 94 insertions(+), 76 deletions(-)
diffs (180 lines):
diff -r f6907c2d08fb -r 497c2b94c060
src/org/openbravo/event/PeriodEnventHandler.java
--- a/src/org/openbravo/event/PeriodEnventHandler.java Tue Feb 26 23:13:02
2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-package org.openbravo.event;
-
-import javax.enterprise.event.Observes;
-
-import org.apache.log4j.Logger;
-import org.hibernate.criterion.Restrictions;
-import org.openbravo.base.exception.OBException;
-import org.openbravo.base.model.Entity;
-import org.openbravo.base.model.ModelProvider;
-import org.openbravo.client.kernel.event.EntityNewEvent;
-import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
-import org.openbravo.client.kernel.event.EntityUpdateEvent;
-import org.openbravo.dal.core.OBContext;
-import org.openbravo.dal.service.OBCriteria;
-import org.openbravo.dal.service.OBDal;
-import org.openbravo.database.ConnectionProvider;
-import org.openbravo.erpCommon.utility.Utility;
-import org.openbravo.model.financialmgmt.calendar.Period;
-import org.openbravo.service.db.DalConnectionProvider;
-
-public class PeriodEnventHandler extends EntityPersistenceEventObserver {
- private static Entity[] entities = {
ModelProvider.getInstance().getEntity(Period.ENTITY_NAME) };
- protected Logger logger = Logger.getLogger(this.getClass());
-
- @Override
- protected Entity[] getObservedEntities() {
- return entities;
- }
-
- public void onUpdate(@Observes EntityUpdateEvent event) {
- if (!isValidEvent(event)) {
- return;
- }
- if (!adjustmentPeriod((Period) event.getTargetInstance())) {
- checkPeriod((Period) event.getTargetInstance());
- }
- }
-
- public void onSave(@Observes EntityNewEvent event) {
- if (!isValidEvent(event)) {
- return;
- }
- if (!adjustmentPeriod((Period) event.getTargetInstance())) {
- checkPeriod((Period) event.getTargetInstance());
- }
- }
-
- private boolean adjustmentPeriod(Period period) {
- if ("A".equals(period.getPeriodType())) {
- return true;
- } else {
- return false;
- }
- }
-
- private void checkPeriod(Period period) {
- ConnectionProvider conn = new DalConnectionProvider(false);
- String language = OBContext.getOBContext().getLanguage().getLanguage();
- OBCriteria<Period> criteria =
OBDal.getInstance().createCriteria(Period.class);
- criteria.add(Restrictions.eq(Period.PROPERTY_ORGANIZATION,
period.getOrganization()));
- criteria.add(Restrictions.eq(Period.PROPERTY_CLIENT, period.getClient()));
- criteria.add(Restrictions.ne(Period.PROPERTY_ID, period.getId()));
- criteria.add(Restrictions.ge(Period.PROPERTY_ENDINGDATE,
period.getStartingDate()));
- criteria.add(Restrictions.le(Period.PROPERTY_STARTINGDATE,
period.getEndingDate()));
- criteria.add(Restrictions.eq(Period.PROPERTY_PERIODTYPE, "S"));
- criteria.setMaxResults(1);
-
- if (criteria.uniqueResult() != null) {
- logger
- .error("Period " + period.getId() + " is being saved and is
overlapping another period");
- throw new OBException(Utility.messageBD(conn, "DatesOverlappedParams",
language)
- .replace("%1", ((Period) criteria.uniqueResult()).getName())
- .replace("%2", ((Period)
criteria.uniqueResult()).getYear().getFiscalYear()));
- }
- }
-}
\ No newline at end of file
diff -r f6907c2d08fb -r 497c2b94c060
src/org/openbravo/event/PeriodEventHandler.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/event/PeriodEventHandler.java Tue Feb 26 23:49:00
2013 +0100
@@ -0,0 +1,94 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License
+ * Version 1.0 (the "License"), being the Mozilla Public License
+ * Version 1.1 with a permitted attribution clause; you may not use this
+ * file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2013 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ *************************************************************************
+ */
+package org.openbravo.event;
+
+import javax.enterprise.event.Observes;
+
+import org.apache.log4j.Logger;
+import org.hibernate.criterion.Restrictions;
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.client.kernel.event.EntityNewEvent;
+import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
+import org.openbravo.client.kernel.event.EntityUpdateEvent;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBCriteria;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.database.ConnectionProvider;
+import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.financialmgmt.calendar.Period;
+import org.openbravo.service.db.DalConnectionProvider;
+
+public class PeriodEventHandler extends EntityPersistenceEventObserver {
+ private static Entity[] entities = {
ModelProvider.getInstance().getEntity(Period.ENTITY_NAME) };
+ protected Logger logger = Logger.getLogger(this.getClass());
+
+ @Override
+ protected Entity[] getObservedEntities() {
+ return entities;
+ }
+
+ public void onUpdate(@Observes EntityUpdateEvent event) {
+ if (!isValidEvent(event)) {
+ return;
+ }
+ if (!adjustmentPeriod((Period) event.getTargetInstance())) {
+ checkPeriod((Period) event.getTargetInstance());
+ }
+ }
+
+ public void onSave(@Observes EntityNewEvent event) {
+ if (!isValidEvent(event)) {
+ return;
+ }
+ if (!adjustmentPeriod((Period) event.getTargetInstance())) {
+ checkPeriod((Period) event.getTargetInstance());
+ }
+ }
+
+ private boolean adjustmentPeriod(Period period) {
+ if ("A".equals(period.getPeriodType())) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ private void checkPeriod(Period period) {
+ ConnectionProvider conn = new DalConnectionProvider(false);
+ String language = OBContext.getOBContext().getLanguage().getLanguage();
+ OBCriteria<Period> criteria =
OBDal.getInstance().createCriteria(Period.class);
+ criteria.add(Restrictions.eq(Period.PROPERTY_ORGANIZATION,
period.getOrganization()));
+ criteria.add(Restrictions.eq(Period.PROPERTY_CLIENT, period.getClient()));
+ criteria.add(Restrictions.ne(Period.PROPERTY_ID, period.getId()));
+ criteria.add(Restrictions.ge(Period.PROPERTY_ENDINGDATE,
period.getStartingDate()));
+ criteria.add(Restrictions.le(Period.PROPERTY_STARTINGDATE,
period.getEndingDate()));
+ criteria.add(Restrictions.eq(Period.PROPERTY_PERIODTYPE, "S"));
+ criteria.setMaxResults(1);
+
+ if (criteria.uniqueResult() != null) {
+ logger
+ .error("Period " + period.getId() + " is being saved and is
overlapping another period");
+ throw new OBException(Utility.messageBD(conn, "DatesOverlappedParams",
language)
+ .replace("%1", ((Period) criteria.uniqueResult()).getName())
+ .replace("%2", ((Period)
criteria.uniqueResult()).getYear().getFiscalYear()));
+ }
+ }
+}
\ No newline at end of file
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
