# HG changeset patch # User one # Date 1349186116 -32400 # Node ID e113f946c9c1745d7e26489dbe54aef365c19247 # Parent 34ea98c5a18c3b6366d92d13a19f320b7a310d72 modified getUserClaims diff -r 34ea98c5a18c -r e113f946c9c1 app/models/NodeModel.java --- a/app/models/NodeModel.java Tue Oct 02 22:49:16 2012 +0900 +++ b/app/models/NodeModel.java Tue Oct 02 22:55:16 2012 +0900 @@ -23,17 +23,15 @@ public static final String L_AUTHOR = "author"; public static final String L_QUESTION = "question"; public static final String L_REFUTATION = "refutation"; - public static final String L_CLAIMS = "claims"; public static final String L_REQUEST = "request"; public static final String MAJORITY = "majority"; public static final String UNANIMOUSLY = "unanimously"; - public static final String CONSENSUS = "consensus"; /* - * Claim property + * Claim property key. */ public static final String TOULMIN = "toulmin"; public static final String TITLE = "title"; @@ -45,13 +43,17 @@ public static final String REBUTTLE = "r"; public static final String USERS = "users"; public static final String STATUS = "status"; - public static final String REQUESTS = "status"; - // Status statement + // Status statement public static final String PASS = "pass"; public static final String FAIL = "fail"; public static final String AGREED = "agreed"; public static final String DENIED = "denied"; + // Use This key Json Data + public static final String CLAIMS = "claims"; + public static final String REQUESTS = "REQUESTS"; + public static final String CONSENSUS = "consensus"; + public NodeModel(Vertex vertex) { this.vertex = vertex; diff -r 34ea98c5a18c -r e113f946c9c1 app/models/UserModel.java --- a/app/models/UserModel.java Tue Oct 02 22:49:16 2012 +0900 +++ b/app/models/UserModel.java Tue Oct 02 22:55:16 2012 +0900 @@ -28,7 +28,7 @@ } public Object[] getUserClaims() { - return getEdgeInUser(L_CLAIMS); + return getEdgeInUser(L_AUTHOR); } public Object[] getUserConsensus() { diff -r 34ea98c5a18c -r e113f946c9c1 logs/application.log --- a/logs/application.log Tue Oct 02 22:49:16 2012 +0900 +++ b/logs/application.log Tue Oct 02 22:55:16 2012 +0900 @@ -1,30 +1,12 @@ -2012-10-02 13:22:39,584 - [INFO] - from play in main +2012-10-02 22:48:04,594 - [INFO] - from play in main Listening for HTTP on port 9000... -2012-10-02 13:22:48,820 - [INFO] - from play in play-akka.actor.default-dispatcher-3 +2012-10-02 22:48:09,777 - [INFO] - from play in play-akka.actor.default-dispatcher-1 Application started (Dev) -2012-10-02 13:23:31,792 - [INFO] - from application in play-akka.actor.default-dispatcher-3 -Application shutdown... - -2012-10-02 13:23:31,805 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) - -2012-10-02 13:25:49,387 - [INFO] - from application in play-akka.actor.default-dispatcher-3 +2012-10-02 22:49:44,225 - [INFO] - from application in play-akka.actor.default-dispatcher-3 Application shutdown... -2012-10-02 13:25:49,414 - [INFO] - from play in play-akka.actor.default-dispatcher-3 +2012-10-02 22:49:44,238 - [INFO] - from play in play-akka.actor.default-dispatcher-3 Application started (Dev) -2012-10-02 13:29:31,473 - [INFO] - from application in play-akka.actor.default-dispatcher-3 -Application shutdown... - -2012-10-02 13:29:31,486 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) - -2012-10-02 13:48:27,846 - [INFO] - from application in play-akka.actor.default-dispatcher-3 -Application shutdown... - -2012-10-02 13:48:27,863 - [INFO] - from play in play-akka.actor.default-dispatcher-3 -Application started (Dev) - diff -r 34ea98c5a18c -r e113f946c9c1 target/scala-2.9.1/cache/compile/compile Binary file target/scala-2.9.1/cache/compile/compile has changed diff -r 34ea98c5a18c -r e113f946c9c1 target/streams/compile/compile/$global/out --- a/target/streams/compile/compile/$global/out Tue Oct 02 22:49:16 2012 +0900 +++ b/target/streams/compile/compile/$global/out Tue Oct 02 22:55:16 2012 +0900 @@ -1,6 +1,1 @@ [info] Compiling 1 Java source to /Users/aotokage/workspace/Consensus/target/scala-2.9.1/classes... -[warn] Note: /Users/aotokage/workspace/Consensus/app/models/TPGraph.java uses or overrides a deprecated API. -[warn] Note: Recompile with -Xlint:deprecation for details. -[info] Compiling 4 Scala sources and 5 Java sources to /Users/aotokage/workspace/Consensus/target/scala-2.9.1/classes... -[warn] Note: /Users/aotokage/workspace/Consensus/app/models/TPGraph.java uses or overrides a deprecated API. -[warn] Note: Recompile with -Xlint:deprecation for details. diff -r 34ea98c5a18c -r e113f946c9c1 test/RequestTest.java --- a/test/RequestTest.java Tue Oct 02 22:49:16 2012 +0900 +++ b/test/RequestTest.java Tue Oct 02 22:55:16 2012 +0900 @@ -28,10 +28,13 @@ getUserInfo("akifumi","consensus/"); */ String[] users = {user2,user3}; - createClaim(user1, users); - createClaim(user1, users); +// createClaim(user1, users); +// createClaim(user1, users); getUserInfo(user2,"requests/"); getUserInfo(user3,"requests/"); + getUserInfo(user1,"claims/"); + getUserInfo(user2,"claims/"); + getUserInfo(user3,"claims/"); }