Commit 30001194 authored by Philippe Merle's avatar Philippe Merle

Moved to Fscript 2.1.3.

TODO: Found a Guava equivalence to the Google Collections Comparators class.
parent 9e3bf39b
...@@ -47,6 +47,7 @@ OW2 FraSCAti 1.4 ...@@ -47,6 +47,7 @@ OW2 FraSCAti 1.4
* Moved to OW2 FraSCAti Tinfi 1.4.2-SNAPSHOT, * Moved to OW2 FraSCAti Tinfi 1.4.2-SNAPSHOT,
OW2 Fractal Juliac 2.2.6, OW2 Fractal Juliac 2.2.6,
OW2 Fractal Binding Factory 0.9-SNAPSHOT, OW2 Fractal Binding Factory 0.9-SNAPSHOT,
OW2 FScript 2.1.3,
Apache CXF 2.3.0, Apache CXF 2.3.0,
Spring Framework 3.0.4, Spring Framework 3.0.4,
EasyBPEL 1.4-SNAPSHOT, EasyBPEL 1.4-SNAPSHOT,
......
...@@ -53,7 +53,8 @@ import org.ow2.frascati.fscript.console.commands.AbstractCommand; ...@@ -53,7 +53,8 @@ import org.ow2.frascati.fscript.console.commands.AbstractCommand;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Preconditions; import com.google.common.base.Preconditions;
import com.google.common.collect.Comparators; // TODO: Following is not present into Google Guava.
// import com.google.common.collect.Comparators;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
/** /**
...@@ -231,6 +232,8 @@ public class TextConsole ...@@ -231,6 +232,8 @@ public class TextConsole
newline(); newline();
List<Command> sortedCmds = Lists.newArrayList(commands.values()); List<Command> sortedCmds = Lists.newArrayList(commands.values());
/*
// TODO: Comparators is not present into Google Guava.
Collections.sort(sortedCmds, Comparators Collections.sort(sortedCmds, Comparators
.fromFunction(new Function<Command, String>() { .fromFunction(new Function<Command, String>() {
public final String apply(Command cmd) public final String apply(Command cmd)
...@@ -238,7 +241,7 @@ public class TextConsole ...@@ -238,7 +241,7 @@ public class TextConsole
return cmd.getName(); return cmd.getName();
} }
})); }));
*/
String[][] table = new String[sortedCmds.size() + 1][2]; String[][] table = new String[sortedCmds.size() + 1][2];
table[0][0] = "Command"; table[0][0] = "Command";
table[0][1] = "Description"; table[0][1] = "Description";
......
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
<fractal-adl.version>2.3.1</fractal-adl.version> <fractal-adl.version>2.3.1</fractal-adl.version>
<fractal-util.version>1.1.2</fractal-util.version> <fractal-util.version>1.1.2</fractal-util.version>
<fractal-bf.version>0.9-SNAPSHOT</fractal-bf.version> <fractal-bf.version>0.9-SNAPSHOT</fractal-bf.version>
<fscript.version>2.1.2</fscript.version> <fscript.version>2.1.3</fscript.version>
<cxf.version>2.3.0</cxf.version> <cxf.version>2.3.0</cxf.version>
<jetty.version>7.1.6.v20100715</jetty.version> <jetty.version>7.1.6.v20100715</jetty.version>
<spring.version>3.0.4.RELEASE</spring.version> <spring.version>3.0.4.RELEASE</spring.version>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment