[Exist-commits] eXist-1.0/src/org/exist/collections Collection.java,1.36,1.37

[Jean-Marc V. <jm...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/collections
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32538/src/org/exist/collections

Modified Files:
	Collection.java 
Log Message:
Refactoring: extract method (by eclipse):
	private Trigger setupTriggers(DBBroker broker, String name, DocumentImpl oldDoc) {


Index: Collection.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/collections/Collection.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Collection.java	9 Jul 2004 17:27:20 -0000	1.36
--- Collection.java	10 Jul 2004 11:01:09 -0000	1.37
***************
*** 720,739 ****
  			
  			// setup triggers
! 			Trigger trigger = null;
! 			if (triggersEnabled && !name.equals(COLLECTION_CONFIG_FILE)) {
! 				if (triggersEnabled) {
! 					CollectionConfiguration config = getConfiguration(broker);
! 					if (config != null) {
! 						if (oldDoc == null)
! 							trigger = config
! 									.getTrigger(Trigger.STORE_DOCUMENT_EVENT);
! 						else
! 							trigger = config
! 									.getTrigger(Trigger.UPDATE_DOCUMENT_EVENT);
! 					}
! 				}
! 			} else
! 				// set configuration to null if we are updating collection.xconf
! 				configuration = null;
  			Indexer indexer = new Indexer(broker);
  			indexer.setDocument(document);
--- 720,724 ----
  			
  			// setup triggers
! 			Trigger trigger = setupTriggers(broker, name, oldDoc);
  			Indexer indexer = new Indexer(broker);
  			indexer.setDocument(document);
***************
*** 937,956 ****
  
  			// setup triggers
! 			Trigger trigger = null;
! 			if (triggersEnabled && !name.equals(COLLECTION_CONFIG_FILE)) {
! 				if (triggersEnabled) {
! 					CollectionConfiguration config = getConfiguration(broker);
! 					if (config != null) {
! 						if (oldDoc == null)
! 							trigger = config
! 									.getTrigger(Trigger.STORE_DOCUMENT_EVENT);
! 						else
! 							trigger = config
! 									.getTrigger(Trigger.UPDATE_DOCUMENT_EVENT);
! 					}
! 				}
! 			} else
! 				// set configuration to null if we are updating collection.xconf
! 				configuration = null;
  			Indexer parser = new Indexer(broker);
  			parser.setDocument(document);
--- 922,926 ----
  
  			// setup triggers
! 			Trigger trigger = setupTriggers(broker, name, oldDoc);
  			Indexer parser = new Indexer(broker);
  			parser.setDocument(document);
***************
*** 1033,1037 ****
  		} finally {
  			lock.release();
! 		}
  
  		// reset the input source
--- 1003,1007 ----
  		} finally {
  			lock.release();
! 		}//ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
  
  		// reset the input source
***************
*** 1100,1120 ****
  			manageDocumentInformation(broker, name, oldDoc, document );
  			
! 			// setup triggers
! 			Trigger trigger = null;
! 			if (triggersEnabled && !name.equals(COLLECTION_CONFIG_FILE)) {
! 				if (triggersEnabled) {
! 					CollectionConfiguration config = getConfiguration(broker);
! 					if (config != null) {
! 						if (oldDoc == null)
! 							trigger = config
! 									.getTrigger(Trigger.STORE_DOCUMENT_EVENT);
! 						else
! 							trigger = config
! 									.getTrigger(Trigger.UPDATE_DOCUMENT_EVENT);
! 					}
! 				}
! 			} else
! 				// set configuration to null if we are updating collection.xconf
! 				configuration = null;
  			parser.setDocument(document);
  
--- 1070,1074 ----
  			manageDocumentInformation(broker, name, oldDoc, document );
  			
! 			Trigger trigger = setupTriggers(broker, name, oldDoc);
  			parser.setDocument(document);
  
***************
*** 1148,1152 ****
  			LOG.debug("validating document " + name);
  			streamer.serialize(node, true);
! 			document.setMaxDepth(document.getMaxDepth() + 1);
  			document.calculateTreeLevelStartPoints();
  			// new document is valid: remove old document 
--- 1102,1106 ----
  			LOG.debug("validating document " + name);
  			streamer.serialize(node, true);
! 			document.setMaxDepth(document.getMaxDepth() + 1);//ddddddddddddddddddd
  			document.calculateTreeLevelStartPoints();
  			// new document is valid: remove old document 
***************
*** 1182,1186 ****
  		} finally {
  			lock.release();
! 		}
  		try {
  			// second pass: store the document
--- 1136,1140 ----
  		} finally {
  			lock.release();
! 		}//ffffffffffffffffffffffffffffffffffffffffffffffff
  		try {
  			// second pass: store the document
***************
*** 1210,1213 ****
--- 1164,1194 ----
  	}
  
+ 	/**
+ 	 * @param broker
+ 	 * @param name
+ 	 * @param oldDoc
+ 	 * @return
+ 	 */
+ 	private Trigger setupTriggers(DBBroker broker, String name, DocumentImpl oldDoc) {
+ 		// setup triggers
+ 		Trigger trigger = null;
+ 		if (triggersEnabled && !name.equals(COLLECTION_CONFIG_FILE)) {
+ 			if (triggersEnabled) {
+ 				CollectionConfiguration config = getConfiguration(broker);
+ 				if (config != null) {
+ 					if (oldDoc == null)
+ 						trigger = config
+ 								.getTrigger(Trigger.STORE_DOCUMENT_EVENT);
+ 					else
+ 						trigger = config
+ 								.getTrigger(Trigger.UPDATE_DOCUMENT_EVENT);
+ 				}
+ 			}
+ 		} else
+ 			// set configuration to null if we are updating collection.xconf
+ 			configuration = null;
+ 		return trigger;
+ 	}
+ 
  	public BinaryDocument addBinaryResource(DBBroker broker,
  			String name, byte[] data) throws EXistException,