[Jason-developers] SF.net SVN: jason:[1795] trunk

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

Revision: 1795
          http://sourceforge.net/p/jason/svn/1795
Author:   jomifred
Date:     2014-08-19 11:32:39 +0000 (Tue, 19 Aug 2014)
Log Message:
-----------
revert changes in Classparameters

Modified Paths:
--------------
    trunk/release-notes.txt
    trunk/src/jason/mas2j/ClassParameters.java
    trunk/src/jason/stdlib/suspend.java
    trunk/src/test/MAS2JParserTest.java

Modified: trunk/release-notes.txt
===================================================================
--- trunk/release-notes.txt	2014-08-18 21:37:10 UTC (rev 1794)
+++ trunk/release-notes.txt	2014-08-19 11:32:39 UTC (rev 1795)
@@ -1,12 +1,12 @@
 ---------------------------
 version 1.4.1
 
-revision X on SVN
+revision 1792 on SVN
 ---------------------------
 
 New features
 
-- web view of agent's mind (url usually is http://localhost:3272)
+- web view of agent's mind (the url usually is http://localhost:3272)
 
 
 ---------------------------

Modified: trunk/src/jason/mas2j/ClassParameters.java
===================================================================
--- trunk/src/jason/mas2j/ClassParameters.java	2014-08-18 21:37:10 UTC (rev 1794)
+++ trunk/src/jason/mas2j/ClassParameters.java	2014-08-19 11:32:39 UTC (rev 1795)
@@ -99,8 +99,8 @@
     
     public String toString() {
         StringBuilder out = new StringBuilder(className);
-        out.append("(");
         if (parameters.size() > 0) {
+            out.append("(");
             Iterator<String> i = parameters.iterator();
             while (i.hasNext()) {
                 out.append(i.next());
@@ -108,8 +108,8 @@
                     out.append(",");
                 }
             }
+            out.append(")");
         }
-        out.append(")");
         return out.toString();
     }
 

Modified: trunk/src/jason/stdlib/suspend.java
===================================================================
--- trunk/src/jason/stdlib/suspend.java	2014-08-18 21:37:10 UTC (rev 1794)
+++ trunk/src/jason/stdlib/suspend.java	2014-08-19 11:32:39 UTC (rev 1795)
@@ -137,7 +137,7 @@
         
         // suspending the current intention?
         Intention i = C.getSelectedIntention();
-        if (i.hasTrigger(g, un)) {
+        if (i != null && i.hasTrigger(g, un)) {
             suspendIntention = true;
             i.setSuspended(true);
             C.addPendingIntention(SELF_SUSPENDED_INT+i.getId(), i);

Modified: trunk/src/test/MAS2JParserTest.java
===================================================================
--- trunk/src/test/MAS2JParserTest.java	2014-08-18 21:37:10 UTC (rev 1794)
+++ trunk/src/test/MAS2JParserTest.java	2014-08-19 11:32:39 UTC (rev 1795)
@@ -19,9 +19,9 @@
      
     protected void setUp() throws Exception {
         super.setUp();
-        StringBuffer source = new StringBuffer("MAS auctionCent { ");
-        source.append("infrastructure: Centralised ");
-        source.append("environment: myEnv at \"x.edu\" ");
+        StringBuffer source = new StringBuffer("MAS auctionCent { \n");
+        source.append("infrastructure: Centralised \n");
+        source.append("environment: myEnv at \"x.edu\" \n");
         source.append("executionControl: myController ");
         source.append("agents: ag1 [events=discard,intBels=newFocus,osfile=\"a/x.xml\"]; ag2 /home/agTest.asl agentClass mypkg.MyAgent #2; ag3 at \"x.edu\"; auctionner agentArchClass AuctionnerGUI;");
         source.append("directives: md1=mypkg.DebugDirective; md2=mypkg.LogDirective;");
@@ -74,20 +74,27 @@
         parser = new mas2j(new StringReader(source.toString()));
 
         MAS2JProject project = parser.mas();
-        
         assertEquals(2,  project.getAg("bob").getBBClass().getParametersArray().length);
         
         ChainBB bb = new ChainBB();
         bb.init(null, project.getAg("bob").getBBClass().getParametersArray());
+        /*
         
-        bb.add(Literal.parseLiteral("b(1)"));
+        bb.add(Literal.parseLiteral("b(1)"));*/
     }
     
-    public void testClassDef() throws ParseException {
+    public void testClassDef1() throws ParseException {
         String archClass = "my.Arch(test)";
         mas2j parser = new mas2j(new StringReader(archClass));
         ClassParameters c = parser.classDef();
         assertEquals("my.Arch", c.getClassName());
         assertEquals(1,c.getParametersArray().length);
     }
+    public void testClassDef2() throws ParseException {
+        String archClass = "my.Arch()";
+        mas2j parser = new mas2j(new StringReader(archClass));
+        ClassParameters c = parser.classDef();
+        assertEquals("my.Arch", c.getClassName());
+        assertEquals(0,c.getParametersArray().length);
+    }
 }

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