# HG changeset patch
# User tatsuki
# Date 1406599091 -32400
# Node ID 91f6dd655a01025ab68e584ab4b3819da2679baf
# Parent 564f683b7aefd7dd0888a8bd320b91bc2515f714
refactoring
diff -r 564f683b7aef -r 91f6dd655a01 src/main/java/app/bbs/NetworkJungleBulletinBoard.java
--- a/src/main/java/app/bbs/NetworkJungleBulletinBoard.java Mon Jul 28 17:02:31 2014 +0900
+++ b/src/main/java/app/bbs/NetworkJungleBulletinBoard.java Tue Jul 29 10:58:11 2014 +0900
@@ -43,8 +43,7 @@
private NetworkJungleBulletinBoard(String _uuid, NetworkJournal _journal) {
journal = _journal;
- jungle = new NetworkDefaultJungle(journal, _uuid,
- new DefaultTreeEditor(new DefaultTraverser()));
+ jungle = new NetworkDefaultJungle(journal, _uuid, new DefaultTreeEditor(new DefaultTraverser()));
BulletinBoardJungleManager.setJungle(jungle);
persistentFlag = false;
requestCounter = BulletinBoardJungleManager.getRequestCounter();
@@ -58,8 +57,7 @@
}
public static NetworkBulletinBoard NewPersistentJungle(String _uuid) {
- NetworkJungleBulletinBoard board = new NetworkJungleBulletinBoard(
- _uuid, new PersistentJournal());
+ NetworkJungleBulletinBoard board = new NetworkJungleBulletinBoard( _uuid, new PersistentJournal());
board.persistentFlag = true;
return board;
}
@@ -111,8 +109,7 @@
tree = jungle.createNewTree(treeName);
}
JungleTreeEditor editor = tree.getLocalTreeEditor();
- Either either = JungleUpdater.edit(editor,
- chList);
+ Either either = JungleUpdater.edit(editor, chList);
editor = either.b();
if (either.isA()) {
throw new IOException("Failed commit log recovery");
@@ -140,8 +137,7 @@
return renewTime;
}
- public void createBoards(final String _name, final String _author,
- final String _initMessage, final String _editKey) {
+ public void createBoards(final String _name, final String _author, final String _initMessage, final String _editKey) {
requestCounter.incrementAndGet();
if (null == jungle.createNewTree(_name)) {
throw new IllegalStateException();
@@ -156,8 +152,7 @@
}
editor = either.b();
- either = editor.putAttribute(root.add(0), "name",
- ByteBuffer.wrap(_name.getBytes()));
+ either = editor.putAttribute(root.add(0), "name",ByteBuffer.wrap(_name.getBytes()));
if (either.isA()) {
throw new IllegalStateException();
}
@@ -184,13 +179,9 @@
NodeEditor e = new NodeEditor() {
public > Either edit(T _e) {
- _e = _e.getAttributes()
- .put("author", ByteBuffer.wrap(_author.getBytes())).b();
- _e = _e.getAttributes()
- .put("mes", ByteBuffer.wrap(_initMessage.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("key", ByteBuffer.wrap(_editKey.getBytes())).b();
+ _e = _e.getAttributes().put("author", ByteBuffer.wrap(_author.getBytes())).b();
+ _e = _e.getAttributes().put("mes", ByteBuffer.wrap(_initMessage.getBytes())).b();
+ _e = _e.getAttributes().put("key", ByteBuffer.wrap(_editKey.getBytes())).b();
ByteBuffer tBuffer2 = ByteBuffer.allocate(16);
tBuffer2.putLong(timestamp);
_e = _e.getAttributes().put("timestamp", tBuffer2).b();
@@ -206,8 +197,7 @@
}
- public void createFolder(final String _board, final String _author,
- final String _message, final String _editKey, String _nodeNum) {
+ public void createFolder(final String _board, final String _author, final String _message, final String _editKey, String _nodeNum) {
JungleTree tree = jungle.getTreeByName(_board);
if (tree == null) {
throw new IllegalStateException();
@@ -217,8 +207,7 @@
try {
for (int count = 0; _nodeNum.substring(count, count + 1) != null; count++) {
if (!_nodeNum.substring(count, count + 1).equals("/"))
- path = path.add(Integer.parseInt(_nodeNum.substring(count,
- count + 1)));
+ path = path.add(Integer.parseInt(_nodeNum.substring(count, count + 1)));
}
} catch (Exception _e) {
}
@@ -227,15 +216,13 @@
final long timestamp = System.currentTimeMillis();
final ByteBuffer tBuffer = ByteBuffer.allocate(16);
tBuffer.putLong(timestamp);
+
do {
Node node = tree.getRootNode();
-
DefaultTraverser traverser = new DefaultTraverser();
- TraversableNodeWrapper traversable = new TraversableNodeWrapper(
- node);
+ TraversableNodeWrapper traversable = new TraversableNodeWrapper(node);
DefaultEvaluator evaluator = new DefaultEvaluator(path);
- Either>> ret = traverser
- .traverse(traversable, evaluator);
+ Either>> ret = traverser.traverse(traversable, evaluator);
if (ret.isA()) {
Assert.fail();
}
@@ -252,15 +239,7 @@
NodeEditor e = new NodeEditor() {
public > Either edit(T _e) {
- _e = _e.getAttributes()
- .put("author", ByteBuffer.wrap(_author.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("mes", ByteBuffer.wrap(_message.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("key", ByteBuffer.wrap(_editKey.getBytes()))
- .b();
+ _e = _e.getAttributes().put("mes", ByteBuffer.wrap(_message.getBytes())).b();
_e = _e.getAttributes().put("timestamp", tBuffer).b();
return DefaultEither.newB(_e);
}
@@ -276,8 +255,7 @@
}
- public void createBoardMessage(final String _board, final String _author,
- final String _message, final String _editKey) {
+ public void createBoardMessage(final String _board, final String _author, final String _message, final String _editKey) {
requestCounter.incrementAndGet();
JungleTree tree = jungle.getTreeByName(_board);
if (tree == null) {
@@ -289,6 +267,7 @@
final ByteBuffer tBuffer = ByteBuffer.allocate(16);
tBuffer.putLong(timestamp);
do {
+
Node node = tree.getRootNode();
int size = node.getChildren().size();
DefaultNodePath path = new DefaultNodePath();
@@ -302,15 +281,9 @@
NodeEditor e = new NodeEditor() {
public > Either edit(T _e) {
- _e = _e.getAttributes()
- .put("author", ByteBuffer.wrap(_author.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("mes", ByteBuffer.wrap(_message.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("key", ByteBuffer.wrap(_editKey.getBytes()))
- .b();
+ _e = _e.getAttributes().put("author", ByteBuffer.wrap(_author.getBytes())).b();
+ _e = _e.getAttributes().put("mes", ByteBuffer.wrap(_message.getBytes())).b();
+ _e = _e.getAttributes().put("key", ByteBuffer.wrap(_editKey.getBytes())).b();
_e = _e.getAttributes().put("timestamp", tBuffer).b();
return DefaultEither.newB(_e);
}
@@ -326,14 +299,14 @@
}
- public void editMessage(String _board, String _uuid, final String _author,
- final String _message, final String _editKey) {
+ public void editMessage(String _board, String _uuid, final String _author, final String _message, final String _editKey) {
requestCounter.incrementAndGet();
final long timestamp = System.currentTimeMillis();
final ByteBuffer tBuffer = ByteBuffer.allocate(16);
tBuffer.putLong(timestamp);
JungleTree tree = jungle.getTreeByName(_board);
Either either = null;
+
do {
DefaultNodePath path = new DefaultNodePath();
path = path.add(Integer.parseInt(_uuid));
@@ -341,15 +314,9 @@
JungleTreeEditor editor = tree.getTreeEditor();
NodeEditor e = new NodeEditor() {
public > Either edit(T _e) {
- _e = _e.getAttributes()
- .put("author", ByteBuffer.wrap(_author.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("mes", ByteBuffer.wrap(_message.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("key", ByteBuffer.wrap(_editKey.getBytes()))
- .b();
+ _e = _e.getAttributes().put("author", ByteBuffer.wrap(_author.getBytes())).b();
+ _e = _e.getAttributes().put("mes", ByteBuffer.wrap(_message.getBytes())).b();
+ _e = _e.getAttributes().put("key", ByteBuffer.wrap(_editKey.getBytes())).b();
_e = _e.getAttributes().put("timestamp", tBuffer).b();
return DefaultEither.newB(_e);
}
@@ -364,8 +331,7 @@
renewTime = timestamp;
}
- public void createAttribute(String _board, String _uuid,
- final String _author, final String _message, final String _editKey) {
+ public void createAttribute(String _board, String _uuid, final String _author, final String _message, final String _editKey) {
requestCounter.incrementAndGet();
final long timestamp = System.currentTimeMillis();
final ByteBuffer tBuffer = ByteBuffer.allocate(16);
@@ -377,40 +343,21 @@
try {
for (int count = 0; _uuid.substring(count, count + 1) != null; count++) {
if (!_uuid.substring(count, count + 1).equals("/"))
- path = path.add(Integer.parseInt(_uuid.substring(count,
- count + 1)));
+ path = path.add(Integer.parseInt(_uuid.substring(count, count + 1)));
}
} catch (Exception _e) {
}
- Node node = tree.getRootNode();
-
- DefaultTraverser traverser = new DefaultTraverser();
- TraversableNodeWrapper traversable = new TraversableNodeWrapper(
- node);
- DefaultEvaluator evaluator = new DefaultEvaluator(path);
- Either>> ret = traverser
- .traverse(traversable, evaluator);
- if (ret.isA()) {
- Assert.fail();
- }
-
- Traversal> traversal = ret.b();
- TraversableNodeWrapper target = traversal.destination();
- final Node cheakNode = target.getWrapped();
- System.out.println(cheakNode.getAttributes().get("attribute"));
-
+
JungleTreeEditor editor = tree.getTreeEditor();
NodeEditor e = new NodeEditor() {
public > Either edit(T _e) {
// EnableNodeWrapper node = _e.getWrap();
String str = "0";
int count = 0;
- for (; _e.getAttributes().get("author" + String.valueOf(count)) != null; count++) {
+ for (; _e.getAttributes().get("mes" + String.valueOf(count)) != null; count++) {
}
str = String.valueOf(count);
- _e = _e.getAttributes().put("author" + str, ByteBuffer.wrap(_author.getBytes())).b();
_e = _e.getAttributes().put("mes" + str, ByteBuffer.wrap(_message.getBytes())).b();
- _e = _e.getAttributes().put("key" + str, ByteBuffer.wrap(_editKey.getBytes())).b();
_e = _e.getAttributes().put("timestamp" + str, tBuffer).b();
return DefaultEither.newB(_e);
}
@@ -424,8 +371,7 @@
} while (either.isA());
}
- public void editMatrixMessage(String _board, String _uuid,
- final String _author, final String _message, final String _editKey) {
+ public void editMatrixMessage(String _board, String _uuid, final String _author, final String _message, final String _editKey) {
requestCounter.incrementAndGet();
final long timestamp = System.currentTimeMillis();
final ByteBuffer tBuffer = ByteBuffer.allocate(16);
@@ -439,15 +385,9 @@
JungleTreeEditor editor = tree.getTreeEditor();
NodeEditor e = new NodeEditor() {
public > Either edit(T _e) {
- _e = _e.getAttributes()
- .put("author", ByteBuffer.wrap(_author.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("mes", ByteBuffer.wrap(_message.getBytes()))
- .b();
- _e = _e.getAttributes()
- .put("key", ByteBuffer.wrap(_editKey.getBytes()))
- .b();
+ _e = _e.getAttributes().put("author", ByteBuffer.wrap(_author.getBytes())).b();
+ _e = _e.getAttributes().put("mes", ByteBuffer.wrap(_message.getBytes())).b();
+ _e = _e.getAttributes().put("key", ByteBuffer.wrap(_editKey.getBytes())).b();
_e = _e.getAttributes().put("timestamp", tBuffer).b();
return DefaultEither.newB(_e);
}
@@ -471,10 +411,8 @@
IterableConverter.Converter converter = new IterableConverter.Converter() {
public BoardMessage conv(Node _b) {
String uuid = Integer.toString(counter.get());
- String author = new String(_b.getAttributes().get("author")
- .array());
- String message = new String(_b.getAttributes().get("mes")
- .array());
+ String author = new String(_b.getAttributes().get("author") .array());
+ String message = new String(_b.getAttributes().get("mes").array());
counter.incrementAndGet();
return new BoardMessageImpl(author, message, uuid);
}
@@ -488,8 +426,7 @@
try {
for (int count = 0; _nodeNum.substring(count, count + 1) != null; count++) {
if (!_nodeNum.substring(count, count + 1).equals("/"))
- path = path.add(Integer.parseInt(_nodeNum.substring(count,
- count + 1)));
+ path = path.add(Integer.parseInt(_nodeNum.substring(count,count + 1)));
}
} catch (Exception _e) {
}
@@ -498,11 +435,9 @@
Node node = tree.getRootNode();
DefaultTraverser traverser = new DefaultTraverser();
- TraversableNodeWrapper traversable = new TraversableNodeWrapper(
- node);
+ TraversableNodeWrapper traversable = new TraversableNodeWrapper(node);
DefaultEvaluator evaluator = new DefaultEvaluator(path);
- Either>> ret = traverser
- .traverse(traversable, evaluator);
+ Either>> ret = traverser.traverse(traversable, evaluator);
if (ret.isA()) {
Assert.fail();
}
@@ -515,10 +450,9 @@
IterableConverter.Converter converter = new IterableConverter.Converter() {
public BoardMessage conv(Node _b) {
String uuid = Integer.toString(counter.get());
- String author = new String(_b.getAttributes().get("author").array());
String message = new String(_b.getAttributes().get("mes").array());
counter.incrementAndGet();
- return new BoardMessageImpl(author, message, uuid);
+ return new BoardMessageImpl(null, message, uuid);
}
};
return new IterableConverter(chs, converter);
@@ -531,8 +465,7 @@
try {
for (int count = 0; _nodeNum.substring(count, count + 1) != null; count++) {
if (!_nodeNum.substring(count, count + 1).equals("/"))
- path = path.add(Integer.parseInt(_nodeNum.substring(count,
- count + 1)));
+ path = path.add(Integer.parseInt(_nodeNum.substring(count,count + 1)));
}
} catch (Exception _e) {
}
diff -r 564f683b7aef -r 91f6dd655a01 src/main/java/app/bbs/ShowMessageWithTimeStampServlet.java
--- a/src/main/java/app/bbs/ShowMessageWithTimeStampServlet.java Mon Jul 28 17:02:31 2014 +0900
+++ b/src/main/java/app/bbs/ShowMessageWithTimeStampServlet.java Tue Jul 29 10:58:11 2014 +0900
@@ -45,24 +45,19 @@
_pw.write("" + _bname + "
\n");
_pw.write("Latest renew time : " + bbs.getRenewTime(_bname)
+ "
\n");
-
- _pw.write("
\n");
+ ;
+
+ _pw.write("