bdi4jade

diff --git a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/AndPlanGoalDependency.java b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/AndPlanGoalDependency.java
index 9909ad2..fe6c921 100644
--- a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/AndPlanGoalDependency.java
+++ b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/AndPlanGoalDependency.java
@@ -33,7 +33,7 @@ import bdi4jade.plan.Plan;
  * means that this plan needs that all goals that it depends on must be achieved
  * so that the plan can be completed.
  * 
- * @author ingrid
+ * @author Ingrid Nunes
  */
 public class AndPlanGoalDependency extends PlanGoalDependency {
 

diff --git a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/OrPlanGoalDependency.java b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/OrPlanGoalDependency.java
index 18e8e0b..dadf82f 100644
--- a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/OrPlanGoalDependency.java
+++ b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/OrPlanGoalDependency.java
@@ -35,7 +35,7 @@ import bdi4jade.plan.Plan;
  * be achieved, this class stores the probability of each particular goal to be
  * achieved during the plan execution.
  * 
- * @author ingrid
+ * @author Ingrid Nunes
  */
 public class OrPlanGoalDependency extends PlanGoalDependency {
 

diff --git a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/PlanContribution.java b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/PlanContribution.java
index e8e2f6a..94b14e3 100644
--- a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/PlanContribution.java
+++ b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/PlanContribution.java
@@ -28,8 +28,7 @@ import bdi4jade.goal.Softgoal;
  * This class stores the probability of a plan promoting a value with respect to
  * a softgoal.
  * 
- * @author ingrid
- * 
+ * @author Ingrid Nunes
  */
 public class PlanContribution {
 

diff --git a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/PlanGoalDependency.java b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/PlanGoalDependency.java
index f0c24e3..6dfb0e4 100644
--- a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/PlanGoalDependency.java
+++ b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/PlanGoalDependency.java
@@ -28,7 +28,7 @@ import bdi4jade.plan.Plan;
  * This abstract class has the common properties and operations of all kinds of
  * plan-goal dependency.
  * 
- * @author ingrid
+ * @author Ingrid Nunes
  */
 public abstract class PlanGoalDependency {
 

diff --git a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/SoftgoalPreferences.java b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/SoftgoalPreferences.java
index 7da8c38..8cc79d7 100644
--- a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/SoftgoalPreferences.java
+++ b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/SoftgoalPreferences.java
@@ -32,7 +32,7 @@ import bdi4jade.goal.Softgoal;
  * This is an agent transient belief (@see {@link TransientBelief}) that stores
  * the preferences for softgoals.
  * 
- * @author ingrid
+ * @author Ingrid Nunes
  */
 public class SoftgoalPreferences extends TransientBelief<Map<Softgoal, Double>> {
 

diff --git a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/UtilityBasedPlanSelectionStrategy.java b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/UtilityBasedPlanSelectionStrategy.java
index af9d8b0..6ca05c5 100644
--- a/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/UtilityBasedPlanSelectionStrategy.java
+++ b/bdi-jade/src/bdi4jade/extension/planselection/utilitybased/UtilityBasedPlanSelectionStrategy.java
@@ -40,17 +40,15 @@ import bdi4jade.reasoning.PlanSelectionStrategy;
  * selects the plan that has the best expected value based on the plan
  * contributions and the agent current preferences.
  * 
- * @author ingrid
+ * @author Ingrid Nunes
  */
 public class UtilityBasedPlanSelectionStrategy extends
 		AbstractReasoningStrategy implements PlanSelectionStrategy {
 
 	private final Log log;
-	private final UtilityBasedBDIAgent myAgent;
 
-	public UtilityBasedPlanSelectionStrategy(UtilityBasedBDIAgent myAgent) {
+	public UtilityBasedPlanSelectionStrategy() {
 		this.log = LogFactory.getLog(getClass());
-		this.myAgent = myAgent;
 	}
 
 	@SuppressWarnings("unchecked")

diff --git a/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationAgent.java b/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationAgent.java
index 51de8ee..d3f9c19 100644
--- a/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationAgent.java
+++ b/bdi-jade-test/src/bdi4jade/examples/planselection/TransportationAgent.java
@@ -30,7 +30,7 @@ import org.apache.commons.logging.LogFactory;
 import bdi4jade.belief.TransientBelief;
 import bdi4jade.core.SingleCapabilityAgent;
 import bdi4jade.extension.planselection.utilitybased.SoftgoalPreferences;
-import bdi4jade.extension.planselection.utilitybased.UtilityBasedBDIAgent;
+import bdi4jade.extension.planselection.utilitybased.UtilityBasedCabability;
 import bdi4jade.goal.Softgoal;
 import bdi4jade.plan.Plan;
 
@@ -48,7 +48,7 @@ public class TransportationAgent extends SingleCapabilityAgent {
 	private final Random rand;
 
 	public TransportationAgent() {
-		super(new UtilityBasedBDIAgent());
+		super(new UtilityBasedCabability());
 		this.log = LogFactory.getLog(this.getClass());
 		this.rand = new Random(System.currentTimeMillis());
 	}

diff --git a/bdi-jade-test/src/bdi4jade/examples/template/goal/MyGoal.java b/bdi-jade-test/src/bdi4jade/examples/template/goal/MyGoal.java
index e2d81ec..129724b 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/goal/MyGoal.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/goal/MyGoal.java
@@ -22,12 +22,14 @@
 
 package bdi4jade.examples.template.goal;
 
+import bdi4jade.annotation.GoalOwner;
+import bdi4jade.examples.template.MyCapability;
 import bdi4jade.goal.Goal;
 
 /**
- * @author ingrid
- * 
+ * @author Ingrid Nunes
  */
+@GoalOwner(capability = MyCapability.class)
 public class MyGoal implements Goal {
 
 	private static final long serialVersionUID = -659551255690904618L;

diff --git a/bdi-jade-test/src/bdi4jade/examples/template/MyAgentSoftgoals.java b/bdi-jade-test/src/bdi4jade/examples/template/MyAgentSoftgoals.java
index 1ec5efa..cc5bbb9 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/MyAgentSoftgoals.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/MyAgentSoftgoals.java
@@ -26,8 +26,7 @@ import bdi4jade.goal.NamedSoftgoal;
 import bdi4jade.goal.Softgoal;
 
 /**
- * @author ingrid
- * 
+ * @author Ingrid Nunes
  */
 public class MyAgentSoftgoals {
 

diff --git a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java
index 9e74c22..7f63b7b 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1.java
@@ -34,8 +34,7 @@ import bdi4jade.goal.Softgoal;
 import bdi4jade.plan.DefaultPlan;
 
 /**
- * @author ingrid
- * 
+ * @author Ingrid Nunes
  */
 public class MyPlan1 extends DefaultPlan {
 

diff --git a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1Body.java b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1Body.java
index 0a125bf..0161851 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1Body.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan1Body.java
@@ -26,8 +26,7 @@ import bdi4jade.plan.Plan.EndState;
 import bdi4jade.plan.planbody.AbstractPlanBody;
 
 /**
- * @author ingrid
- * 
+ * @author Ingrid Nunes
  */
 public class MyPlan1Body extends AbstractPlanBody {
 

diff --git a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java
index 9072b54..82e313c 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2.java
@@ -34,8 +34,7 @@ import bdi4jade.goal.Softgoal;
 import bdi4jade.plan.DefaultPlan;
 
 /**
- * @author ingrid
- * 
+ * @author Ingrid Nunes
  */
 public class MyPlan2 extends DefaultPlan {
 

diff --git a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2Body.java b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2Body.java
index 44514f1..800c3b4 100644
--- a/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2Body.java
+++ b/bdi-jade-test/src/bdi4jade/examples/template/plan/MyPlan2Body.java
@@ -26,8 +26,7 @@ import bdi4jade.plan.Plan.EndState;
 import bdi4jade.plan.planbody.AbstractPlanBody;
 
 /**
- * @author ingrid
- * 
+ * @author Ingrid Nunes
  */
 public class MyPlan2Body extends AbstractPlanBody {