From efce7e30245131a9d446580b82768d53d5422bbd Mon Sep 17 00:00:00 2001 From: hodianto Date: Thu, 23 Aug 2018 15:42:55 +0700 Subject: [PATCH] Remove All Rejected File. --- .../factory/MID_CalloutFactory.java.rej | 11 --- .../factory/MID_ModelFactory.java.orig | 88 ------------------- .../factory/MID_ValidatorFactory.java.rej | 27 ------ .../factory/MID_CalloutFactory.java.rej | 11 --- .../factory/MID_ValidatorFactory.java.rej | 27 ------ 5 files changed, 164 deletions(-) delete mode 100644 andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_CalloutFactory.java.rej delete mode 100644 andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_ModelFactory.java.orig delete mode 100644 andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_ValidatorFactory.java.rej delete mode 100644 andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_CalloutFactory.java.rej delete mode 100644 andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ValidatorFactory.java.rej diff --git a/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_CalloutFactory.java.rej b/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_CalloutFactory.java.rej deleted file mode 100644 index 033e8d0..0000000 --- a/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_CalloutFactory.java.rej +++ /dev/null @@ -1,11 +0,0 @@ ---- MID_CalloutFactory.java -+++ MID_CalloutFactory.java -@@ -16,6 +18,8 @@ - List list = new ArrayList(); - if (tableName.equals(X_MID_RequisitionLine.Table_Name)) - list.add(new MID_CalloutRequisitionTrxLine()); -+ if(tableName.equals(MOrder.Table_Name)) -+ list.add(new MID_CalloutOrder()); - return list != null ? list.toArray(new IColumnCallout[0]) : new IColumnCallout[0]; - } - diff --git a/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_ModelFactory.java.orig b/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_ModelFactory.java.orig deleted file mode 100644 index 9e29b92..0000000 --- a/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_ModelFactory.java.orig +++ /dev/null @@ -1,88 +0,0 @@ -package andromedia.midsuit.factory; - -import java.lang.reflect.Constructor; -import java.sql.ResultSet; -import java.util.HashMap; -import java.util.Properties; - -import org.adempiere.base.IModelFactory; -import org.compiere.model.PO; -import org.compiere.util.Env; - -import andromedia.midsuit.model.MID_Aging; -import andromedia.midsuit.model.MID_MRequisitionTrx; -import andromedia.midsuit.model.MID_MRequisitionTrxLine; -import andromedia.midsuit.model.MID_PPO; -import andromedia.midsuit.model.X_zpos_Cashier; - -public class MID_ModelFactory implements IModelFactory{ - private static HashMap mapTableModels = new HashMap(); - static { - //Ex mapTableModels.put(MOrderLine.Table_Name, "org.semeru.project.model.SMT_MOrderLine"); - mapTableModels.put(MID_MRequisitionTrx.Table_Name, "andromedia.midsuit.model.MID_MRequisitionTrx"); - mapTableModels.put(MID_MRequisitionTrxLine.Table_Name, "andromedia.midsuit.model.MID_MRequisitionTrxLine"); - mapTableModels.put(X_zpos_Cashier.Table_Name, "andromedia.midsuit.model.X_zpos_Cashier"); -<<<<<<< working copy - mapTableModels.put(MID_Aging.Table_Name, "andromedia.midsuit.model.MID_Aging"); -======= -// mapTableModels.put(MID_Aging.Table_Name, "andromedia.midsuit.model.MID_Aging"); - mapTableModels.put(MID_PPO.Table_Name, "andromedia.midsuit.model.MID_PPO"); ->>>>>>> merge rev - } - - @Override - public Class getClass(String tableName) { - if (mapTableModels.containsKey(tableName)) { - Class act = null; - try { - act = Class.forName(mapTableModels.get(tableName)); - - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - return act; - } else { - return null; - } - - } - - @Override - public PO getPO(String tableName, int Record_ID, String trxName) { - if (mapTableModels.containsKey(tableName)) { - Class clazz = null; - Constructor ctor = null; - PO object = null; - try { - clazz = Class.forName(mapTableModels.get(tableName)); - ctor = clazz.getConstructor(Properties.class, int.class, String.class); - object = (PO) ctor.newInstance(new Object[] { Env.getCtx(), Record_ID, trxName }); - - } catch (Exception e) { - e.printStackTrace(); - } - return object; - } else - return null; - } - - @Override - public PO getPO(String tableName, ResultSet rs, String trxName) { - if (mapTableModels.containsKey(tableName)) { - Class clazz = null; - Constructor ctor = null; - PO object = null; - try { - clazz = Class.forName(mapTableModels.get(tableName)); - ctor = clazz.getConstructor(Properties.class, ResultSet.class, String.class); - object = (PO) ctor.newInstance(new Object[] { Env.getCtx(), rs, trxName }); - - } catch (Exception e) { - e.printStackTrace(); - } - return object; - } else - return null; - } - -} diff --git a/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_ValidatorFactory.java.rej b/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_ValidatorFactory.java.rej deleted file mode 100644 index 6ccef45..0000000 --- a/andromeida.midsuit.project/bin/andromedia/midsuit/factory/MID_ValidatorFactory.java.rej +++ /dev/null @@ -1,27 +0,0 @@ ---- MID_ValidatorFactory.java -+++ MID_ValidatorFactory.java -@@ -26,15 +26,15 @@ - - // if (getPO(event).get_TableName().equals(MOrderLandedCostAllocation.Table_Name)) - // msg = SMT_LandedCostAllocationValidator.executeEvent(event, getPO(event)); -- if (getPO(event).get_TableName().equals(MOrder.Table_Name)) -- msg = MID_OrderValidator.executeEvent(event, getPO(event)); -- if (getPO(event).get_TableName().equals(MRMA.Table_Name)) -- msg = MID_RMAValidator.executeEvent(event, getPO(event)); -- if(getPO(event).get_TableName().equals(MPaymentAllocate.Table_Name)) -- msg = MID_PaymentAllocateValidator.executeEvent(event, getPO(event)); -- if(getPO(event).get_TableName().equals(MProductPrice.Table_Name)) -- msg = MID_ProductPriceValidator.executeEvent(event, getPO(event)); -- logEvent(event, getPO(event), msg); -+// if (getPO(event).get_TableName().equals(MOrder.Table_Name)) -+// msg = MID_OrderValidator.executeEvent(event, getPO(event)); -+// if (getPO(event).get_TableName().equals(MRMA.Table_Name)) -+// msg = MID_RMAValidator.executeEvent(event, getPO(event)); -+// if(getPO(event).get_TableName().equals(MPaymentAllocate.Table_Name)) -+// msg = MID_PaymentAllocateValidator.executeEvent(event, getPO(event)); -+// if(getPO(event).get_TableName().equals(MProductPrice.Table_Name)) -+// msg = MID_ProductPriceValidator.executeEvent(event, getPO(event)); -+// logEvent(event, getPO(event), msg); - } - - private void logEvent(Event event, PO po, String msg) { diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_CalloutFactory.java.rej b/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_CalloutFactory.java.rej deleted file mode 100644 index 033e8d0..0000000 --- a/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_CalloutFactory.java.rej +++ /dev/null @@ -1,11 +0,0 @@ ---- MID_CalloutFactory.java -+++ MID_CalloutFactory.java -@@ -16,6 +18,8 @@ - List list = new ArrayList(); - if (tableName.equals(X_MID_RequisitionLine.Table_Name)) - list.add(new MID_CalloutRequisitionTrxLine()); -+ if(tableName.equals(MOrder.Table_Name)) -+ list.add(new MID_CalloutOrder()); - return list != null ? list.toArray(new IColumnCallout[0]) : new IColumnCallout[0]; - } - diff --git a/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ValidatorFactory.java.rej b/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ValidatorFactory.java.rej deleted file mode 100644 index 6ccef45..0000000 --- a/andromeida.midsuit.project/src/andromedia/midsuit/factory/MID_ValidatorFactory.java.rej +++ /dev/null @@ -1,27 +0,0 @@ ---- MID_ValidatorFactory.java -+++ MID_ValidatorFactory.java -@@ -26,15 +26,15 @@ - - // if (getPO(event).get_TableName().equals(MOrderLandedCostAllocation.Table_Name)) - // msg = SMT_LandedCostAllocationValidator.executeEvent(event, getPO(event)); -- if (getPO(event).get_TableName().equals(MOrder.Table_Name)) -- msg = MID_OrderValidator.executeEvent(event, getPO(event)); -- if (getPO(event).get_TableName().equals(MRMA.Table_Name)) -- msg = MID_RMAValidator.executeEvent(event, getPO(event)); -- if(getPO(event).get_TableName().equals(MPaymentAllocate.Table_Name)) -- msg = MID_PaymentAllocateValidator.executeEvent(event, getPO(event)); -- if(getPO(event).get_TableName().equals(MProductPrice.Table_Name)) -- msg = MID_ProductPriceValidator.executeEvent(event, getPO(event)); -- logEvent(event, getPO(event), msg); -+// if (getPO(event).get_TableName().equals(MOrder.Table_Name)) -+// msg = MID_OrderValidator.executeEvent(event, getPO(event)); -+// if (getPO(event).get_TableName().equals(MRMA.Table_Name)) -+// msg = MID_RMAValidator.executeEvent(event, getPO(event)); -+// if(getPO(event).get_TableName().equals(MPaymentAllocate.Table_Name)) -+// msg = MID_PaymentAllocateValidator.executeEvent(event, getPO(event)); -+// if(getPO(event).get_TableName().equals(MProductPrice.Table_Name)) -+// msg = MID_ProductPriceValidator.executeEvent(event, getPO(event)); -+// logEvent(event, getPO(event), msg); - } - - private void logEvent(Event event, PO po, String msg) {