Index: /issm/trunk/src/c/objects/Hook.cpp
===================================================================
--- /issm/trunk/src/c/objects/Hook.cpp	(revision 3385)
+++ /issm/trunk/src/c/objects/Hook.cpp	(revision 3386)
@@ -20,5 +20,6 @@
 
 
-/*FUNCTION Hook default constructor {{{1*/
+/*Constructor/Destructors*/
+/*FUNCTION Hook::Hook(){{{1*/
 Hook::Hook(){
 	this->num=0;
@@ -29,5 +30,5 @@
 }
 /*}}}*/
-/*FUNCTION Hook constructor {{{1*/
+/*FUNCTION Hook::Hook(int* ids, int num){{{1*/
 Hook::Hook(int* ids, int num){
 
@@ -43,8 +44,10 @@
 	for (i=0;i<this->num;i++){
 		this->ids[i]=ids[i];
-	}
-}
-/*}}}*/
-/*FUNCTION Hook sort of copy constructor {{{1*/
+		this->objects[i]=NULL;
+		this->offsets[i]=0;
+	}
+}
+/*}}}*/
+/*FUNCTION Hook::Hook(Object** hook_objects, int* hook_ids, int* hook_offsets,int hook_num){{{1*/
 Hook::Hook(Object** hook_objects, int* hook_ids, int* hook_offsets,int hook_num){
 
@@ -57,5 +60,5 @@
 }
 /*}}}*/
-/*FUNCTION Hook copy constructor {{{1*/
+/*FUNCTION Hook::Hook(Hook* input) {{{1*/
 Hook::Hook(Hook* input){
 
@@ -85,5 +88,5 @@
 }
 /*}}}*/
-/*FUNCTION Hook destructeur{{{1*/
+/*FUNCTION Hook::~Hook(){{{1*/
 Hook::~Hook(){
 	/*deallocate: */
@@ -94,5 +97,7 @@
 }
 /*}}}*/
-/*FUNCTION Hook Marshall{{{1*/
+
+/*Object marshalling*/
+/*FUNCTION Hook::Marshall{{{1*/
 void Hook::Marshall(char** pmarshalled_dataset){
 
@@ -121,5 +126,5 @@
 }
 /*}}}*/
-/*FUNCTION Hook MarshallSize{{{1*/
+/*FUNCTION Hook::MarshallSize{{{1*/
 int Hook::MarshallSize(){
 
@@ -131,5 +136,5 @@
 }
 /*}}}*/
-/*FUNCTION Hook Demarshall{{{1*/
+/*FUNCTION Hook::Demarshall{{{1*/
 void Hook::Demarshall(char** pmarshalled_dataset){
 
@@ -166,23 +171,7 @@
 }
 /*}}}*/
-/*FUNCTION Hook deliver{{{1*/
-Object* Hook::delivers(void){
-	
-	/*first, check that we only have one T object in our object list: */
-	if (this->num!=1) ISSMERROR(exprintf("%s%i%s\n"," trying to delivery a single hook object when hook holds ",this->num," objects"));
-
-	/*check NULL: */
-	if (this->objects=NULL)ISSMERROR("hook is not pointing to any object, objects pointer is NULL");
-
-	return *objects;
-}
-
-/*}}}*/
-/*FUNCTION Hook deliver{{{1*/
-Object** Hook::deliverp(void){
-	return objects;
-}
-/*}}}*/
-/*FUNCTION Hook ResolvePointers{{{1*/
+
+/*Object processing: */
+/*FUNCTION Hook::configure{{{1*/
 void Hook::configure(DataSet* dataset){
 
@@ -194,5 +183,5 @@
 
 		/*is this object id -1? If so, drop this search, it was not requested: */
-		if (this->ids[i]==-1)continue;
+		if (this->ids[i]==-1) continue;
 
 		/*Check whether existing this->objects are correct: */
@@ -218,10 +207,10 @@
 			this->objects[i]=(Object*)dataset->GetObjectById(this->offsets+i,this->ids[i]); //remember the offset for later on.
 			/*check the id is correct!: */
-			if (this->objects[i]->GetId()!=this->ids[i])ISSMERROR(exprintf("%s%i%s%i%s"," wrong id: ",this->objects[i]->GetId()," vs ",this->ids[i],"  in resolved pointer!"));
-		}
-	}
-}
-/*}}}*/
-/*FUNCTION Hook echo{{{1*/
+			if (this->objects[i]->GetId()!=this->ids[i]) ISSMERROR(exprintf("%s%i%s%i%s"," wrong id: ",this->objects[i]->GetId()," vs ",this->ids[i],"  in resolved pointer!"));
+		}
+	}
+}
+/*}}}*/
+/*FUNCTION Hook::Echo{{{1*/
 void Hook::Echo(void){
 
@@ -244,5 +233,5 @@
 }
 /*}}}*/
-/*FUNCTION Hook deep echo{{{1*/
+/*FUNCTION Hook::DeepEcho{{{1*/
 void Hook::DeepEcho(void){
 
@@ -270,5 +259,45 @@
 }
 /*}}}*/
-/*FUNCTION Hook Spawn{{{1*/
+
+/*Object functions*/
+/*FUNCTION Hook::delivers{{{1*/
+Object* Hook::delivers(void){
+	
+	/*first, check that we only have one T object in our object list: */
+	if (this->num!=1) ISSMERROR(exprintf("%s%i%s\n"," trying to delivery a single hook object when hook holds ",this->num," objects"));
+
+	/*check NULL: */
+	if (this->objects=NULL)ISSMERROR("hook is not pointing to any object, objects pointer is NULL");
+
+	return *objects;
+}
+
+/*}}}*/
+/*FUNCTION Hook::deliverp{{{1*/
+Object** Hook::deliverp(void){
+	return objects;
+}
+/*}}}*/
+/*FUNCTION Hook::GetIds{{{1*/
+int* Hook::GetIds(void){
+	return this->ids;
+}
+/*}}}*/
+/*FUNCTION Hook::GetNum{{{1*/
+int Hook::GetNum(void){
+	return this->num;
+}
+/*}}}*/
+/*FUNCTION Hook::GetObjects{{{1*/
+Object** Hook::GetObjects(void){
+	return this->objects;
+}
+/*}}}*/
+/*FUNCTION Hook::GetOffsets{{{1*/
+int* Hook::GetOffsets(void){
+	return this->offsets;
+}
+/*}}}*/
+/*FUNCTION Hook::Spawn{{{1*/
 Hook* Hook::Spawn(int* indices, int numindices){
 
@@ -298,22 +327,2 @@
 }
 /*}}}*/
-/*FUNCTION Hook GetObjects{{{1*/
-Object** Hook::GetObjects(void){
-	return this->objects;
-}
-/*}}}*/
-/*FUNCTION Hook GetIds{{{1*/
-int* Hook::GetIds(void){
-	return this->ids;
-}
-/*}}}*/
-/*FUNCTION Hook GetOffsets{{{1*/
-int* Hook::GetOffsets(void){
-	return this->offsets;
-}
-/*}}}*/
-/*FUNCTION Hook GetNum{{{1*/
-int Hook::GetNum(void){
-	return this->num;
-}
-/*}}}*/