[Jason-developers] SF.net SVN: jason:[1845] trunk/src/jason

[<jom...@us...>]

Revision: 1845
          http://sourceforge.net/p/jason/svn/1845
Author:   jomifred
Date:     2015-09-24 15:08:01 +0000 (Thu, 24 Sep 2015)
Log Message:
-----------
improve Jade Launcher

Modified Paths:
--------------
    trunk/src/jason/infra/jade/RunJadeMAS.java
    trunk/src/jason/jeditplugin/Config.java
    trunk/src/jason/mas2j/ClassParameters.java

Modified: trunk/src/jason/infra/jade/RunJadeMAS.java
===================================================================
--- trunk/src/jason/infra/jade/RunJadeMAS.java	2015-09-22 18:47:50 UTC (rev 1844)
+++ trunk/src/jason/infra/jade/RunJadeMAS.java	2015-09-24 15:08:01 UTC (rev 1845)
@@ -48,6 +48,7 @@
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Vector;
@@ -91,6 +92,7 @@
         runner.finish();
     }
     
+    
     @Override
     public int init(String[] args) {
         // test if a container is informed
@@ -113,6 +115,17 @@
             createAgs();
         }
     }
+
+    public void addInitArgs(String[] args) {
+        for (String a: args) {
+            initArgs.addAll( Arrays.asList(a.split(" ")));
+        }
+        for (String a: initArgs) {
+            if (a.equals("-sniffer")) {
+                Config.get().put(Config.JADE_SNIFFER, "true");
+            }
+        }
+    }
     
     @Override
     public void createButtons() {
@@ -228,8 +241,8 @@
                     String agName = ap.name;
                     if (ap.getHost() != null && targetContainer != null && !ap.getHost().equals(targetContainer))
                         continue; // skip this agent, it is not for this container
-                    if (ap.getHost() == null && !profile.getBooleanProperty(Profile.MAIN, true))
-                        continue; // skip this agent, agents without host will be placed in the main container
+                    if (ap.getHost() == null && !profile.getBooleanProperty(Profile.MAIN, true) && !Config.get().getClass().getName().equals("jacamo.util.Config"))
+                        continue; // skip this agent, agents without host will be placed in the main container (but not in JaCaMo)
     
                     // mind inspector arch
                     if (ap.getOption("mindinspector") != null) {

Modified: trunk/src/jason/jeditplugin/Config.java
===================================================================
--- trunk/src/jason/jeditplugin/Config.java	2015-09-22 18:47:50 UTC (rev 1844)
+++ trunk/src/jason/jeditplugin/Config.java	2015-09-24 15:08:01 UTC (rev 1845)
@@ -97,6 +97,7 @@
     protected static String    configFactory = null;
     
     public static void setClassFactory(String f) {
+        singleton = null;
         configFactory = f;
     }
     

Modified: trunk/src/jason/mas2j/ClassParameters.java
===================================================================
--- trunk/src/jason/mas2j/ClassParameters.java	2015-09-22 18:47:50 UTC (rev 1844)
+++ trunk/src/jason/mas2j/ClassParameters.java	2015-09-24 15:08:01 UTC (rev 1845)
@@ -1,11 +1,13 @@
 package jason.mas2j;
 
+import jason.asSyntax.Structure;
+import jason.asSyntax.Term;
+
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import jason.asSyntax.*;
-
 /** 
  * Used to store class parameters in .mas2j file, e.g. 
  *      environment: Mars(a,b,c); 
@@ -51,6 +53,9 @@
     public void addParameter(String s) {
         parameters.add(s);
     }
+    public Collection<String> getParameters() {
+        return parameters;
+    }
     public String getParameter(int index) {
         return parameters.get(index);
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.