Skip to content
This repository was archived by the owner on Jul 8, 2025. It is now read-only.

Commit 7dda588

Browse files
jomifredjomifred
committed
add show/hide
1 parent 7d4c292 commit 7dda588

File tree

3 files changed

+45
-15
lines changed

3 files changed

+45
-15
lines changed

‎src/agt/marcos.asl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
price(banana,20).
1+
price(banana,X) :- X = math.random * 100 + 20.
22

33
!start.
44
+!start

‎src/java/jacamo/web/RestAgArch.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.apache.curator.x.async.WatchMode;
1818
import org.apache.zookeeper.CreateMode;
1919

20-
import jacamo.infra.JaCaMoLauncher;
21-
import jacamo.infra.JaCaMoRuntimeServices;
2220
import jason.ReceiverNotFoundException;
2321
import jason.architecture.AgArch;
2422
import jason.asSemantics.Agent;
@@ -30,6 +28,8 @@
3028
import jason.asSyntax.StringTermImpl;
3129
import jason.asSyntax.Term;
3230
import jason.asSyntax.UnnamedVar;
31+
import jason.infra.centralised.BaseCentralisedMAS;
32+
import jason.infra.centralised.CentralisedRuntimeServices;
3333
import jason.mas2j.ClassParameters;
3434
import jason.runtime.RuntimeServices;
3535
import jason.runtime.Settings;
@@ -76,7 +76,7 @@ public void stop() {
7676
public RuntimeServices getRuntimeServices() {
7777
if (singRTS == null) {
7878
if (JCMRest.getZKHost() != null) {
79-
singRTS = new JaCaMoRuntimeServices(JaCaMoLauncher.getRunner()) {
79+
singRTS = new CentralisedRuntimeServices(BaseCentralisedMAS.getRunner()) {
8080
@Override
8181
public void dfRegister(String agName, String service, String type) {
8282
RestAgArch.this.dfRegister(agName, service, type);
@@ -95,7 +95,7 @@ public void dfSubscribe(String agName, String service, String type) {
9595
}
9696
@Override
9797
public String createAgent(String agName, String agSource, String agClass, List<String> archClasses, ClassParameters bbPars, Settings stts, Agent father) throws Exception {
98-
// delegate the to RTS defined in JaCaMo Launcher
98+
// delegate the to RTS defined, for instance, in JaCaMo Launcher
9999
return masRunner.getRuntimeServices().createAgent(agName, agSource, agClass, archClasses, bbPars, stts, father);
100100
}
101101
};

‎src/java/jacamo/web/RestImpl.java‎

Lines changed: 40 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,46 @@ public String getAgentsHtml() {
106106

107107
protected asl2html mindInspectorTransformerHTML = null;
108108
Map<String,Boolean> show = new HashMap<>();
109-
109+
{
110+
show.put("bels", true);
111+
show.put("annots", Config.get().getBoolean(Config.SHOW_ANNOTS));
112+
show.put("rules", false);
113+
show.put("evt", true);
114+
show.put("mb", true);
115+
show.put("int", true);
116+
show.put("int-details", false);
117+
}
118+
119+
@Path("/agents/{agentname}/hide")
120+
@GET
121+
@Produces(MediaType.TEXT_HTML)
122+
public String setHide(@PathParam("agentname") String agName,
123+
@QueryParam("bels") String bels,
124+
@QueryParam("rules") String rules,
125+
@QueryParam("int-details") String intd,
126+
@QueryParam("annots") String annots) {
127+
if (bels != null) show.put("bels",false);
128+
if (rules != null) show.put("rules",false);
129+
if (intd != null) show.put("int-details",false);
130+
if (annots != null) show.put("annots",false);
131+
return "<head><meta http-equiv=\"refresh\" content=\"0; URL='/agents/"+agName+"/all'\" /></head>ok";
132+
}
133+
134+
@Path("/agents/{agentname}/show")
135+
@GET
136+
@Produces(MediaType.TEXT_HTML)
137+
public String setShow(@PathParam("agentname") String agName,
138+
@QueryParam("bels") String bels,
139+
@QueryParam("rules") String rules,
140+
@QueryParam("int-details") String intd,
141+
@QueryParam("annots") String annots) {
142+
if (bels != null) show.put("bels",true);
143+
if (rules != null) show.put("rules",true);
144+
if (intd != null) show.put("int-details",true);
145+
if (annots != null) show.put("annots",true);
146+
return "<head><meta http-equiv=\"refresh\" content=\"0; URL='/agents/"+agName+"/all'\" /></head>ok";
147+
}
148+
110149
static String helpMsg1 = "Example: +bel; !goal; .send(bob,tell,hello); +{+!goal <- .print(ok) });";
111150

112151
@Path("/new_agent_form")
@@ -194,15 +233,6 @@ public String getAgentHtml(@PathParam("agentname") String agName) {
194233
if (mindInspectorTransformerHTML == null) {
195234
mindInspectorTransformerHTML = new asl2html("/xml/agInspection.xsl");
196235
}
197-
show.put("bels", true);
198-
show.put("annots", Config.get().getBoolean(Config.SHOW_ANNOTS));
199-
show.put("rules", true);
200-
show.put("evt", true);
201-
show.put("mb", true);
202-
show.put("int", true);
203-
show.put("int-details", true);
204-
//show.put("plan", plan);
205-
//show.put("plan-details", plan);
206236
for (String p: show.keySet())
207237
mindInspectorTransformerHTML.setParameter("show-"+p, show.get(p)+"");
208238
so.append( mindInspectorTransformerHTML.transform( JaCaMoLauncher.getRunner().getAg(agName).getTS().getAg().getAgState() )); // transform to HTML

0 commit comments

Comments
 (0)