API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Jul 28th, 2017
470
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 19.74 KB | None | 0 0
raw download clone embed print report
  1. emud@emud-Inspiron-1545:~/spe$ git status
  2. # On branch master
  3. # Your branch is ahead of 'origin/master' by 7 commits.
  4. #
  5. nothing to commit (working directory clean)
  6. emud@emud-Inspiron-1545:~/spe$ git log --stat
  7. commit e30af1f3709436797a5a5084ff0b4feed93ff13f
  8. Author: Ed Bevan <eb9374@bris.ac.uk>
  9. Date: Sat Feb 26 00:16:37 2011 +0000
  10.  
  11. accidentally added everything - massive commit fail
  12.  
  13. depends/libs/apache-mime4j-0.6.jar | Bin 0 -> 345048 bytes
  14. depends/libs/cglib-nodep-2.1_3.jar | Bin 0 -> 324238 bytes
  15. depends/libs/commons-codec-1.4.jar | Bin 0 -> 58160 bytes
  16. depends/libs/commons-collections-3.2.1.jar | Bin 0 -> 575389 bytes
  17. depends/libs/commons-io-1.4.jar | Bin 0 -> 109043 bytes
  18. depends/libs/commons-lang-2.4.jar | Bin 0 -> 261809 bytes
  19. depends/libs/commons-logging-1.1.1.jar | Bin 0 -> 60686 bytes
  20. depends/libs/cssparser-0.9.5.jar | Bin 0 -> 253950 bytes
  21. depends/libs/guava-r06.jar | Bin 0 -> 934385 bytes
  22. depends/libs/hamcrest-all-1.1.jar | Bin 0 -> 249339 bytes
  23. depends/libs/htmlunit-2.8.jar | Bin 0 -> 961811 bytes
  24. depends/libs/htmlunit-core-js-2.8.jar | Bin 0 -> 912583 bytes
  25. depends/libs/httpclient-4.0.2.jar | Bin 0 -> 292890 bytes
  26. depends/libs/httpcore-4.0.1.jar | Bin 0 -> 172888 bytes
  27. depends/libs/httpmime-4.0.1.jar | Bin 0 -> 25443 bytes
  28. depends/libs/jmock-2.4.0.jar | Bin 0 -> 205178 bytes
  29. depends/libs/jmock-junit3-2.4.0.jar | Bin 0 -> 15473 bytes
  30. depends/libs/jna.jar | Bin 0 -> 858336 bytes
  31. depends/libs/json-20080701.jar | Bin 0 -> 37875 bytes
  32. depends/libs/junit-dep-4.8.1.jar | Bin 0 -> 217975 bytes
  33. depends/libs/nekohtml-1.9.14.jar | Bin 0 -> 124361 bytes
  34. depends/libs/sac-1.3.jar | Bin 0 -> 15808 bytes
  35. depends/libs/serializer-2.7.1.jar | Bin 0 -> 278281 bytes
  36. depends/libs/xalan-2.7.1.jar | Bin 0 -> 3176148 bytes
  37. depends/libs/xercesImpl-2.9.1.jar | Bin 0 -> 1229125 bytes
  38. depends/libs/xml-apis-1.3.04.jar | Bin 0 -> 194354 bytes
  39. depends/selenium-java-2.0a7-srcs.jar | Bin 0 -> 516609 bytes
  40. depends/selenium-java-2.0a7.jar | Bin 0 -> 1756837 bytes
  41. src/uk/me/graphe/client/Chat.java | 15 +
  42. src/uk/me/graphe/client/ClientOT.java | 5 +
  43. src/uk/me/graphe/client/Graphemeui.java | 3 +-
  44. src/uk/me/graphe/shared/messages/ChatMessage.java | 8 +
  45. .../0A9476898799A150D840F0B1C3672921.cache.png | Bin 0 -> 291 bytes
  46. .../396F806CD63ABD414BFBB9D57429F05B.cache.png | Bin 0 -> 90 bytes
  47. .../6F9DEDD50B968BE606F485E666E9B514.cache.html | 592 ++++++++++
  48. .../7F05F758351D91E89508805D28A50AB3.cache.html | 580 ++++++++++
  49. .../811C0C74989A478D203A9FE832F70189.cache.html | 593 ++++++++++
  50. .../D55D08932A696A34B80912F016C6C519.cache.html | 595 ++++++++++
  51. .../DF7764EEC1903CD03C9545B354D8D8E4.cache.png | Bin 0 -> 92 bytes
  52. .../E44767377485D18D6B6864F65BA8EF73.cache.png | Bin 0 -> 295 bytes
  53. .../E7C5DF33E589A331B0604B16B0AA47C8.cache.html | 604 +++++++++++
  54. .../EDC7827FEEA59EE44AD790B1C6430C45.cache.png | Bin 0 -> 273 bytes
  55. .../F5D6D1CCDB0FD59F42A6144A8FEF665C.cache.html | 592 ++++++++++
  56. war/me.teaisaweso.graphemeJUnit/clear.cache.gif | Bin 0 -> 43 bytes
  57. .../gwt/standard/images/corner.png | Bin 0 -> 1140 bytes
  58. .../gwt/standard/images/corner_ie6.png | Bin 0 -> 412 bytes
  59. .../gwt/standard/images/hborder.png | Bin 0 -> 1384 bytes
  60. .../gwt/standard/images/hborder_ie6.png | Bin 0 -> 966 bytes
  61. .../standard/images/ie6/corner_dialog_topleft.png | Bin 0 -> 195 bytes
  62. .../standard/images/ie6/corner_dialog_topright.png | Bin 0 -> 232 bytes
  63. .../standard/images/ie6/hborder_blue_shadow.png | Bin 0 -> 150 bytes
  64. .../standard/images/ie6/hborder_gray_shadow.png | Bin 0 -> 153 bytes
  65. .../standard/images/ie6/vborder_blue_shadow.png | Bin 0 -> 144 bytes
  66. .../standard/images/ie6/vborder_gray_shadow.png | Bin 0 -> 148 bytes
  67. .../gwt/standard/images/splitPanelThumb.png | Bin 0 -> 308 bytes
  68. .../gwt/standard/images/vborder.png | Bin 0 -> 190 bytes
  69. .../gwt/standard/images/vborder_ie6.png | Bin 0 -> 150 bytes
  70. .../gwt/standard/standard.css | 1144 +++++++++++++++++++
  71. .../gwt/standard/standard_rtl.css | 1145 ++++++++++++++++++++
  72. war/me.teaisaweso.graphemeJUnit/hosted.html | 350 ++++++
  73. .../me.teaisaweso.graphemeJUnit.nocache.js | 11 +
  74. 61 files changed, 6236 insertions(+), 1 deletions(-)
  75.  
  76. commit ba9bfcbad5cdefb1d538c6dc15f944b14d5e26d8
  77. Merge: 8fc227e 2b2cf1d
  78. Author: Ed Bevan <eb9374@bris.ac.uk>
  79. Date: Thu Feb 24 11:28:49 2011 +0000
  80.  
  81. Merge branch 'master' of git://github.com/samphippen/spe
  82.  
  83. commit 8fc227ed5b3949c55c0727cd99fdabf7f5a67ce3
  84. Author: Ed Bevan <eb9374@bris.ac.uk>
  85. Date: Thu Feb 24 11:27:50 2011 +0000
  86.  
  87. Added UI for chat box
  88.  
  89. src/uk/me/graphe/client/Canvas.ui.xml | 4 ++--
  90. src/uk/me/graphe/client/Graphemeui.java | 14 ++++++++------
  91. war/css/main.css | 16 +++++++++++++++-
  92. war/index.php | 8 +++++---
  93. 4 files changed, 30 insertions(+), 12 deletions(-)
  94.  
  95. commit 764a6873d09531ff2d32c15e5d309a0ec2f3c11f
  96. Author: Ed Bevan <eb9374@bris.ac.uk>
  97. Date: Thu Feb 24 11:24:15 2011 +0000
  98.  
  99. Added stuff to handle chat message from server
  100.  
  101. src/uk/me/graphe/server/ClientMessageHandler.java | 8 ++++++++
  102. 1 files changed, 8 insertions(+), 0 deletions(-)
  103.  
  104. commit d0627373acb11e4f598ae4e8ba2261488c9a5c74
  105. Author: Ed Bevan <eb9374@bris.ac.uk>
  106. Date: Thu Feb 24 11:22:52 2011 +0000
  107.  
  108. Changed the sending method to do server stuff
  109.  
  110. src/uk/me/graphe/client/Chat.java | 5 +++++
  111. 1 files changed, 5 insertions(+), 0 deletions(-)
  112.  
  113. commit 2ac1f1bd5f05c79ada814137405410e39b61531b
  114. Author: Ed Bevan <eb9374@bris.ac.uk>
  115. Date: Thu Feb 24 11:16:23 2011 +0000
  116.  
  117. Made a chat message/factory
  118.  
  119. src/uk/me/graphe/shared/messages/ChatMessage.java | 34 ++++++++++++++++++++
  120. .../shared/messages/factories/ChatFactory.java | 23 +++++++++++++
  121. 2 files changed, 57 insertions(+), 0 deletions(-)
  122.  
  123. commit add703a5b9505730cdc463755e7ecc886e02ef44
  124. Author: Ed Bevan <eb9374@bris.ac.uk>
  125. Date: Thu Feb 24 11:15:13 2011 +0000
  126.  
  127. Added chatbox functionality
  128.  
  129. src/uk/me/graphe/client/Chat.java | 65 +++++++++++++++++++++++++++++++++++
  130. src/uk/me/graphe/client/Chat.ui.xml | 34 ++++++++++++++++++
  131. 2 files changed, 99 insertions(+), 0 deletions(-)
  132.  
  133. commit 2b2cf1d25451b916d1b3f5993c82081947abe919
  134. Author: Sam Phippen <samphippen@googlemail.com>
  135. Date: Thu Feb 24 11:09:57 2011 +0000
  136.  
  137. fix the unused console dep preventing building
  138.  
  139. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  140.  
  141. .../messages/operations/AddNodeOperation.java | 4 ----
  142. 1 files changed, 0 insertions(+), 4 deletions(-)
  143.  
  144. commit 02a4f5c904b8571d3cf5723366c0e56c815eff2f
  145. Author: Sam Phippen <samphippen@googlemail.com>
  146. Date: Wed Feb 23 14:39:37 2011 +0000
  147.  
  148. why yes, I have fixed the ot-stuff
  149.  
  150. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  151.  
  152. config/orbited.conf | 2 +-
  153. src/uk/me/graphe/client/ClientOT.java | 33 +++++++++++++------
  154. src/uk/me/graphe/client/Graphemeui.java | 2 +-
  155. .../graphmanagers/GraphManager2dFactory.java | 3 +-
  156. .../shared/graphmanagers/GraphManager2dImpl.java | 30 +++++++++++------
  157. .../messages/operations/AddNodeOperation.java | 11 +++++--
  158. 6 files changed, 52 insertions(+), 29 deletions(-)
  159.  
  160. commit 5d7359dfe47fd20ae14c01b5fbb827ed35c0b54c
  161. Author: Sam Phippen <samphippen@googlemail.com>
  162. Date: Wed Feb 23 14:38:33 2011 +0000
  163.  
  164. rename severmain to servermain
  165.  
  166. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  167.  
  168. src/uk/me/graphe/server/ServerMain.java | 17 +++++++++++++++++
  169. src/uk/me/graphe/server/SeverMain.java | 17 -----------------
  170. 2 files changed, 17 insertions(+), 17 deletions(-)
  171.  
  172. commit c4dd521e3efa9bd0c1700a14c67da362b052ab6c
  173. Author: Sam Phippen <samphippen@googlemail.com>
  174. Date: Wed Feb 23 14:36:27 2011 +0000
  175.  
  176. add a thing which allows us to debug the frontend easily
  177.  
  178. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  179.  
  180. src/uk/me/graphe/client/Console.java | 7 +++++++
  181. 1 files changed, 7 insertions(+), 0 deletions(-)
  182.  
  183. commit f456e3b816d63f063e962471a72af2230409665b
  184. Author: Sam Phippen <samphippen@googlemail.com>
  185. Date: Wed Feb 23 14:35:58 2011 +0000
  186.  
  187. make index.php the lighttpd homepage
  188.  
  189. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  190.  
  191. war/lighttpd.config | 2 +-
  192. 1 files changed, 1 insertions(+), 1 deletions(-)
  193.  
  194. commit a4f2616559ba18087ee9a7bf8b9ec6b653115329
  195. Author: Ed Bevan <eb9374@bris.ac.uk>
  196. Date: Wed Feb 2 10:19:20 2011 +0000
  197.  
  198. added zoom to webgl part, bit buggy
  199.  
  200. src/uk/me/graphe/client/DrawingImpl.java | 18 +++++++++---------
  201. 1 files changed, 9 insertions(+), 9 deletions(-)
  202.  
  203. commit ed12059cafd9c21d399f75c65c4e354690bffc9a
  204. Author: Ed Bevan <eb9374@bris.ac.uk>
  205. Date: Wed Feb 2 09:18:59 2011 +0000
  206.  
  207. Removed index.html, added index.php
  208.  
  209. war/index.html | 60 --------------------------------------------------------
  210. 1 files changed, 0 insertions(+), 60 deletions(-)
  211.  
  212. commit c589fd29c6353c7ed5fe702ffdcb373cefb15f77
  213. Merge: 7c2bb5b 41c4721
  214. Author: Ed Bevan <eb9374@bris.ac.uk>
  215. Date: Wed Feb 2 09:16:08 2011 +0000
  216.  
  217. Merge branch 'master' of git://github.com/samphippen/spe
  218.  
  219. commit 7c2bb5ba3dbcb87cabe8b942c2e6414bfbe2ced5
  220. Author: Ed Bevan <eb9374@bris.ac.uk>
  221. Date: Wed Feb 2 05:43:15 2011 +0000
  222.  
  223. little fiddle with the toolbox styling for the zoom button to fit in with ot
  224.  
  225. src/uk/me/graphe/client/Toolbox.ui.xml | 2 +-
  226. 1 files changed, 1 insertions(+), 1 deletions(-)
  227.  
  228. commit 3304a313a62578a5d442f2a69619b8ae82a24f93
  229. Author: Ed Bevan <eb9374@bris.ac.uk>
  230. Date: Wed Feb 2 05:42:38 2011 +0000
  231.  
  232. Fixed zoom bugs, works perfectly now
  233.  
  234. src/uk/me/graphe/client/Canvas.java | 11 ++------
  235. src/uk/me/graphe/client/Graphemeui.java | 39 +++++++++++-------------------
  236. 2 files changed, 17 insertions(+), 33 deletions(-)
  237.  
  238. commit a7b6b0a358925026f3f12d4d4250b79e4491f952
  239. Author: Ed Bevan <eb9374@bris.ac.uk>
  240. Date: Wed Feb 2 05:41:38 2011 +0000
  241.  
  242. Redone the zoom images to fit the style of the current ones, looks way bette
  243.  
  244. war/images/zoom.png | Bin 1432 -> 356 bytes
  245. war/images/zoomd.png | Bin 0 -> 371 bytes
  246. 2 files changed, 0 insertions(+), 0 deletions(-)
  247.  
  248. commit 02398d8c0f0f85e986fecfbc41a78b648150a014
  249. Author: Ed Bevan <eb9374@bris.ac.uk>
  250. Date: Wed Feb 2 01:25:11 2011 +0000
  251.  
  252. Oh and here's that picture.
  253.  
  254. war/images/zoom.png | Bin 0 -> 1432 bytes
  255. 1 files changed, 0 insertions(+), 0 deletions(-)
  256.  
  257. commit b09e90ab266ab5c80c8a5a9be4d3f6308ed90a43
  258. Author: Ed Bevan <eb9374@bris.ac.uk>
  259. Date: Wed Feb 2 01:24:29 2011 +0000
  260.  
  261. Accidentally deleted these baddamen.
  262.  
  263. src/uk/me/graphe/client/Canvas.ui.xml | 22 ++++++++++++
  264. war/index.html | 60 +++++++++++++++++++++++++++++++++
  265. 2 files changed, 82 insertions(+), 0 deletions(-)
  266.  
  267. commit 6e971be69c4493ed00353ce1990ae84c5756b299
  268. Author: Ed Bevan <eb9374@bris.ac.uk>
  269. Date: Wed Feb 2 01:21:38 2011 +0000
  270.  
  271. Added extra button for zoom, the picture i used is genuine bullcrap.
  272.  
  273. src/uk/me/graphe/client/Toolbox.java | 7 +++++--
  274. src/uk/me/graphe/client/Toolbox.ui.xml | 16 ++++++++++++++++
  275. 2 files changed, 21 insertions(+), 2 deletions(-)
  276.  
  277. commit 48c4f1d4fe146592fa60bb86e3b8d92a67f951c7
  278. Author: Ed Bevan <eb9374@bris.ac.uk>
  279. Date: Wed Feb 2 01:20:48 2011 +0000
  280.  
  281. Again, just adding zoom stuff
  282.  
  283. src/uk/me/graphe/client/Graphemeui.java | 49 ++++++++++++++++++++++++++++--
  284. 1 files changed, 45 insertions(+), 4 deletions(-)
  285.  
  286. commit 5260c64e7169140d2d06661c9b82e5ccac8fddc6
  287. Author: Ed Bevan <eb9374@bris.ac.uk>
  288. Date: Wed Feb 2 01:19:47 2011 +0000
  289.  
  290. Added zoom functionality to these two. Didn't change any of the webgl stuff
  291.  
  292. src/uk/me/graphe/client/Canvas.ui.xml | 15 ---------------
  293. src/uk/me/graphe/client/Drawing.java | 12 ++++++++++++
  294. src/uk/me/graphe/client/DrawingImpl.java | 25 +++++++++++++++++--------
  295. 3 files changed, 29 insertions(+), 23 deletions(-)
  296.  
  297. commit 69dec31d98b73a586df98a9d15e35144b1efe8f2
  298. Author: Ed Bevan <eb9374@bris.ac.uk>
  299. Date: Wed Feb 2 01:14:36 2011 +0000
  300.  
  301. Added zoom function, to zoom in press zoom button then click somewhere on th
  302.  
  303. src/uk/me/graphe/client/Canvas.java | 26 ++++++++++++++++++++------
  304. 1 files changed, 20 insertions(+), 6 deletions(-)
  305.  
  306. commit 41c4721e53f6409454efdded15a877efa050331d
  307. Author: Sam Phippen <samphippen@googlemail.com>
  308. Date: Tue Feb 1 21:39:24 2011 +0000
  309.  
  310. add index.php
  311.  
  312. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  313.  
  314. war/index.php | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  315. 1 files changed, 62 insertions(+), 0 deletions(-)
  316.  
  317. commit 5ff4bc972a4505d44148e6efbc8d9d3843afab2c
  318. Merge: f642339 de9495c
  319. Author: Michael Jones <phyros@gmail.com>
  320. Date: Mon Jan 31 18:41:38 2011 +0000
  321.  
  322. Merge branch 'master' of git://github.com/samphippen/spe
  323.  
  324. Conflicts:
  325. src/uk/me/graphe/client/DrawingImpl.java
  326.  
  327. commit de9495c392134126f611ed8bbc28d5518c13cf9d
  328. Author: Sam Phippen <samphippen@googlemail.com>
  329. Date: Mon Jan 31 18:25:42 2011 +0000
  330.  
  331. beta hacking
  332.  
  333. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  334.  
  335. config/orbited.conf | 2 +-
  336. src/uk/me/graphe/client/ClientOT.java | 10 +-
  337. src/uk/me/graphe/client/DrawingImpl.java | 717 ++++++++++----------
  338. src/uk/me/graphe/client/Graphemeui.java | 2 +-
  339. .../client/json/wrapper/JSONArrayWrapper.java | 16 +-
  340. .../client/json/wrapper/JSONObjectWrapper.java | 24 +-
  341. src/uk/me/graphe/server/ClientManager.java | 2 +-
  342. src/uk/me/graphe/server/ClientMessageHandler.java | 2 +-
  343. src/uk/me/graphe/server/SeverMain.java | 4 +-
  344. src/uk/me/graphe/server/ot/GraphProcessor.java | 5 +
  345. .../shared/graphmanagers/GraphManager2dImpl.java | 345 +++++-----
  346. .../me/graphe/server/DataManagerNetworkTest.java | 6 +
  347. war/index.html | 60 --
  348. war/js/websocket.js | 2 +
  349. war/lighttpd.config | 2 +-
  350. 15 files changed, 584 insertions(+), 615 deletions(-)
  351.  
  352. commit f64233957c4db15a7c1b877a2dc8640848db79dd
  353. Author: Michael Jones <phyros@gmail.com>
  354. Date: Mon Jan 31 16:01:03 2011 +0000
  355.  
  356. Fix to improve performance of webgl node generation
  357.  
  358. src/uk/me/graphe/client/DrawingImpl.java | 52 ++++++++++++++++--------------
  359. 1 files changed, 28 insertions(+), 24 deletions(-)
  360.  
  361. commit 18740f0df43a32a29aa53c1c56e99072c1c0a191
  362. Merge: 123801c dcbadc8
  363. Author: Sam Phippen <samphippen@googlemail.com>
  364. Date: Mon Jan 31 14:37:50 2011 +0000
  365.  
  366. Merge branch 'master' of git://github.com/j0hnn/spe
  367.  
  368. commit 123801cf940230e8e0b00f38d09c75011075431a
  369. Author: Sam Phippen <samphippen@googlemail.com>
  370. Date: Mon Jan 31 14:37:19 2011 +0000
  371.  
  372. implement client ot
  373.  
  374. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  375.  
  376. src/uk/me/graphe/client/ClientOT.java | 159 +++++++++++++
  377. src/uk/me/graphe/client/Graphemeui.java | 232 +++++++++-----------
  378. .../client/communications/ServerChannel.java | 1 +
  379. src/uk/me/graphe/server/ClientMessageHandler.java | 12 +-
  380. src/uk/me/graphe/server/DataManager.java | 4 +
  381. src/uk/me/graphe/server/ot/GraphProcessor.java | 4 +
  382. src/uk/me/graphe/server/ot/GraphTransform.java | 63 ------
  383. src/uk/me/graphe/shared/Edge.java | 2 +-
  384. src/uk/me/graphe/shared/GraphTransform.java | 61 +++++
  385. src/uk/me/graphe/shared/Vertex.java | 5 +
  386. .../shared/graphmanagers/OTGraphManager2dImpl.java | 36 ++-
  387. .../graphe/shared/messages/NoSuchGraphMessage.java | 3 +-
  388. .../messages/operations/AddEdgeOperation.java | 8 +-
  389. .../messages/operations/AddNodeOperation.java | 6 +
  390. .../messages/operations/CompositeOperation.java | 8 +
  391. .../messages/operations/DeleteEdgeOperation.java | 6 +
  392. .../messages/operations/DeleteNodeOperation.java | 6 +
  393. .../shared/messages/operations/GraphOperation.java | 3 +
  394. :
  395.  
  396. implement client ot
  397.  
  398. Signed-off-by: Sam Phippen <samphippen@googlemail.com>
  399.  
  400. src/uk/me/graphe/client/ClientOT.java | 159 +++++++++++++
  401. src/uk/me/graphe/client/Graphemeui.java | 232 +++++++++-----------
  402. .../client/communications/ServerChannel.java | 1 +
  403. src/uk/me/graphe/server/ClientMessageHandler.java | 12 +-
  404. src/uk/me/graphe/server/DataManager.java | 4 +
  405. src/uk/me/graphe/server/ot/GraphProcessor.java | 4 +
  406. src/uk/me/graphe/server/ot/GraphTransform.java | 63 ------
  407. src/uk/me/graphe/shared/Edge.java | 2 +-
  408. src/uk/me/graphe/shared/GraphTransform.java | 61 +++++
  409. src/uk/me/graphe/shared/Vertex.java | 5 +
  410. .../shared/graphmanagers/OTGraphManager2dImpl.java | 36 ++-
  411. .../graphe/shared/messages/NoSuchGraphMessage.java | 3 +-
  412. .../messages/operations/AddEdgeOperation.java | 8 +-
  413. .../messages/operations/AddNodeOperation.java | 6 +
  414. .../messages/operations/CompositeOperation.java | 8 +
  415. .../messages/operations/DeleteEdgeOperation.java | 6 +
  416. .../messages/operations/DeleteNodeOperation.java | 6 +
  417. .../shared/messages/operations/GraphOperation.java | 3 +
  418. .../messages/operations/MoveNodeOperation.java | 6 +
  419. .../shared/messages/operations/NoOperation.java | 6 +
  420. .../me/graphe/server/DataManagerNetworkTest.java | 2 +
  421. 21 files changed, 417 insertions(+), 216 deletions(-)
  422.  
  423. commit 95fdeebdbec9f8ccac3d4fc4e52d667704985eb7
  424. Merge: 4766606 dcbadc8
  425. Author: Michael Jones <phyros@gmail.com>
  426. Date: Sun Jan 30 22:47:01 2011 +0000
  427.  
  428. Merge branch 'master' of git://github.com/j0hnn/spe
  429.  
  430. commit dcbadc8fdf41b6b5a68f7949403666997723dd9a
  431. Author: j0hnn <john.rpm@gmail.com>
  432. Date: Sun Jan 30 21:49:40 2011 +0000
  433.  
  434. Fix bug that meant options didn't go away after pressing
  435. "OK" (Mike)
  436.  
  437. src/uk/me/graphe/client/DrawingImpl.java | 12 ++++++------
  438. 1 files changed, 6 insertions(+), 6 deletions(-)
  439.  
  440. commit e4c3cf8db04e79932992a5fa6dd072aef2f517b4
  441. Author: j0hnn <john.rpm@gmail.com>
  442. Date: Sun Jan 30 21:45:07 2011 +0000
  443.  
  444. add missing images for the move/pan icon
  445.  
  446. war/images/move.png | Bin 0 -> 1206 bytes
  447. war/images/moved.png | Bin 0 -> 1232 bytes
  448. 2 files changed, 0 insertions(+), 0 deletions(-)
  449.  
  450. commit 4766606529e03da7fc82d54ff5ffe35f03ce196f
  451. Author: Michael Jones <phyros@gmail.com>
  452. Date: Sun Jan 30 17:40:17 2011 +0000
  453.  
  454. Fixed bug that meant options didnt go away after pressing "OK"
  455.  
  456. src/uk/me/graphe/client/DrawingImpl.java | 6 +++---
  457. 1 files changed, 3 insertions(+), 3 deletions(-)
  458.  
  459. commit d221dab2009143713b6fc7bf5bc10a4fad47a078
  460. Author: Michael Jones <phyros@gmail.com>
  461. Date: Sun Jan 30 16:59:19 2011 +0000
  462.  
  463. Change thickness of edge of webgl version to be same as 2d version, and change opacity of 2d canvas to "0" when using webGL
  464.  
  465. src/uk/me/graphe/client/DrawingImpl.java | 6 +++---
  466. 1 files changed, 3 insertions(+), 3 deletions(-)
  467.  
  468. commit a5d1ca247c8556c64680b9364fc91c6b2eec24e7
  469. Merge: 7002c3e 3fa1b24
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!