Revision 21:8c0f58f8fdd4

View differences:

pom.xml
481 481
			<groupId>net.penril</groupId>
482 482
			<artifactId>m2u-upass-core</artifactId>
483 483
			<version>2.0-SNAPSHOT</version>
484
			<type>jar</type>
485
			<scope>compile</scope>
486 484
		</dependency>
487 485
		<dependency>
488 486
			<groupId>net.penril</groupId>
src/com/ib/ibss/enterprise/services/IBSSEnterpriseServicesWorkspace.java
10 10
 */
11 11
package com.ib.ibss.enterprise.services;
12 12

  
13
import my.com.upass.dao.ConfigurationDAO;
14
import my.com.upass.dao.DAOFactory;
15

  
13 16
import com.ib.ibss.hibernate.tables.HibernateDAOFactory;
14 17
import com.ib.ibss.struts.utils.IBSSDynaBean;
15 18
import com.ib.ibss.struts.utils.IBSSSessionObjects;
......
159 162
//		c_oUPassServiceBib = new UPassServiceImpl ("UPassClientBib.cfg");
160 163
		return c_oUPassServiceBib;
161 164
	}
165

  
166
	public ConfigurationDAO getTbAmConfigDAO() throws Exception {
167
		return DAOFactory.instance().getConfigurationDAO();
168
	}
162 169
}
src/com/ib/ibss/hibernate/tables/DAOFactory.java
10 10
 */
11 11
package com.ib.ibss.hibernate.tables;
12 12

  
13

  
14
import my.com.upass.dao.ConfigurationDAO;
15
import my.com.upass.dao.UserTokenDAO;
16 13
import net.penril.bib.core.BibApprovalMatrixDAO;
17 14
import net.penril.bib.core.BibApproverStatusDAO;
18 15
import net.penril.bib.core.BibBillPaymentHistoryDAO;
......
95 92
/**
96 93
 * DAO Factory to connect to database
97 94
 */
