Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Made some changes to get the project build without problems:
Added git ignore rules for Eclipse project files.
Changed luaj-0.97 dependency to luaj-1.0.5 (the old version is not available anymore).
Fixed a number of incorrectly overloaded functions by renaming them (see: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6182950).
  • Loading branch information
woutgg committed Mar 15, 2012
1 parent 116011b commit f5e3e6a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .gitignore
@@ -0,0 +1,5 @@
# Ignore Eclipse project files
/*/.classpath
/*/.project
/*/.settings
/*/target
2 changes: 1 addition & 1 deletion application/pom.xml
Expand Up @@ -44,7 +44,7 @@
<dependency>
<groupId>net.sourceforge.luaj</groupId>
<artifactId>luaj-j2se</artifactId>
<version>0.97</version>
<version>1.0.5</version>
</dependency>

<dependency>
Expand Down
Expand Up @@ -38,7 +38,7 @@ public FullSubstitution match(Formula f) {
}

public Formula substitute(FullSubstitution s) {
Formula f = s.get(get());
Formula f = s.getFormula(get());
if (f != null)
return f;
return this;
Expand Down
Expand Up @@ -53,15 +53,15 @@ public Formula put(Variable<Formula> k, Formula v) {
return d_fsub.put(k, v);
}

public Formula get(Variable<Formula> k) {
public Formula getFormula(Variable<Formula> k) {
return d_fsub.get(k);
}

public Agent put(Variable<Agent> k, Agent v) {
return d_asub.put(k, v);
}

public Agent get(Variable<Agent> k) {
public Agent getAgent(Variable<Agent> k) {
return d_asub.get(k);
}

Expand Down
Expand Up @@ -59,7 +59,7 @@ public Label put(Variable<Label> k, Label v) {
return d_lsub.put(k, v);
}

public Label get(Variable<Label> k) {
public Label getLabel(Variable<Label> k) {
return d_lsub.get(k);
}

Expand All @@ -71,7 +71,7 @@ public World put(Variable<World> k, World v) {
return d_wsub.put(k, v);
}

public World get(Variable<World> k) {
public World getWorld(Variable<World> k) {
return d_wsub.get(k);
}

Expand All @@ -83,7 +83,7 @@ public Agent put(Variable<Agent> k, Agent v) {
return d_asub.put(k, v);
}

public Agent get(Variable<Agent> k) {
public Agent getAgent(Variable<Agent> k) {
return d_asub.get(k);
}

Expand Down

0 comments on commit f5e3e6a

Please sign in to comment.