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

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

Revision: 1159
          http://jason.svn.sourceforge.net/jason/?rev=1159&view=rev
Author:   jomifred
Date:     2008-03-17 16:30:54 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
in build.xml created to run the user project, calls user-init before init (and not before 
run)

Modified Paths:
--------------
    trunk/src/jason/asSyntax/Atom.java
    trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java
    trunk/src/templates/build-template.xml
    trunk/src/test/TermTest.java

Modified: trunk/src/jason/asSyntax/Atom.java
===================================================================
--- trunk/src/jason/asSyntax/Atom.java	2008-03-17 21:13:29 UTC (rev 1158)
+++ trunk/src/jason/asSyntax/Atom.java	2008-03-17 23:30:54 UTC (rev 1159)
@@ -131,8 +131,7 @@
         if (o == this) return true;
         if (o instanceof Structure) {
         	Structure s = (Structure)o;
-        	if (!getFunctor().equals(s.getFunctor())) return false;
-        	return s.isAtom();
+        	return s.isAtom() && getFunctor().equals(s.getFunctor());
         }
         return false;
     }

Modified: trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java
===================================================================
--- trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java	2008-03-17 21:13:29 UTC (rev 1158)
+++ trunk/src/jason/infra/centralised/CentralisedMASLauncherAnt.java	2008-03-17 23:30:54 UTC (rev 1159)
@@ -187,14 +187,15 @@
 		    if (apos < 0) {
 		        lib += "        <pathelement location=\""+cp+"\"/>\n";
 		    } else {
+		        cp = cp.replaceAll("\\\\", "/");
 		        String dir   = "${basedir}";
                 String files = cp;
-		        int spos = cp.lastIndexOf(File.separator);
+		        int spos = cp.lastIndexOf("/");
 		        if (spos >= 0 && spos < apos) {
 		            dir   = cp.substring(0,spos);
 		            files = cp.substring(spos+1);
 		        } else {
-		            spos = cp.lastIndexOf(File.separator+"**"); 
+		            spos = cp.lastIndexOf("/**"); 
 	                if (spos >= 0 && spos < apos) {
 	                    dir   = cp.substring(0,spos);
 	                    files = cp.substring(spos+1);

Modified: trunk/src/templates/build-template.xml
===================================================================
--- trunk/src/templates/build-template.xml	2008-03-17 21:13:29 UTC (rev 1158)
+++ trunk/src/templates/build-template.xml	2008-03-17 23:30:54 UTC (rev 1159)
@@ -33,6 +33,7 @@
 
     <target name="init">
         <mkdir dir="${build.dir}" />
+        <antcall target="user-init" />
     </target>
 
     <target name="compile" depends="init">
@@ -82,7 +83,6 @@
 
     <target name="run" depends="compile" >
         <echo message="Running project ${ant.project.name}" />
-        <antcall target="user-init" />
         <java classname="<PROJECT-RUNNER-CLASS>"
               failonerror="true" fork="yes" dir="${basedir}" >
             <classpath refid="project.classpath"/>

Modified: trunk/src/test/TermTest.java
===================================================================
--- trunk/src/test/TermTest.java	2008-03-17 21:13:29 UTC (rev 1158)
+++ trunk/src/test/TermTest.java	2008-03-17 23:30:54 UTC (rev 1159)
@@ -43,6 +43,7 @@
 		assertFalse(t1.equals(t2));
 		
 		t2.addTerm(new Atom("a"));
+		assertEquals(new Atom("a"),new Atom("a"));
 		assertTrue(t1.equals(t2));
         assertTrue(t2.equals(t1));
         assertEquals(t1.hashCode(),t2.hashCode());


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