Menu
▾
▴
[Jason-developers] SF.net SVN: jason: [1347] trunk
|
From: <jom...@us...> - 2008-07-05 09:37:56
|
Revision: 1347
http://jason.svn.sourceforge.net/jason/?rev=1347&view=rev
Author: jomifred
Date: 2008-07-05 02:37:52 -0700 (Sat, 05 Jul 2008)
Log Message:
-----------
test all exampels/demos and fix some minor issues
Modified Paths:
--------------
trunk/demos/function/a.asl
trunk/demos/persistent-belief-base/VoidBB.java
trunk/demos/persistent-belief-base/bookstore.properties
trunk/examples/gold-miners-II/arch/MinerArch.java
trunk/src/jason/asSemantics/SuspendInternalAction.java
trunk/src/jason/infra/centralised/CentralisedAgArch.java
trunk/src/jason/jeditplugin/JasonID.java
trunk/src/jason/mas2j/MAS2JProject.java
trunk/src/jeditPlugin/Jason.props
trunk/src/jeditPlugin/actions.xml
Modified: trunk/demos/function/a.asl
===================================================================
--- trunk/demos/function/a.asl 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/demos/function/a.asl 2008-07-05 09:37:52 UTC (rev 1347)
@@ -32,7 +32,7 @@
/* Initial goals */
-//!show_predef_funtion.
+!show_predef_funtion.
!show_userdef_funtion.
/* Plans */
Modified: trunk/demos/persistent-belief-base/VoidBB.java
===================================================================
--- trunk/demos/persistent-belief-base/VoidBB.java 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/demos/persistent-belief-base/VoidBB.java 2008-07-05 09:37:52 UTC (rev 1347)
@@ -43,6 +43,7 @@
return new ArrayList<Literal>().iterator();
}
+ @Deprecated
public Iterator<Literal> getAll() {
return iterator();
}
@@ -59,6 +60,7 @@
return new ArrayList<Literal>().iterator();
}
+ @Deprecated
public Iterator<Literal> getRelevant(Literal l) {
return new ArrayList<Literal>().iterator();
}
Modified: trunk/demos/persistent-belief-base/bookstore.properties
===================================================================
--- trunk/demos/persistent-belief-base/bookstore.properties 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/demos/persistent-belief-base/bookstore.properties 2008-07-05 09:37:52 UTC (rev 1347)
@@ -1,5 +1,5 @@
#HSQL Database Engine
-#Tue Jan 08 10:15:50 CET 2008
+#Sat Jul 05 11:30:42 CEST 2008
hsqldb.script_format=0
runtime.gc_interval=0
sql.enforce_strict_size=false
Modified: trunk/examples/gold-miners-II/arch/MinerArch.java
===================================================================
--- trunk/examples/gold-miners-II/arch/MinerArch.java 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/examples/gold-miners-II/arch/MinerArch.java 2008-07-05 09:37:52 UTC (rev 1347)
@@ -4,7 +4,6 @@
import jason.RevisionFailedException;
import jason.architecture.AgArch;
import jason.asSemantics.Message;
-import jason.asSyntax.Atom;
import jason.asSyntax.Literal;
import jason.asSyntax.NumberTerm;
import jason.asSyntax.PredicateIndicator;
Modified: trunk/src/jason/asSemantics/SuspendInternalAction.java
===================================================================
--- trunk/src/jason/asSemantics/SuspendInternalAction.java 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/src/jason/asSemantics/SuspendInternalAction.java 2008-07-05 09:37:52 UTC (rev 1347)
@@ -3,6 +3,7 @@
import jason.asSyntax.InternalActionLiteral;
import jason.asSyntax.PlanBody;
import jason.asSyntax.PlanBodyImpl;
+import jason.asSyntax.Term;
import jason.asSyntax.PlanBody.BodyType;
import java.util.concurrent.TimeUnit;
@@ -31,6 +32,10 @@
return true;
}
+ public Object execute(TransitionSystem ts, Unifier un, Term[] args) throws Exception {
+ return false;
+ }
+
/**
* Suspend the current intention, put it in the PendingIntention (PI) structure and assigns it to a key.
*
Modified: trunk/src/jason/infra/centralised/CentralisedAgArch.java
===================================================================
--- trunk/src/jason/infra/centralised/CentralisedAgArch.java 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/src/jason/infra/centralised/CentralisedAgArch.java 2008-07-05 09:37:52 UTC (rev 1347)
@@ -233,6 +233,8 @@
// this is used by the .send internal action in stdlib
public void sendMsg(Message m) throws ReceiverNotFoundException {
// actually send the message
+ if (m.getSender() == null) m.setSender(getAgName());
+
CentralisedAgArch rec = masRunner.getAg(m.getReceiver());
if (rec == null) {
Modified: trunk/src/jason/jeditplugin/JasonID.java
===================================================================
--- trunk/src/jason/jeditplugin/JasonID.java 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/src/jason/jeditplugin/JasonID.java 2008-07-05 09:37:52 UTC (rev 1347)
@@ -627,8 +627,8 @@
ex.printStackTrace();
}
}
-
- public void createJar() {
+
+ public void runAntTask(String task) {
final Buffer b = getProjectBuffer();
if (b == null) {
textArea.setText("There is no Jason project opened!");
@@ -636,28 +636,12 @@
}
MAS2JProject project = parseProject(b);
if (project == null) // || !parseProjectAS(project)) {
- return;
- CentralisedMASLauncherAnt script = new CentralisedMASLauncherAnt("jar");
- script.setProject(project);
- if (script.writeScripts(false)) {
- new Thread(script, "Ant-Task").start();
- }
- }
-
- public void createJnlp() {
- final Buffer b = getProjectBuffer();
- if (b == null) {
- textArea.setText("There is no Jason project opened!");
return;
- }
- MAS2JProject project = parseProject(b);
- if (project == null) // || !parseProjectAS(project)) {
- return;
- CentralisedMASLauncherAnt script = new CentralisedMASLauncherAnt("jnlp");
+ CentralisedMASLauncherAnt script = new CentralisedMASLauncherAnt(task);
script.setProject(project);
if (script.writeScripts(false)) {
new Thread(script, "Ant-Task").start();
}
- }
-
+
+ }
}
Modified: trunk/src/jason/mas2j/MAS2JProject.java
===================================================================
--- trunk/src/jason/mas2j/MAS2JProject.java 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/src/jason/mas2j/MAS2JProject.java 2008-07-05 09:37:52 UTC (rev 1347)
@@ -198,7 +198,7 @@
r.add(getDirectory());
}
for (String p: sourcepaths) {
- if (isDefaultDirectory()) {
+ if (getDirectory().startsWith(".") || getDirectory().startsWith("/") || getDirectory().charAt(1) == ':') {
r.add(p);
} else {
r.add(getDirectory()+File.separator+p);
Modified: trunk/src/jeditPlugin/Jason.props
===================================================================
--- trunk/src/jeditPlugin/Jason.props 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/src/jeditPlugin/Jason.props 2008-07-05 09:37:52 UTC (rev 1347)
@@ -14,7 +14,7 @@
# application menu items
plugin.jason.jeditplugin.JasonIDPlugin.menu=jason - \
- jason.run-project jason.debug-project jason.stop-mas \
+ jason.run-project jason.debug-project jason.stop-mas jason.clean-project \
- \
jason.new-project \
jason.new-ag \
@@ -36,6 +36,7 @@
jason.new-ag.label=New Agent
jason.create-env.label=Create project environment
jason.new-ia.label=New internal action
+jason.clean-project.label=Clean Project
jason.edit-log.label=Edit log parameters
jason.asl2html.label=ASL to HTML
jason.asl2tex.label=ASL to LaTeX
Modified: trunk/src/jeditPlugin/actions.xml
===================================================================
--- trunk/src/jeditPlugin/actions.xml 2008-07-02 10:13:59 UTC (rev 1346)
+++ trunk/src/jeditPlugin/actions.xml 2008-07-05 09:37:52 UTC (rev 1347)
@@ -27,6 +27,12 @@
wm.getDockable(jason.jeditplugin.JasonIDPlugin.NAME).newProject();
</CODE>
</ACTION>
+ <ACTION NAME="jason.clean-project">
+ <CODE>
+ wm.addDockableWindow(jason.jeditplugin.JasonIDPlugin.NAME);
+ wm.getDockable(jason.jeditplugin.JasonIDPlugin.NAME).runAntTask("clean");
+ </CODE>
+ </ACTION>
<ACTION NAME="jason.new-ag">
<CODE>
wm.addDockableWindow(jason.jeditplugin.JasonIDPlugin.NAME);
@@ -66,13 +72,13 @@
<ACTION NAME="jason.create-jar">
<CODE>
wm.addDockableWindow(jason.jeditplugin.JasonIDPlugin.NAME);
- wm.getDockable(jason.jeditplugin.JasonIDPlugin.NAME).createJar();
+ wm.getDockable(jason.jeditplugin.JasonIDPlugin.NAME).runAntTask("jar");
</CODE>
</ACTION>
<ACTION NAME="jason.create-jnlp">
<CODE>
wm.addDockableWindow(jason.jeditplugin.JasonIDPlugin.NAME);
- wm.getDockable(jason.jeditplugin.JasonIDPlugin.NAME).createJnlp();
+ wm.getDockable(jason.jeditplugin.JasonIDPlugin.NAME).runAntTask("jnlp");
</CODE>
</ACTION>
</ACTIONS>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
