Mercurial > hg > Members > tatsuki > bench > jungle-core
diff src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/DefaultJungle.java @ 81:715a9fbf02fc
remove <T> many source
author | one |
---|---|
date | Sun, 31 Aug 2014 07:46:30 +0900 |
parents | 0f01ee222035 |
children | a4e2f1d45fdc |
line wrap: on
line diff
--- a/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/DefaultJungle.java Sun Aug 31 03:30:03 2014 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/ie/cr/shoshi/jungle/DefaultJungle.java Sun Aug 31 07:46:30 2014 +0900 @@ -11,7 +11,6 @@ import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.TreeEditor; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultNodePath; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.DefaultTreeEditor; -import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.impl.TreeNode; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.store.operations.TreeOperation; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultChangeSet; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.transaction.DefaultTreeContext; @@ -20,24 +19,24 @@ import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Either; import jp.ac.u_ryukyu.ie.cr.shoshi.jungle.util.Error; -public class DefaultJungle<T extends TreeNode<T>> implements Jungle<T> +public class DefaultJungle implements Jungle { private Journal journal; - private ConcurrentHashMap<String,JungleTree<T>> trees; + private ConcurrentHashMap<String,JungleTree> trees; private String uuid; private TreeEditor editor; - public static <T extends TreeNode<T>>void main(String _args[]) + public static void main(String _args[]) { - DefaultJungle<T> j = new DefaultJungle(null,"hoge",new DefaultTreeEditor(new DefaultTraverser())); - JungleTree<T> t = j.createNewTree("fuga"); + DefaultJungle j = new DefaultJungle(null,"hoge",new DefaultTreeEditor(new DefaultTraverser())); + JungleTree t = j.createNewTree("fuga"); - JungleTreeEditor<T> e1 = t.getTreeEditor(); - JungleTreeEditor<T> e2 = t.getTreeEditor(); + JungleTreeEditor e1 = t.getTreeEditor(); + //JungleTreeEditor e2 = t.getTreeEditor(); DefaultNodePath root = new DefaultNodePath(); - Either<Error,JungleTreeEditor<T>> either = e1.addNewChildAt(root,0); + Either<Error,JungleTreeEditor> either = e1.addNewChildAt(root,0); e1 = either.b(); either = e1.addNewChildAt(root.add(0),0); e1 = either.b(); @@ -47,19 +46,19 @@ public DefaultJungle(Journal _journal,String _uuid,TreeEditor _editor) { journal = new NullJournal(); - trees = new ConcurrentHashMap<String,JungleTree<T>>(); + trees = new ConcurrentHashMap<String,JungleTree>(); uuid = _uuid; editor = _editor; } @Override - public JungleTree<T> getTreeByName(String _name) + public JungleTree getTreeByName(String _name) { return trees.get(_name); } @Override - public JungleTree<T> createNewTree(final String _name) + public JungleTree createNewTree(final String _name) { ChangeList list = new ChangeList(){ @Override @@ -78,7 +77,7 @@ }; DefaultTreeNode root = new DefaultTreeNode(); - ChangeSet<T> set = new DefaultChangeSet(root,null,list,uuid,_name,0); + ChangeSet set = new DefaultChangeSet(root,null,list,uuid,_name,0); DefaultTreeContext<DefaultTreeNode> tc = new DefaultTreeContext<DefaultTreeNode>(root,set); JungleTree newTree = new DefaultJungleTree<DefaultTreeNode>(tc,uuid,journal.getWriter(),editor); if(trees.putIfAbsent(_name,newTree) != null){