98
public abstract class DAOFactory 
99
{
95
public abstract class DAOFactory {
100 96
	public static final Class<HibernateDAOFactory> HIBERNATE = HibernateDAOFactory.class;
101
	
102
	public static DAOFactory instance(Class<?> factory) throws Exception
103
	{
104
		try 
105
		{
106
			return (DAOFactory)factory.newInstance();
107
		} 
108
		catch (Exception ex) 
109
		{
110
			IBSSLogger.error (DAOFactory.class, IBSSErrorHandler.generateErrorMessage (ex));
97

  
98
	public static DAOFactory instance(Class<?> factory) throws Exception {
99
		try {
100
			return (DAOFactory) factory.newInstance();
101

  
102
		} catch (Exception ex) {
103
			IBSSLogger.error(DAOFactory.class, IBSSErrorHandler.generateErrorMessage(ex));
111 104
			throw new RuntimeException("Couldn't create DAOFactory: " + factory);
112 105
		}
113 106
	}
114
	
107

  
115 108
	public abstract AdminNavigationDAO getAdminNavigationDAO();
109

  
116 110
	public abstract AdminNavigationGroupDAO getAdminNavigationGroupDAO();
111

  
117 112
	public abstract AdminGroupDAO getAdminGroupDAO();
113

  
118 114
	public abstract AdminUserProfileDAO getAdminUserProfileDAO();
115

  
119 116
	public abstract UserDAO getMainProfileDAO();
117

  
120 118
	public abstract RoleDAO getRoleDAO();
119

  
121 120
	public abstract UserProfileDAO getUserProfileDAO();
121

  
122 122
	public abstract OrganizationDAO getOrganizationDAO();
123

  
123 124
	public abstract AuditLogDAO getAuditLogDAO();
125

  
124 126
	public abstract GroupDAO getGroupDAO();
127

  
125 128
	public abstract NavigationGroupDAO getNavigationGroupDAO();
129

  
126 130
	public abstract NavigationDAO getNavigationDAO();
131

  
127 132
	public abstract ContentTypeDAO getContentTypeDAO();
133

  
128 134
	public abstract ContentCategoryDAO getContentCategoryDAO();
135

  
129 136
	public abstract BancnetContentDAO getBancnetContentDAO();
137

  
130 138
	public abstract BankBranchContentDAO getBankBranchContentDAO();
139

  
131 140
	public abstract CurrencyCodeContentDAO getCurrencyCodeContentDAO();
141

  
132 142
	public abstract PayeeContentDAO getPayeeContentDAO();
143

  
133 144
	public abstract ProductTypeContentDAO getProductTypeContentDAO();
145

  
134 146
	public abstract ServiceNoteContentDAO getServiceNoteContentDAO();
147

  
135 148
	public abstract ServiceListContentDAO getServiceListContentDAO();
149

  
136 150
	public abstract ServiceTypeContentDAO getServiceTypeDAO();
151

  
137 152
	public abstract TDTermContentDAO getTDTermContentDAO();
153

  
138 154
	public abstract TDInfoContentDAO getTDInfoContentDAO();
155

  
139 156
	public abstract AccountTypeContentDAO getAccountTypeContentDAO();
157

  
140 158
	public abstract IbUserTransactionHistoryDAO getUserTransactionHistoryDAO();
159

  
141 160
	public abstract AdminSecurityDAO getAdminSecurityDAO();
161

  
142 162
	public abstract SecurityQuestionContentDAO getSecurityQuestionContentDAO();
163

  
143 164
	public abstract IbBillPaymentDAO getBillPaymentDAO();
165

  
144 166
	public abstract IbInterbankTransferDAO getInterbankTransferDAO();
167

  
145 168
	public abstract IbIntrabankTransferDAO getIntrabankTransferDAO();
169

  
146 170
	public abstract IbRptListDAO getIbRptListDAO();
171

  
147 172
	public abstract NoticeInfoDAO getNoticeInfoContentDAO();
173

  
148 174
	public abstract MakerCheckerTransactionDAO getTrnxMasterDAO();
175

  
149 176
	public abstract CheckDigitDAO getCheckDigitDAO();
177

  
150 178
	public abstract IbSmsNotificationDAO getIbSmsNotificationDAO();
179

  
151 180
	public abstract IbBlockAtmDAO getIbBlockAtmDAO();
181

  
152 182
	public abstract IbRegistrationDAO getIbRegistrationDAO();
153 183

  
154
	public abstract ConfigurationDAO getTbAmConfigDAO();
155
	public abstract UserTokenDAO getTbAmVascoDAO();
156
	public abstract UserTokenDAO getTbAmGemaltoDAO();
157
	public abstract UserTokenDAO getTbAmSecureMetricDAO();
158 184
	public abstract UserDAO getUserDAO();
185

  
159 186
	public abstract OccupationDAO getOccupationDAO();
187

  
160 188
	public abstract IncomeRangeDAO getIncomeRangeDAO();
189

  
161 190
	public abstract EduLevelDAO getEduLevelDAO();
191

  
162 192
	public abstract SmsTableDAO getSmsTableDAO();
193

  
163 194
	public abstract IbUserTransactionHistoryDAO getIbUserTransctionHistoryDAO();
164 195

  
165
	public abstract CompanyDAO getCompanyDAO ();
166
	public abstract CompanyContactDAO getCompanyContactDAO ();
196
	public abstract CompanyDAO getCompanyDAO();
197

  
198
	public abstract CompanyContactDAO getCompanyContactDAO();
199

  
167 200
	public abstract BibCompanyChargesDAO getBibCompanyChargesDAO();
168
	public abstract AccountDAO getBibAccountDAO ();
201

  
202
	public abstract AccountDAO getBibAccountDAO();
203

  
169 204
	public abstract BibUserDAO getBibUserDAO();
205

  
170 206
	public abstract BibUserAccountDAO getBibUserAccountDAO();
207

  
171 208
	public abstract BibApprovalMatrixDAO getBibApprovalMatrixDAO();
209

  
172 210
	public abstract BibCompanyTokenDAO getBibCompanyTokenDAO();
211

  
173 212
	public abstract BibTransactionHistoryDAO getBibTransactionHistoryDAO();
213

  
174 214
	public abstract BibBillPaymentHistoryDAO getBibBillPaymentDAO();
215

  
175 216
	public abstract BibInterTransferHistoryDAO getBibInterbankTransferDAO();
217

  
176 218
	public abstract BibIntraTransferHistoryDAO getBibIntrabankTransferDAO();
219

  
177 220
	public abstract BibFdPlacementHistoryDAO getBibFdPlacementDAO();
221

  
178 222
	public abstract BibFdUpliftmentHistoryDAO getBibFdUpliftmentDAO();
223

  
179 224
	public abstract TierChargesDAO getTieredChargesContentDAO();
225

  
180 226
	public abstract BibUserActivityDAO getBibUserActivityDAO();
227

  
181 228
	public abstract AdminNavigationActionDAO getAdminNavigationActionDAO();
229

  
182 230
	public abstract AdminActionDAO getAdminActionDAO();
231

  
183 232
	public abstract AdminPermissionDAO getAdminPermissionDAO();
233

  
184 234
	public abstract IbUserActivityDAO getIbUserActivityDAO();
235

  
185 236
	public abstract ZakatTypeDAO getZakatTypeDAO();
237

  
186 238
	public abstract BibApproverStatusDAO getApproverStatusDAO();
187 239

  
188 240
}
189

  
src/com/ib/ibss/hibernate/tables/HibernateDAOFactory.java
10 10
 */
11 11
package com.ib.ibss.hibernate.tables;
12 12

  
13
import my.com.upass.dao.ConfigurationDAO;
14
import my.com.upass.dao.UserTokenDAO;
15
import my.com.upass.dao.hibernate.ConfigurationDAOHibernate;
16
import my.com.upass.dao.hibernate.UserGemaltoDAOHibernate;
17
import my.com.upass.dao.hibernate.UserSecureMetricDAOHibernate;
18
import my.com.upass.dao.hibernate.UserVascoDAOHibernate;
19 13
import net.penril.bib.core.BibApprovalMatrixDAO;
20 14
import net.penril.bib.core.BibApproverStatusDAO;
21 15
import net.penril.bib.core.BibBillPaymentHistoryDAO;
......
158 152
import com.ib.ibss.common.utils.IBSSLogger;
159 153
import com.ib.ibss.error.handler.IBSSErrorHandler;
160 154

  
161

  
162 155
/**
163 156
 * 
164 157
 * PROGRAMMER: Danniell
......
174 167
 * The Hibernate DAO Factory to use hibernate persistent layer to connect
175 168
 * to database
176 169
 */
177
public class HibernateDAOFactory extends DAOFactory
178
{
170
public class HibernateDAOFactory extends DAOFactory {
179 171
	/**
180 172
	 * Classloader to instantiate a specific Data Access Object
181
	 *
182
	 * @param daoClass Given implementation class
173
	 * 
174
	 * @param daoClass
175
	 *            Given implementation class
183 176
	 * @return An instantiated DAO class for persistence
184 177
	 */
185
	private GenericDAOHibernate<?, ?> instantiateDAO(Class<?> daoClass) 
186
	{
187
		try 
188
		{
189
			GenericDAOHibernate<?, ?> dao = (GenericDAOHibernate<?, ?>)daoClass.newInstance();
178
	private GenericDAOHibernate<?, ?> instantiateDAO(Class<?> daoClass) {
179
		try {
180
			GenericDAOHibernate<?, ?> dao = (GenericDAOHibernate<?, ?>) daoClass.newInstance();
190 181
			return dao;
191
		} 
192
		catch (Exception ex) 
193
		{
194
			IBSSLogger.error (HibernateDAOFactory.class, IBSSErrorHandler.generateErrorMessage (ex));
195
			throw new RuntimeException( "Can not instantiate DAO: " + daoClass, ex);
182

  
183
		} catch (Exception ex) {
184
			IBSSLogger.error(HibernateDAOFactory.class, IBSSErrorHandler.generateErrorMessage(ex));
185
			throw new RuntimeException("Can not instantiate DAO: " + daoClass, ex);
196 186
		}
197 187
	}
198
	
188

  
199 189
	/**
200 190
	 * Get the Customer Profile Data Access Object (IB_CUST_PROFILE)
201
	 *
191
	 * 
202 192
	 * @return UserProfileDAO
203
	 *
193
	 * 
204 194
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getUserProfileDAO()
205 195
	 */
206 196
	@Override
207
	public UserProfileDAO getUserProfileDAO ()
208
	{
209
		return (UserProfileDAO) instantiateDAO (IbCustProfile.class);
197
	public UserProfileDAO getUserProfileDAO() {
198
		return (UserProfileDAO) instantiateDAO(IbCustProfile.class);
210 199
	}
211
	
200

  
212 201
	/**
213 202
	 * Get the Customer Organization Data Access Object (IB_ORGANIZATION)
214
	 *
203
	 * 
215 204
	 * @return OrganizationDAO
216
	 *
205
	 * 
217 206
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getOrganizationDAO()
218 207
	 */
219 208
	@Override
220
	public OrganizationDAO getOrganizationDAO ()
221
	{
222
		return (OrganizationDAO) instantiateDAO (IbOrganization.class);
209
	public OrganizationDAO getOrganizationDAO() {
210
		return (OrganizationDAO) instantiateDAO(IbOrganization.class);
223 211
	}
224
	
212

  
225 213
	/**
226 214
	 * Get the Audit Log Data Access Object (ADMIN_AUDIT_LOG)
227
	 *
215
	 * 
228 216
	 * @return AuditLogDAO
229
	 *
217
	 * 
230 218
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getAuditLogDAO()
231 219
	 */
232 220
	@Override
233
	public AuditLogDAO getAuditLogDAO ()
234
	{
235
		return (AuditLogDAO) instantiateDAO (AdminAuditLog.class);
221
	public AuditLogDAO getAuditLogDAO() {
222
		return (AuditLogDAO) instantiateDAO(AdminAuditLog.class);
236 223
	}
237 224

  
238 225
	/**
239 226
	 * Get the Customer Group Data Access Object (IB_GROUP)
240
	 *
227
	 * 
241 228
	 * @return GroupDAO
242
	 *
229
	 * 
243 230
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getGroupDAO()
244 231
	 */
245 232
	@Override
246
	public GroupDAO getGroupDAO ()
247
	{
248
		return (GroupDAO) instantiateDAO (IbGroup.class);
233
	public GroupDAO getGroupDAO() {
234
		return (GroupDAO) instantiateDAO(IbGroup.class);
249 235
	}
250 236

  
251 237
	/**
252 238
	 * Get the Admin Navigation Data Access Object (ADMIN_NAVIGATION)
253
	 *
239
	 * 
254 240
	 * @return AdminNavigationDAO
255
	 *
241
	 * 
256 242
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getAdminNavigationDAO()
257 243
	 */
258 244
	@Override
259
	public AdminNavigationDAO getAdminNavigationDAO ()
260
	{
261
		return (AdminNavigationDAO) instantiateDAO (AdminNavigation.class);
245
	public AdminNavigationDAO getAdminNavigationDAO() {
246
		return (AdminNavigationDAO) instantiateDAO(AdminNavigation.class);
262 247
	}
263 248

  
264 249
	/**
265 250
	 * Get the Admin Access Data Access Object (ADMIN_NAVIGATION_GROUP)
266
	 *
251
	 * 
267 252
	 * @return NavigationGroupDAO
268
	 *
253
	 * 
269 254
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getNavigationGroupDAO()
270 255
	 */
271 256
	@Override
272
	public NavigationGroupDAO getNavigationGroupDAO ()
273
	{
274
		return (NavigationGroupDAO) instantiateDAO (IbNavigationGroup.class);
257
	public NavigationGroupDAO getNavigationGroupDAO() {
258
		return (NavigationGroupDAO) instantiateDAO(IbNavigationGroup.class);
275 259
	}
276 260

  
277 261
	/**
278 262
	 * Get the Content Type Data Access Object (IB_CONTENT_TYPE)
279
	 *
263
	 * 
280 264
	 * @return ContentTypeDAO
281
	 *
265
	 * 
282 266
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getContentTypeDAO()
283 267
	 */
284 268
	@Override
285 269
	public ContentTypeDAO getContentTypeDAO() {
286
		
287
		return (ContentTypeDAO) instantiateDAO (IbContentType.class);
270

  
271
		return (ContentTypeDAO) instantiateDAO(IbContentType.class);
288 272
	}
289
	
273

  
290 274
	/**
291 275
	 * Get the Content Category Data Access Object (IB_CONTENT_CATEGORY)
292
	 *
276
	 * 
293 277
	 * @return ContentCategoryDAO
294
	 *
278
	 * 
295 279
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getContentCategoryDAO()
296 280
	 */
297 281
	@Override
298
	public ContentCategoryDAO getContentCategoryDAO(){
299
	
300
		return (ContentCategoryDAO) instantiateDAO (IbContentCategory.class);
282
	public ContentCategoryDAO getContentCategoryDAO() {
283

  
284
		return (ContentCategoryDAO) instantiateDAO(IbContentCategory.class);
301 285
	}
302 286

  
303 287
	/**
304 288
	 * Get the Bancnet Content Data Access Object (IB_BANCNET_LIST)
305
	 *
289
	 * 
306 290
	 * @return BancnetContentDAO
307
	 *
291
	 * 
308 292
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getBancnetContentDAO()
309 293
	 */
310 294
	@Override
311
	public BancnetContentDAO getBancnetContentDAO() 
312
	{
313
		return (BancnetContentDAO) instantiateDAO (IbBancnetList.class);
295
	public BancnetContentDAO getBancnetContentDAO() {
296
		return (BancnetContentDAO) instantiateDAO(IbBancnetList.class);
314 297
	}
315 298

  
316 299
	/**
317 300
	 * Get the Bank Branch Content Data Access Object (IB_BANK_BRANCH)
318
	 *
301
	 * 
319 302
	 * @return BankBranchContentDAO
320
	 *
303
	 * 
321 304
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getBankBranchContentDAO()
322 305
	 */
323 306
	@Override
324
	public BankBranchContentDAO getBankBranchContentDAO() 
325
	{
326
		return (BankBranchContentDAO) instantiateDAO (IbBankBranch.class);
307
	public BankBranchContentDAO getBankBranchContentDAO() {
308
		return (BankBranchContentDAO) instantiateDAO(IbBankBranch.class);
327 309
	}
328 310

  
329 311
	/**
330 312
	 * Get the Currency Code Content Data Access Object (IB_CURRENCY_CODE)
331
	 *
313
	 * 
332 314
	 * @return CurrencyCodeContentDAO
333
	 *
315
	 * 
334 316
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getCurrencyCodeContentDAO()
335 317
	 */
336 318
	@Override
337
	public CurrencyCodeContentDAO getCurrencyCodeContentDAO() 
338
	{
339
		return (CurrencyCodeContentDAO) instantiateDAO (IbCurrencyCode.class);
319
	public CurrencyCodeContentDAO getCurrencyCodeContentDAO() {
320
		return (CurrencyCodeContentDAO) instantiateDAO(IbCurrencyCode.class);
340 321
	}
341
	
322

  
342 323
	/**
343 324
	 * Get the Payee Content Data Access Object (IB_PAYEE)
344
	 *
325
	 * 
345 326
	 * @return PayeeContentDAO
346
	 *
327
	 * 
347 328
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getPayeeContentDAO()
348 329
	 */
349 330
	@Override
350
	public PayeeContentDAO getPayeeContentDAO() 
351
	{
352
		return (PayeeContentDAO) instantiateDAO (IbPayee.class);
353
	}
354
	
355
	public IbUserTransactionHistoryDAO getIbUserTransactionHistoryDAO() 
356
	{
357
		return (IbUserTransactionHistoryDAO) instantiateDAO (IbUserTransactionHistory.class);
331
	public PayeeContentDAO getPayeeContentDAO() {
332
		return (PayeeContentDAO) instantiateDAO(IbPayee.class);
358 333
	}
359 334

  
360
	
335
	public IbUserTransactionHistoryDAO getIbUserTransactionHistoryDAO() {
336
		return (IbUserTransactionHistoryDAO) instantiateDAO(IbUserTransactionHistory.class);
337
	}
338

  
361 339
	/**
362 340
	 * Get the Occupation Data Access Object (IB_OCCUPATION)
363
	 *
341
	 * 
364 342
	 * @return OccupationContentDAO
365
	 *
343
	 * 
366 344
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getOccupationDAO()
367 345
	 */
368 346
	@Override
369
	public OccupationDAO getOccupationDAO() 
370
	{
371
		return (OccupationDAO) instantiateDAO (IbOccupation.class);
347
	public OccupationDAO getOccupationDAO() {
348
		return (OccupationDAO) instantiateDAO(IbOccupation.class);
372 349
	}
373
	
350

  
374 351
	@Override
375
	public IncomeRangeDAO getIncomeRangeDAO() 
376
	{
377
		return (IncomeRangeDAO) instantiateDAO (IbIncomeRange.class);
352
	public IncomeRangeDAO getIncomeRangeDAO() {
353
		return (IncomeRangeDAO) instantiateDAO(IbIncomeRange.class);
378 354
	}
379
	
355

  
380 356
	@Override
381
	public EduLevelDAO getEduLevelDAO() 
382
	{
383
		return (EduLevelDAO) instantiateDAO (IbEduLevel.class);
357
	public EduLevelDAO getEduLevelDAO() {
358
		return (EduLevelDAO) instantiateDAO(IbEduLevel.class);
384 359
	}
385
	
360

  
386 361
	/**
387 362
	 * Get the Product Type Content Data Access Object (IB_PRODUCT_TYPE)
388
	 *
363
	 * 
389 364
	 * @return ProductTypeContentDAO
390
	 *
365
	 * 
391 366
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getProductTypeContentDAO()
392 367
	 */
393 368
	@Override
394
	public ProductTypeContentDAO getProductTypeContentDAO() 
395
	{
396
		return (ProductTypeContentDAO) instantiateDAO (IbProductType.class);
369
	public ProductTypeContentDAO getProductTypeContentDAO() {
370
		return (ProductTypeContentDAO) instantiateDAO(IbProductType.class);
397 371
	}
398 372

  
399 373
	/**
400 374
	 * Get the Service Info Content Data Access Object (IB_SERVICE_INFO)
401
	 *
375
	 * 
402 376
	 * @return ServiceNoteContentDAO
403 377
	 * 
404 378
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getServiceNoteContentDAO()
405 379
	 */
406 380
	@Override
407
	public ServiceNoteContentDAO getServiceNoteContentDAO() 
408
	{
409
		return (ServiceNoteContentDAO) instantiateDAO (IbServiceInfo.class);
381
	public ServiceNoteContentDAO getServiceNoteContentDAO() {
382
		return (ServiceNoteContentDAO) instantiateDAO(IbServiceInfo.class);
410 383
	}
411 384

  
412 385
	/**
413 386
	 * Get the IB Navigation Data Access Object (IB_NAVIGATION)
414
	 *
387
	 * 
415 388
	 * @return NavigationDAO
416
	 *
389
	 * 
417 390
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getNavigationDAO()
418 391
	 */
419 392
	@Override
420
	public NavigationDAO getNavigationDAO ()
421
	{
422
		return (NavigationDAO) instantiateDAO (IbNavigation.class);
393
	public NavigationDAO getNavigationDAO() {
394
		return (NavigationDAO) instantiateDAO(IbNavigation.class);
423 395
	}
424 396

  
425 397
	/**
426 398
	 * Get the Customer Role Data Access Object (IB_ROLE)
427
	 *
399
	 * 
428 400
	 * @return RoleDAO
429
	 *
401
	 * 
430 402
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getRoleDAO()
431 403
	 */
432 404
	@Override
433
	public RoleDAO getRoleDAO ()
434
	{
435
		return (RoleDAO) instantiateDAO (IbRole.class);
405
	public RoleDAO getRoleDAO() {
406
		return (RoleDAO) instantiateDAO(IbRole.class);
436 407
	}
437 408

  
438 409
	/**
439 410
	 * Get the Admin Group Data Access Object (ADMIN_GROUP)
440
	 *
411
	 * 
441 412
	 * @return AdminGroupDAO
442
	 *
413
	 * 
443 414
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getAdminGroupDAO()
444 415
	 */
445 416
	@Override
446
	public AdminGroupDAO getAdminGroupDAO ()
447
	{
448
		return (AdminGroupDAO) instantiateDAO (AdminGroup.class);
417
	public AdminGroupDAO getAdminGroupDAO() {
418
		return (AdminGroupDAO) instantiateDAO(AdminGroup.class);
449 419
	}
450 420

  
451 421
	/**
452 422
	 * Get the Admin Access Data Access Object (ADMIN_NAVIGATION_GROUP)
453
	 *
423
	 * 
454 424
	 * @return AdminNavigationGroupDAO
455
	 *
425
	 * 
456 426
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getAdminNavigationGroupDAO()
457 427
	 */
458 428
	@Override
459
	public AdminNavigationGroupDAO getAdminNavigationGroupDAO ()
460
	{
461
		return (AdminNavigationGroupDAO) instantiateDAO (AdminNavigationGroup.class);
429
	public AdminNavigationGroupDAO getAdminNavigationGroupDAO() {
430
		return (AdminNavigationGroupDAO) instantiateDAO(AdminNavigationGroup.class);
462 431
	}
463 432

  
464 433
	/**
465 434
	 * Get the Admin Profile Data Access Object (ADMIN_USER_PROFILE)
466
	 *
435
	 * 
467 436
	 * @return AdminProfileDAO
468
	 *
437
	 * 
469 438
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getAdminUserProfileDAO()
470 439
	 */
471 440
	@Override
472
	public AdminUserProfileDAO getAdminUserProfileDAO ()
473
	{
474
		return (AdminUserProfileDAO) instantiateDAO (AdminUserProfile.class);
441
	public AdminUserProfileDAO getAdminUserProfileDAO() {
442
		return (AdminUserProfileDAO) instantiateDAO(AdminUserProfile.class);
475 443
	}
476 444

  
477 445
	/**
478 446
	 * Get the Main User Profile Data Access Object (IB_USER)
479
	 *
447
	 * 
480 448
	 * @return UserDAO
481
	 *
449
	 * 
482 450
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getMainProfileDAO()
483 451
	 */
484 452
	@Override
485
	public UserDAO getMainProfileDAO ()
486
	{
487
		return (UserDAO) instantiateDAO (IbUser.class);
453
	public UserDAO getMainProfileDAO() {
454
		return (UserDAO) instantiateDAO(IbUser.class);
488 455
	}
489 456

  
490 457
	/**
491 458
	 * Get the Service List Data Access Object (IB_SERVICE_LIST)
492
	 *
459
	 * 
493 460
	 * @return ServiceListContentDAO
494
	 *
461
	 * 
495 462
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getServiceListContentDAO()
496 463
	 */
497 464
	@Override
498
	public ServiceListContentDAO getServiceListContentDAO ()
499
	{
500
		return (ServiceListContentDAO) instantiateDAO (IbServiceList.class);
465
	public ServiceListContentDAO getServiceListContentDAO() {
466
		return (ServiceListContentDAO) instantiateDAO(IbServiceList.class);
501 467
	}
502 468

  
503 469
	/**
504 470
	 * Get the TD Term Content Data Access Object (IB_TD_TERM)
505
	 *
471
	 * 
506 472
	 * @return TDTermContentDAO
507
	 *
473
	 * 
508 474
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getTDTermContentDAO()
509 475
	 */
510 476
	@Override
511
	public TDTermContentDAO getTDTermContentDAO ()
512
	{
513
		return (TDTermContentDAO) instantiateDAO (IbTdTerm.class);
477
	public TDTermContentDAO getTDTermContentDAO() {
478
		return (TDTermContentDAO) instantiateDAO(IbTdTerm.class);
514 479
	}
515
	
516
	public ITermContentDAO getITermContentDAO ()
517
	{
480

  
481
	public ITermContentDAO getITermContentDAO() {
518 482
		return (ITermContentDAO) instantiateDAO(IbITerm.class);
519 483
	}
520 484

  
521 485
	/**
522 486
	 * Get the Account Type Data Table Data Access Object (IB_ACCOUNT_TYPE)
523
	 *
487
	 * 
524 488
	 * @return AccountTypeContentDAO
525
	 *
489
	 * 
526 490
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getAccountTypeContentDAO()
527 491
	 */
528 492
	@Override
529
	public AccountTypeContentDAO getAccountTypeContentDAO ()
530
	{
531
		return (AccountTypeContentDAO) instantiateDAO (IbAccountType.class);
493
	public AccountTypeContentDAO getAccountTypeContentDAO() {
494
		return (AccountTypeContentDAO) instantiateDAO(IbAccountType.class);
532 495
	}
533 496

  
534 497
	/**
535 498
	 * Get the TD Data Table Data Access Object (IB_TD_INFO)
536
	 *
499
	 * 
537 500
	 * @return TDInfoContentDAO
538
	 *
501
	 * 
539 502
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getTDInfoContentDAO()
540 503
	 */
541 504
	@Override
542
	public TDInfoContentDAO getTDInfoContentDAO ()
543
	{
544
		return (TDInfoContentDAO) instantiateDAO (IbTdInfo.class);
505
	public TDInfoContentDAO getTDInfoContentDAO() {
506
		return (TDInfoContentDAO) instantiateDAO(IbTdInfo.class);
545 507
	}
546 508

  
547 509
	/**
548 510
	 * Get the Customer Transaction History Data Access Object (IB_USER_TRANSACTION_HISTORY)
549
	 *
511
	 * 
550 512
	 * @return IbUserTransactionHistoryDAO
551
	 *
513
	 * 
552 514
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getUserTransactionHistoryDAO()
553 515
	 */
554 516
	@Override
555
	public IbUserTransactionHistoryDAO getUserTransactionHistoryDAO ()
556
	{
557
		return (IbUserTransactionHistoryDAO) instantiateDAO (IbUserTransactionHistory.class);
517
	public IbUserTransactionHistoryDAO getUserTransactionHistoryDAO() {
518
		return (IbUserTransactionHistoryDAO) instantiateDAO(IbUserTransactionHistory.class);
558 519
	}
559 520

  
560 521
	/**
561 522
	 * Get the Service Type Data Table Data Access Object (IB_SERVICE_TYPE)
562
	 *
523
	 * 
563 524
	 * @return ServiceTypeContentDAO
564
	 *
525
	 * 
565 526
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getServiceTypeDAO()
566 527
	 */
567 528
	@Override
568
	public ServiceTypeContentDAO getServiceTypeDAO ()
569
	{
570
		return (ServiceTypeContentDAO) instantiateDAO (IbServiceType.class);
529
	public ServiceTypeContentDAO getServiceTypeDAO() {
530
		return (ServiceTypeContentDAO) instantiateDAO(IbServiceType.class);
571 531
	}
572
	
532

  
573 533
	/**
574 534
	 * Get the Service Type Data Table Data Access Object (ADMIN_USER_SECURITY)
575
	 *
535
	 * 
576 536
	 * @return AdminSecurityDAO
577
	 *
537
	 * 
578 538
	 * @see com.ib.ibss.hibernate.tables.DAOFactory#getAdminSecurityDAO()
579 539
	 */
580 540
	@Override
581
	public AdminSecurityDAO getAdminSecurityDAO ()
582
	{
583
		return (AdminSecurityDAO) instantiateDAO (AdminSecurity.class);
541
	public AdminSecurityDAO getAdminSecurityDAO() {
542
		return (AdminSecurityDAO) instantiateDAO(AdminSecurity.class);
584 543
	}
585 544

  
586 545
	@Override
587
	public SecurityQuestionContentDAO getSecurityQuestionContentDAO ()
588
	{
589
		return (SecurityQuestionContentDAO) instantiateDAO (IbSecQues.class);
546
	public SecurityQuestionContentDAO getSecurityQuestionContentDAO() {
547
		return (SecurityQuestionContentDAO) instantiateDAO(IbSecQues.class);
590 548
	}
591 549

  
592 550
	@Override
593
	public IbBillPaymentDAO getBillPaymentDAO ()
594
	{
595
		return (IbBillPaymentDAO) instantiateDAO (IbBillPayment.class);
551
	public IbBillPaymentDAO getBillPaymentDAO() {
552
		return (IbBillPaymentDAO) instantiateDAO(IbBillPayment.class);
596 553
	}
597 554

  
598 555
	@Override
599
	public IbInterbankTransferDAO getInterbankTransferDAO ()
600
	{
601
		return (IbInterbankTransferDAO) instantiateDAO (IbInterTransfer.class);
556
	public IbInterbankTransferDAO getInterbankTransferDAO() {
557
		return (IbInterbankTransferDAO) instantiateDAO(IbInterTransfer.class);
602 558
	}
603 559

  
604 560
	@Override
605
	public IbIntrabankTransferDAO getIntrabankTransferDAO ()
606
	{
607
		return (IbIntrabankTransferDAO) instantiateDAO (IbIntraTransfer.class);
608
	}
609
	
610
	@Override
611
	public IbRptListDAO getIbRptListDAO ()
612
	{		
613
		return (IbRptListDAO) instantiateDAO (IbRptList.class);
561
	public IbIntrabankTransferDAO getIntrabankTransferDAO() {
562
		return (IbIntrabankTransferDAO) instantiateDAO(IbIntraTransfer.class);
614 563
	}
615 564

  
616 565
	@Override
617
	public NoticeInfoDAO getNoticeInfoContentDAO ()
618
	{
619
		return (NoticeInfoDAO) instantiateDAO (IbNoticeInfo.class);
566
	public IbRptListDAO getIbRptListDAO() {
567
		return (IbRptListDAO) instantiateDAO(IbRptList.class);
620 568
	}
621 569

  
622 570
	@Override
623
	public MakerCheckerTransactionDAO getTrnxMasterDAO ()
624
	{
625
		return (MakerCheckerTransactionDAO) instantiateDAO (MkTrnxMaster.class);
571
	public NoticeInfoDAO getNoticeInfoContentDAO() {
572
		return (NoticeInfoDAO) instantiateDAO(IbNoticeInfo.class);
626 573
	}
627
	
574

  
628 575
	@Override
629
	public CheckDigitDAO getCheckDigitDAO ()
630
	{
631
		return (CheckDigitDAO) instantiateDAO (IbCheckDigit.class);
576
	public MakerCheckerTransactionDAO getTrnxMasterDAO() {
577
		return (MakerCheckerTransactionDAO) instantiateDAO(MkTrnxMaster.class);
632 578
	}
633
	
579

  
634 580
	@Override
635
	public IbSmsNotificationDAO getIbSmsNotificationDAO ()
636
	{
637
		return (IbSmsNotificationDAO) instantiateDAO (IbSmsNotification.class);
581
	public CheckDigitDAO getCheckDigitDAO() {
582
		return (CheckDigitDAO) instantiateDAO(IbCheckDigit.class);
638 583
	}
639
	
584

  
640 585
	@Override
641
	public IbBlockAtmDAO getIbBlockAtmDAO ()
642
	{
643
		return (IbBlockAtmDAO) instantiateDAO (IbBlockAtm.class);
586
	public IbSmsNotificationDAO getIbSmsNotificationDAO() {
587
		return (IbSmsNotificationDAO) instantiateDAO(IbSmsNotification.class);
644 588
	}
645
	
589

  
646 590
	@Override
647
	public IbRegistrationDAO getIbRegistrationDAO ()
648
	{
649
		return (IbRegistrationDAO) instantiateDAO (IbRegistration.class);
591
	public IbBlockAtmDAO getIbBlockAtmDAO() {
592
		return (IbBlockAtmDAO) instantiateDAO(IbBlockAtm.class);
650 593
	}
651
	
594

  
652 595
	@Override
653
	public UserDAO getUserDAO ()
654
	{
655
		return (UserDAO) instantiateDAO (IbUser.class);
596
	public IbRegistrationDAO getIbRegistrationDAO() {
597
		return (IbRegistrationDAO) instantiateDAO(IbRegistration.class);
656 598
	}
657
	
599

  
600
	@Override
601
	public UserDAO getUserDAO() {
602
		return (UserDAO) instantiateDAO(IbUser.class);
603
	}
604

  
658 605
	@Override
659 606
	public SmsTableDAO getSmsTableDAO() {
660
		return (SmsTableDAO) instantiateDAO (SmsTable.class);
607
		return (SmsTableDAO) instantiateDAO(SmsTable.class);
661 608
	}
662
	
609

  
663 610
	@Override
664
	public IbUserTransactionHistoryDAO getIbUserTransctionHistoryDAO ()
665
	{
666
		return (IbUserTransactionHistoryDAO) instantiateDAO (IbUserTransactionHistory.class);
611
	public IbUserTransactionHistoryDAO getIbUserTransctionHistoryDAO() {
612
		return (IbUserTransactionHistoryDAO) instantiateDAO(IbUserTransactionHistory.class);
667 613
	}
668
	
669
	public CompanyDAO getCompanyDAO ()
670
	{
671
		return (CompanyDAO) instantiateDAO (CompanyDAOImpl.class);
614

  
615
	public CompanyDAO getCompanyDAO() {
616
		return (CompanyDAO) instantiateDAO(CompanyDAOImpl.class);
672 617
	}
673
	
674
	public CompanyContactDAO getCompanyContactDAO ()
675
	{
676
		return (CompanyContactDAO) instantiateDAO (CompanyContactDAOImpl.class);
618

  
619
	public CompanyContactDAO getCompanyContactDAO() {
620
		return (CompanyContactDAO) instantiateDAO(CompanyContactDAOImpl.class);
677 621
	}
678
	
622

  
679 623
	@Override
680
	public BibCompanyChargesDAO getBibCompanyChargesDAO ()
681
	{
682
		return (BibCompanyChargesDAO) instantiateDAO (BibCompanyChargesDAOImpl.class);
624
	public BibCompanyChargesDAO getBibCompanyChargesDAO() {
625
		return (BibCompanyChargesDAO) instantiateDAO(BibCompanyChargesDAOImpl.class);
683 626
	}
684 627

  
685 628
	@Override
686 629
	public BibUserDAO getBibUserDAO() {
687
		return (BibUserDAO) instantiateDAO (BibUserDAOImpl.class);
630
		return (BibUserDAO) instantiateDAO(BibUserDAOImpl.class);
688 631
	}
689
	
632

  
690 633
	@Override
691 634
	public BibUserAccountDAO getBibUserAccountDAO() {
692
		return (BibUserAccountDAO) instantiateDAO (BibUserAccountDAOImpl.class);
635
		return (BibUserAccountDAO) instantiateDAO(BibUserAccountDAOImpl.class);
693 636
	}
694
	
637

  
695 638
	@Override
696
	public AccountDAO getBibAccountDAO ()
697
	{
698
		return (AccountDAO) instantiateDAO (AccountDAOImpl.class);
639
	public AccountDAO getBibAccountDAO() {
640
		return (AccountDAO) instantiateDAO(AccountDAOImpl.class);
699 641
	}
700 642

  
701 643
	@Override
702 644
	public BibApprovalMatrixDAO getBibApprovalMatrixDAO() {
703
		return (BibApprovalMatrixDAO) instantiateDAO (BibApprovalMatrixDAOImpl.class);
645
		return (BibApprovalMatrixDAO) instantiateDAO(BibApprovalMatrixDAOImpl.class);
704 646
	}
705 647

  
706 648
	@Override
707 649
	public BibCompanyTokenDAO getBibCompanyTokenDAO() {
708
		return (BibCompanyTokenDAO) instantiateDAO (BibCompanyTokenDAOImpl.class);
650
		return (BibCompanyTokenDAO) instantiateDAO(BibCompanyTokenDAOImpl.class);
709 651
	}
710 652

  
711 653
	@Override
712 654
	public BibTransactionHistoryDAO getBibTransactionHistoryDAO() {
713
		return (BibTransactionHistoryDAO) instantiateDAO (BibTransactionHistoryDAOImpl.class);
655
		return (BibTransactionHistoryDAO) instantiateDAO(BibTransactionHistoryDAOImpl.class);
714 656
	}
715 657

  
716 658
	@Override
717 659
	public BibBillPaymentHistoryDAO getBibBillPaymentDAO() {
718
		return (BibBillPaymentHistoryDAO) instantiateDAO (BibBillPaymentHistoryDAOImpl.class);
660
		return (BibBillPaymentHistoryDAO) instantiateDAO(BibBillPaymentHistoryDAOImpl.class);
719 661
	}
720 662

  
721 663
	@Override
......
738 680
		return (BibFdUpliftmentHistoryDAO) instantiateDAO(BibFdUpliftmentHistoryDAOImpl.class);
739 681
	}
740 682

  
741
	public BibBulkDirectHistoryDAO getBibBulkDirectHistoryDAO(){
742
		return (BibBulkDirectHistoryDAO)instantiateDAO(BibBulkDirectHistoryDAOImpl.class);
743
	}
744
	
745
	public BibBulkPayrollHistoryDAO getBibBulkPayrollHistoryDAO(){
746
		return (BibBulkPayrollHistoryDAO)instantiateDAO(BibBulkPayrollHistoryDAOImpl.class);
747
		
748
	}
749
	
750
	public BibBulkPaymentHistoryDAO getBibBulkPaymentHistoryDAO(){
751
		return (BibBulkPaymentHistoryDAO)instantiateDAO(BibBulkPaymentHistoryDAOImpl.class);
683
	public BibBulkDirectHistoryDAO getBibBulkDirectHistoryDAO() {
684
		return (BibBulkDirectHistoryDAO) instantiateDAO(BibBulkDirectHistoryDAOImpl.class);
752 685
	}
753 686

  
754
	public TierChargesDAO getTieredChargesContentDAO ()
687
	public BibBulkPayrollHistoryDAO getBibBulkPayrollHistoryDAO() {
688
		return (BibBulkPayrollHistoryDAO) instantiateDAO(BibBulkPayrollHistoryDAOImpl.class);
689

  
690
	}
691

  
692
	public BibBulkPaymentHistoryDAO getBibBulkPaymentHistoryDAO() {
693
		return (BibBulkPaymentHistoryDAO) instantiateDAO(BibBulkPaymentHistoryDAOImpl.class);
694
	}
695

  
696
	public TierChargesDAO getTieredChargesContentDAO()
755 697
	{
756
		return (TierChargesDAO) instantiateDAO (TierChargesDAOImpl.class);
698
		return (TierChargesDAO) instantiateDAO(TierChargesDAOImpl.class);
757 699
	}
758
	public ConfigurationDAO getTbAmConfigDAO ()
759
	{
760
		return (ConfigurationDAO) instantiateDAO (ConfigurationDAOHibernate.class);
761
	}
762
	
700

  
763 701
	@Override
764 702
	public BibUserActivityDAO getBibUserActivityDAO() {
765
		return (BibUserActivityDAO)instantiateDAO(BibUserActivityDAOImpl.class);
703
		return (BibUserActivityDAO) instantiateDAO(BibUserActivityDAOImpl.class);
766 704
	}
767
	
705

  
768 706
	@Override
769 707
	public IbUserActivityDAO getIbUserActivityDAO() {
770
		return (IbUserActivityDAO)instantiateDAO(IbUserActivity.class);
708
		return (IbUserActivityDAO) instantiateDAO(IbUserActivity.class);
771 709
	}
772
	
710

  
773 711
	@Override
774 712
	public AdminNavigationActionDAO getAdminNavigationActionDAO()
775 713
	{
776
		return (AdminNavigationActionDAO) instantiateDAO (AdminNavigationActionDAOImpl.class);
714
		return (AdminNavigationActionDAO) instantiateDAO(AdminNavigationActionDAOImpl.class);
777 715
	}
778
	
716

  
779 717
	@Override
780 718
	public AdminActionDAO getAdminActionDAO()
781 719
	{
782
		return (AdminActionDAO) instantiateDAO (AdminActionDAOImpl.class);
720
		return (AdminActionDAO) instantiateDAO(AdminActionDAOImpl.class);
783 721
	}
784 722

  
785 723
	@Override
786
	public UserTokenDAO getTbAmVascoDAO() 
787
	{
788
		return (UserTokenDAO) instantiateDAO (UserVascoDAOHibernate.class);
724
	public AdminPermissionDAO getAdminPermissionDAO() {
725
		return (AdminPermissionDAO) instantiateDAO(AdminPermissionDAOImpl.class);
789 726
	}
790
	
791
	@Override
792
	public UserTokenDAO getTbAmGemaltoDAO() 
793
	{
794
		return (UserTokenDAO) instantiateDAO (UserGemaltoDAOHibernate.class);
795
	}
796
	
797
	@Override
798
	public UserTokenDAO getTbAmSecureMetricDAO() 
799
	{
800
		return (UserTokenDAO) instantiateDAO (UserSecureMetricDAOHibernate.class);
801
	}
802
	
803
	@Override
804
	public AdminPermissionDAO getAdminPermissionDAO()
805
	{
806
		return (AdminPermissionDAO) instantiateDAO (AdminPermissionDAOImpl.class);
807
	}
808
	
727

  
809 728
	@Override
810 729
	public ZakatTypeDAO getZakatTypeDAO() {
811
		
812
		return (ZakatTypeDAO) instantiateDAO (IbZakatType.class);
730

  
731
		return (ZakatTypeDAO) instantiateDAO(IbZakatType.class);
813 732
	}
814
	
733

  
815 734
	@Override
816 735
	public BibApproverStatusDAO getApproverStatusDAO() {
817
		
818
		return (BibApproverStatusDAO) instantiateDAO (BibApproverStatusDAOImpl.class);
736

  
737
		return (BibApproverStatusDAO) instantiateDAO(BibApproverStatusDAOImpl.class);
819 738
	}
820 739

  
821 740
}

Also available in: Unified diff