projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc90586
)
only complain about lack of ships for non-FleetWithDynamicShips fleets
author
megacz
<adam@megacz.com>
Thu, 8 Jan 2009 10:35:14 +0000
(
02:35
-0800)
committer
megacz
<adam@megacz.com>
Thu, 8 Jan 2009 10:35:14 +0000
(
02:35
-0800)
src/edu/berkeley/fleet/Main.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/fleet/Main.java
b/src/edu/berkeley/fleet/Main.java
index
b259d3e
..
42f678f
100644
(file)
--- a/
src/edu/berkeley/fleet/Main.java
+++ b/
src/edu/berkeley/fleet/Main.java
@@
-157,7
+157,7
@@
public class Main {
String testsection = sd.getSection("test");
if (testsection == null)
System.out.println("no test for " + sd.getName() + "!");
String testsection = sd.getSection("test");
if (testsection == null)
System.out.println("no test for " + sd.getName() + "!");
- else if (fleet.getShip(sd.getName(),0)==null)
+ else if (fleet.getShip(sd.getName(),0)==null && !(fleet instanceof edu.berkeley.fleet.assembler.Parser.FleetWithDynamicShips))
System.out.println("specified Fleet does not have any ships of type " + sd.getName());
else
runTest(fleet, new StringReader(testsection), sd.getName());
System.out.println("specified Fleet does not have any ships of type " + sd.getName());
else
runTest(fleet, new StringReader(testsection), sd.getName());