-
Notifications
You must be signed in to change notification settings - Fork 28
/
Copy pathwave.patch
1060 lines (985 loc) · 51.1 KB
/
wave.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/.classpath b/.classpath
index d8def03..d80d62a 100644
--- a/.classpath
+++ b/.classpath
@@ -5,7 +5,7 @@
<classpathentry kind="src" path="proto_src"/>
<classpathentry kind="src" path="gen/messages"/>
<classpathentry kind="src" path="gen/gxp"/>
- <classpathentry kind="lib" path="third_party/runtime/jetty/servlet-api-3.0.jar"/>
+ <classpathentry kind="lib" path="third_party/runtime/jetty/servlet-api-3.0.jar" sourcepath="/home/vjrj/.m2/repository/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016-sources.jar"/>
<classpathentry kind="lib" path="third_party/runtime/guava/guava-r09.jar"/>
<classpathentry kind="lib" path="third_party/codegen/antlr/antlr-3.2.jar"/>
<classpathentry kind="lib" path="third_party/codegen/gwt/gwt-dev.jar"/>
@@ -75,8 +75,8 @@
<classpathentry kind="lib" path="third_party/codegen/socketio/socketio-gwt-0.1-SNAPSHOT.jar" sourcepath="third_party/codegen/socketio/socketio-gwt-0.1-SNAPSHOT-sources.jar"/>
<classpathentry kind="lib" path="third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar" sourcepath="third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar"/>
<classpathentry kind="lib" path="third_party/runtime/commons-fileupload/commons-fileupload.jar" sourcepath="third_party/runtime/commons-fileupload/commons-fileupload-src.zip"/>
- <classpathentry kind="lib" path="third_party/runtime/google-api-client/google-api-client-1.5.0-beta.jar"/>
- <classpathentry kind="lib" path="third_party/runtime/google-api-client/google-http-client-1.5.0-beta.jar"/>
- <classpathentry kind="lib" path="third_party/runtime/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
+ <classpathentry kind="lib" path="third_party/runtime/google-api-client/google-api-client-1.5.0-beta.jar"/>
+ <classpathentry kind="lib" path="third_party/runtime/google-api-client/google-http-client-1.5.0-beta.jar"/>
+ <classpathentry kind="lib" path="third_party/runtime/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
index d34cf38..02223a6 100644
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ b/.settings/org.eclipse.jdt.ui.prefs
@@ -1,8 +1,61 @@
-#Fri Sep 03 16:36:23 EST 2010
+#Thu Feb 09 02:06:43 CET 2012
eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
formatter_profile=_Wave Protocol Format
formatter_settings_version=11
org.eclipse.jdt.ui.ignorelowercasenames=true
org.eclipse.jdt.ui.importorder=com.google;com;edu;freemarker;junit;net;org;java;javax;
org.eclipse.jdt.ui.ondemandthreshold=99
org.eclipse.jdt.ui.staticondemandthreshold=99
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=true
+sp_cleanup.correct_indentation=true
+sp_cleanup.format_source_code=false
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=true
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=false
+sp_cleanup.organize_imports=false
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=false
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=true
+sp_cleanup.sort_members_all=true
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=false
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=false
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/src/org/waveprotocol/box/server/ServerMain.java b/src/org/waveprotocol/box/server/ServerMain.java
index 13a2d55..3d375fc 100644
--- a/src/org/waveprotocol/box/server/ServerMain.java
+++ b/src/org/waveprotocol/box/server/ServerMain.java
@@ -212,28 +212,28 @@ public class ServerMain {
}
private static void initializeServlets(Injector injector, ServerRpcProvider server) {
- server.addServlet("/attachment/*", AttachmentServlet.class);
+ server.addServlet("/attachment/*", injector.getInstance(AttachmentServlet.class));
- server.addServlet(SessionManager.SIGN_IN_URL, AuthenticationServlet.class);
- server.addServlet("/auth/signout", SignOutServlet.class);
- server.addServlet("/auth/register", UserRegistrationServlet.class);
+ server.addServlet(SessionManager.SIGN_IN_URL, injector.getInstance(AuthenticationServlet.class));
+ server.addServlet("/auth/signout", injector.getInstance(SignOutServlet.class));
+ server.addServlet("/auth/register", injector.getInstance(UserRegistrationServlet.class));
- server.addServlet("/fetch/*", FetchServlet.class);
- server.addServlet("/search/*", SearchServlet.class);
+ server.addServlet("/fetch/*", injector.getInstance(FetchServlet.class));
+ server.addServlet("/search/*", injector.getInstance(SearchServlet.class));
- server.addServlet("/robot/dataapi", DataApiServlet.class);
- server.addServlet(DataApiOAuthServlet.DATA_API_OAUTH_PATH + "/*", DataApiOAuthServlet.class);
- server.addServlet("/robot/dataapi/rpc", DataApiServlet.class);
- server.addServlet("/robot/register/*", RobotRegistrationServlet.class);
- server.addServlet("/robot/rpc", ActiveApiServlet.class);
- server.addServlet("/webclient/remote_logging", RemoteLoggingServiceImpl.class);
- server.addServlet("/profile/*", FetchProfilesServlet.class);
- server.addServlet("/waveref/*", WaveRefServlet.class);
+ server.addServlet("/robot/dataapi", injector.getInstance(DataApiServlet.class));
+ server.addServlet(DataApiOAuthServlet.DATA_API_OAUTH_PATH + "/*", injector.getInstance(DataApiOAuthServlet.class));
+ server.addServlet("/robot/dataapi/rpc", injector.getInstance(DataApiServlet.class));
+ server.addServlet("/robot/register/*", injector.getInstance(RobotRegistrationServlet.class));
+ server.addServlet("/robot/rpc", injector.getInstance(ActiveApiServlet.class));
+ server.addServlet("/webclient/remote_logging", injector.getInstance(RemoteLoggingServiceImpl.class));
+ server.addServlet("/profile/*", injector.getInstance(FetchProfilesServlet.class));
+ server.addServlet("/waveref/*", injector.getInstance(WaveRefServlet.class));
boolean enableImport = injector
.getInstance(Key.get(Boolean.class, Names.named(CoreSettings.ENABLE_IMPORT)));
if (enableImport)
- server.addServlet("/import", ImportServlet.class);
+ server.addServlet("/import", injector.getInstance(ImportServlet.class));
String gadgetHostName =
injector
@@ -242,9 +242,9 @@ public class ServerMain {
injector.getInstance(Key.get(Integer.class, Names.named(CoreSettings.GADGET_SERVER_PORT)));
Map<String, String> initParams =
Collections.singletonMap("HostHeader", gadgetHostName + ":" + port);
- server.addServlet("/gadgets/*", GadgetProxyServlet.class, initParams);
+ server.addServlet("/gadgets/*", injector.getInstance(GadgetProxyServlet.class), initParams);
- server.addServlet("/", WaveClientServlet.class);
+ server.addServlet("/", injector.getInstance(WaveClientServlet.class));
}
private static void initializeRobots(Injector injector, WaveBus waveBus) {
@@ -253,10 +253,10 @@ public class ServerMain {
}
private static void initializeRobotAgents(Injector injector, ServerRpcProvider server) {
- server.addServlet(PasswordRobot.ROBOT_URI + "/*", PasswordRobot.class);
- server.addServlet(PasswordAdminRobot.ROBOT_URI + "/*", PasswordAdminRobot.class);
- server.addServlet(WelcomeRobot.ROBOT_URI + "/*", WelcomeRobot.class);
- server.addServlet(RegistrationRobot.ROBOT_URI + "/*", RegistrationRobot.class);
+ //server.addServlet(PasswordRobot.ROBOT_URI + "/*", injector.getInstance(PasswordRobot.class));
+ //server.addServlet(PasswordAdminRobot.ROBOT_URI + "/*", injector.getInstance(PasswordAdminRobot.class));
+ //server.addServlet(WelcomeRobot.ROBOT_URI + "/*", injector.getInstance(WelcomeRobot.class));
+ //server.addServlet(RegistrationRobot.ROBOT_URI + "/*", injector.getInstance(RegistrationRobot.class));
}
private static void initializeFrontend(Injector injector, ServerRpcProvider server,
diff --git a/src/org/waveprotocol/box/server/persistence/file/DeltaIndex.java b/src/org/waveprotocol/box/server/persistence/file/DeltaIndex.java
index aea036c..cf2f4df 100644
--- a/src/org/waveprotocol/box/server/persistence/file/DeltaIndex.java
+++ b/src/org/waveprotocol/box/server/persistence/file/DeltaIndex.java
@@ -177,7 +177,7 @@ public class DeltaIndex {
// We're expected to append the new delta
long fileLength = file.length();
Preconditions.checkState(position == fileLength,
- "position = %d, file=%d", position, fileLength);
+ "position = %d, file=%d, filename=%s", position, fileLength, fileRef.getAbsoluteFile());
file.seek(position);
file.writeLong(offset);
// fill in the additional positions with the 1-complement of the offset,
diff --git a/src/org/waveprotocol/box/server/persistence/file/FileDeltaCollection.java b/src/org/waveprotocol/box/server/persistence/file/FileDeltaCollection.java
index 78294bd..ef21db7 100644
--- a/src/org/waveprotocol/box/server/persistence/file/FileDeltaCollection.java
+++ b/src/org/waveprotocol/box/server/persistence/file/FileDeltaCollection.java
@@ -309,7 +309,7 @@ public class FileDeltaCollection implements DeltasAccess {
nextRecord = Pair.of(Pair.of(transformed.getAppliedAtVersion(),
transformed.size()), nextPosition);
nextPosition = file.getFilePointer();
- } catch (IOException e) {
+ } catch (Exception e) {
// The next entry is invalid. There was probably a write error / crash.
LOG.severe("Error reading delta file for " + waveletName + " starting at " +
nextPosition, e);
diff --git a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java
index 82c3c8d..df08f85 100755
--- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java
+++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java
@@ -25,9 +25,7 @@ import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Singleton;
import com.google.inject.name.Named;
-import com.google.inject.servlet.GuiceFilter;
-import com.google.inject.servlet.GuiceServletContextListener;
-import com.google.inject.servlet.ServletModule;
+import com.google.inject.servlet.SessionScoped;
import com.google.protobuf.Descriptors;
import com.google.protobuf.Descriptors.MethodDescriptor;
import com.google.protobuf.Message;
@@ -45,11 +43,11 @@ import com.glines.socketio.server.transport.XHRPollingTransport;
import com.glines.socketio.server.transport.jetty.JettyWebSocketTransport;
import org.eclipse.jetty.http.ssl.SslContextFactory;
-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.server.session.HashSessionManager;
+import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.servlets.GzipFilter;
@@ -81,7 +79,6 @@ import java.util.concurrent.Executors;
import javax.annotation.Nullable;
import javax.servlet.DispatcherType;
import javax.servlet.ServletConfig;
-import javax.servlet.ServletContextListener;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -105,6 +102,9 @@ public class ServerRpcProvider {
*/
private static final int BUFFER_SIZE = 1024 * 1024;
+ // We can retrieve the injector from the context attributes via this attribute name
+ public static final String INJECTOR_ATTRIBUTE = Injector.class.getName();
+
private final InetSocketAddress[] httpAddresses;
private final Integer flashsocketPolicyPort;
private final ExecutorService threadPool;
@@ -157,7 +157,7 @@ public class ServerRpcProvider {
return socketChannel;
}
}
-
+ @SessionScoped
static class SocketIOConnection extends Connection {
private final SocketIOServerChannel socketChannel;
@@ -364,6 +364,7 @@ public class ServerRpcProvider {
final WebAppContext context = new WebAppContext();
context.setParentLoaderPriority(true);
+ context.setAttribute(INJECTOR_ATTRIBUTE, injector);
if (jettySessionManager != null) {
// This disables JSessionIDs in URLs redirects
@@ -376,29 +377,42 @@ public class ServerRpcProvider {
final ResourceCollection resources = new ResourceCollection(resourceBases);
context.setBaseResource(resources);
- addWebSocketServlets();
+ addWebSocketServlets(context);
try {
- final Injector parentInjector = injector;
-
- final ServletModule servletModule = getServletModule(parentInjector);
-
- ServletContextListener contextListener = new GuiceServletContextListener() {
-
- private final Injector childInjector = parentInjector.createChildInjector(servletModule);
-
- @Override
- protected Injector getInjector() {
- return childInjector;
- }
- };
-
- context.addEventListener(contextListener);
- context.addFilter(GuiceFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
+// final Injector parentInjector = injector;
+
+// final ServletModule servletModule = getServletModule(parentInjector);
+
+// ServletContextListener contextListener = new GuiceServletContextListener() {
+//
+// private final Injector childInjector = parentInjector.createChildInjector(servletModule);
+//
+// @Override
+// protected Injector getInjector() {
+// return childInjector;
+// }
+// };
+//
+// context.addEventListener(contextListener);
+// context.addFilter(GuiceFilter.class, "/*", EnumSet.allOf(DispatcherType.class));
context.addFilter(GzipFilter.class, "/webclient/*", EnumSet.allOf(DispatcherType.class));
httpServer.setHandler(context);
-
- httpServer.start();
+ try {
+ httpServer.start();
+ // We add servlets here to override the DefaultServlet automatic registered by WebAppContext
+ // in path "/" with our WaveClientServlet. Any other way to do this?
+ // Related question (unanswered) http://web.archiveorange.com/archive/v/d0LdlXf1kN0OXyPNyQZp
+ for (Pair<String, ServletHolder> servlet : servletRegistry) {
+ context.addServlet(servlet.getSecond(), servlet.getFirst());
+ }
+
+ } catch (Exception e) { // yes, .start() throws "Exception"
+ LOG.severe("Fatal error starting http server.", e);
+ return;
+ }
+
+ //httpServer.start();
restoreSessions();
} catch (Exception e) { // yes, .start() throws "Exception"
@@ -419,14 +433,18 @@ public class ServerRpcProvider {
LOG.warning("Cannot restore sessions");
}
}
- public void addWebSocketServlets() {
+ public void addWebSocketServlets(WebAppContext context) {
// Servlet where the websocket connection is served from.
- ServletHolder wsholder = addServlet("/socket", WaveWebSocketServlet.class);
+ //ServletHolder wsholder = addServlet("/socket", WaveWebSocketServlet.class);
+ ServletHolder wsholder = new ServletHolder(new WaveWebSocketServlet(this));
+ context.addServlet(wsholder, "/socket");
// TODO(zamfi): fix to let messages span frames.
wsholder.setInitParameter("bufferSize", "" + BUFFER_SIZE);
// Servlet where the websocket connection is served from.
- ServletHolder sioholder = addServlet("/socket.io/*", WaveSocketIOServlet.class );
+ //ServletHolder sioholder = addServlet("/socket.io/*", WaveSocketIOServlet.class );
+ ServletHolder sioholder = new ServletHolder(new WaveSocketIOServlet(this));
+ context.addServlet(sioholder, "/socket.io/*");
// TODO(zamfi): fix to let messages span frames.
sioholder.setInitParameter("bufferSize", "" + BUFFER_SIZE);
// Set flash policy server parameters
@@ -457,30 +475,31 @@ public class ServerRpcProvider {
// Serve the static content and GWT web client with the default servlet
// (acts like a standard file-based web server).
- addServlet("/static/*", DefaultServlet.class);
- addServlet("/webclient/*", DefaultServlet.class);
+ ServletHolder defaultServlet = new ServletHolder(new DefaultServlet());
+ context.addServlet(defaultServlet, "/static/*");
+ context.addServlet(defaultServlet, "/webclient/*");
}
- public ServletModule getServletModule(final Injector injector) {
-
- return new ServletModule() {
- @Override
- protected void configureServlets() {
- // We add servlets here to override the DefaultServlet automatic registered by WebAppContext
- // in path "/" with our WaveClientServlet. Any other way to do this?
- // Related question (unanswered 08-Apr-2011)
- // http://web.archiveorange.com/archive/v/d0LdlXf1kN0OXyPNyQZp
- for (Pair<String, ServletHolder> servlet : servletRegistry) {
- String url = servlet.getFirst();
- @SuppressWarnings("unchecked")
- Class<HttpServlet> clazz = (Class<HttpServlet>) servlet.getSecond().getHeldClass();
- Map<String,String> params = servlet.getSecond().getInitParameters();
- serve(url).with(clazz,params);
- bind(clazz).in(Singleton.class);
- }
- }
- };
- }
+// public ServletModule getServletModule(final Injector injector) {
+//
+// return new ServletModule() {
+// @Override
+// protected void configureServlets() {
+// // We add servlets here to override the DefaultServlet automatic registered by WebAppContext
+// // in path "/" with our WaveClientServlet. Any other way to do this?
+// // Related question (unanswered 08-Apr-2011)
+// // http://web.archiveorange.com/archive/v/d0LdlXf1kN0OXyPNyQZp
+// for (Pair<String, ServletHolder> servlet : servletRegistry) {
+// String url = servlet.getFirst();
+// @SuppressWarnings("unchecked")
+// Class<HttpServlet> clazz = (Class<HttpServlet>) servlet.getSecond().getHeldClass();
+// Map<String,String> params = servlet.getSecond().getInitParameters();
+// serve(url).with(clazz,params);
+// bind(clazz).in(Singleton.class);
+// }
+// }
+// };
+// }
private static InetSocketAddress[] parseAddressList(List<String> addressList) {
if (addressList == null || addressList.size() == 0) {
@@ -665,7 +684,7 @@ public class ServerRpcProvider {
* @param initParams the map with init params, can be null or empty.
* @return the {@link ServletHolder} that holds the servlet.
*/
- public ServletHolder addServlet(String urlPattern, Class<? extends HttpServlet> servlet,
+ public ServletHolder addServlet(String urlPattern, HttpServlet servlet,
@Nullable Map<String, String> initParams) {
ServletHolder servletHolder = new ServletHolder(servlet);
if (initParams != null) {
@@ -675,14 +694,18 @@ public class ServerRpcProvider {
return servletHolder;
}
+
/**
* Add a servlet to the servlet registry. This servlet will be attached to the
* specified URL pattern when the server is started up.
- * @param urlPattern the URL pattern for paths. Eg, '/foo', '/foo/*'.
- * @param servlet the servlet class to bind to the specified paths.
+ *
+ * @param urlPattern URL pattern for paths. Eg, '/foo', '/foo/*'
+ * @param servlet The servlet object to bind to the specified paths
* @return the {@link ServletHolder} that holds the servlet.
*/
- public ServletHolder addServlet(String urlPattern, Class<? extends HttpServlet> servlet) {
- return addServlet(urlPattern, servlet, null);
+ public ServletHolder addServlet(String urlPattern, HttpServlet servlet) {
+ ServletHolder servletHolder = new ServletHolder(servlet);
+ servletRegistry.add(new Pair<String, ServletHolder>(urlPattern, servletHolder));
+ return servletHolder;
}
}
diff --git a/src/org/waveprotocol/box/server/rpc/UserRegistrationServlet.java b/src/org/waveprotocol/box/server/rpc/UserRegistrationServlet.java
index 3e0fc9d..ad6c9bb 100644
--- a/src/org/waveprotocol/box/server/rpc/UserRegistrationServlet.java
+++ b/src/org/waveprotocol/box/server/rpc/UserRegistrationServlet.java
@@ -28,7 +28,6 @@ import org.waveprotocol.box.server.authentication.PasswordDigest;
import org.waveprotocol.box.server.gxp.UserRegistrationPage;
import org.waveprotocol.box.server.persistence.AccountStore;
import org.waveprotocol.box.server.persistence.PersistenceException;
-import org.waveprotocol.box.server.robots.agent.welcome.WelcomeRobot;
import org.waveprotocol.wave.model.wave.InvalidParticipantAddress;
import org.waveprotocol.wave.model.wave.ParticipantId;
import org.waveprotocol.wave.util.logging.Log;
@@ -52,18 +51,17 @@ public final class UserRegistrationServlet extends HttpServlet {
private final AccountStore accountStore;
private final String domain;
- private final WelcomeRobot welcomeBot;
private final boolean registrationDisabled;
private final Log LOG = Log.get(UserRegistrationServlet.class);
@Inject
public UserRegistrationServlet(AccountStore accountStore,
- @Named(CoreSettings.WAVE_SERVER_DOMAIN) String domain, WelcomeRobot welcomeBot,
+ @Named(CoreSettings.WAVE_SERVER_DOMAIN) String domain,
@Named(CoreSettings.DISABLE_REGISTRATION) boolean registrationDisabled) {
this.accountStore = accountStore;
this.domain = domain;
- this.welcomeBot = welcomeBot;
+ // this.welcomeBot = welcomeBot;
this.registrationDisabled = registrationDisabled;
}
@@ -149,11 +147,11 @@ public final class UserRegistrationServlet extends HttpServlet {
LOG.severe("Failed to create new account for " + id, e);
return "An unexpected error occured while trying to create the account";
}
- try {
- welcomeBot.greet(account.getId());
- } catch (IOException e) {
- LOG.warning("Failed to create a welcome wavelet for " + id, e);
- }
+ // try {
+ // welcomeBot.greet(account.getId());
+ // } catch (IOException e) {
+ // LOG.warning("Failed to create a welcome wavelet for " + id, e);
+ // }
return null;
}
diff --git a/src/org/waveprotocol/box/webclient/search/SearchPanel.css b/src/org/waveprotocol/box/webclient/search/SearchPanel.css
index 665c2ec..dfb8c30 100644
--- a/src/org/waveprotocol/box/webclient/search/SearchPanel.css
+++ b/src/org/waveprotocol/box/webclient/search/SearchPanel.css
@@ -26,6 +26,7 @@
border-left: 1px solid #E4F1FE;
background-color: #c9e2fc;
overflow: hidden;
+ display: none;
}
@sprite .toolbar {
diff --git a/src/org/waveprotocol/box/webclient/search/SearchPanelWidget.java b/src/org/waveprotocol/box/webclient/search/SearchPanelWidget.java
index 4402b8e..2b9d9f1 100644
--- a/src/org/waveprotocol/box/webclient/search/SearchPanelWidget.java
+++ b/src/org/waveprotocol/box/webclient/search/SearchPanelWidget.java
@@ -72,7 +72,7 @@ public class SearchPanelWidget extends Composite implements SearchPanelView {
* Positioning constants for components of this panel.
*/
static class CssConstants {
- private static int SEARCH_HEIGHT_PX = 51; // To match wave panel.
+ private static int SEARCH_HEIGHT_PX = 0; // To match wave panel.
private static int TOOLBAR_HEIGHT_PX =
SearchPanelResourceLoader.getPanel().emptyToolbar().getHeight();
private static int TOOLBAR_TOP_PX = 0 + SEARCH_HEIGHT_PX;
diff --git a/src/org/waveprotocol/box/webclient/search/SearchPresenter.java b/src/org/waveprotocol/box/webclient/search/SearchPresenter.java
index b136c88..9f1b2ab 100644
--- a/src/org/waveprotocol/box/webclient/search/SearchPresenter.java
+++ b/src/org/waveprotocol/box/webclient/search/SearchPresenter.java
@@ -95,7 +95,7 @@ public final class SearchPresenter
private int querySize = DEFAULT_PAGE_SIZE;
/** Current selected digest. */
private DigestView selected;
-
+
/** The dispatcher of profiles events. */
SourcesEvents<ProfileListener> profiles;
@@ -160,7 +160,7 @@ public final class SearchPresenter
private void initToolbarMenu() {
GroupingToolbar.View toolbarUi = searchUi.getToolbar();
ToolbarView group = toolbarUi.addGroup();
- new ToolbarButtonViewBuilder().setText("New Wave").applyTo(
+ new ToolbarButtonViewBuilder().setText("New Message").setTooltip("Create a New Message (a Wave)").applyTo(
group.addClickButton(), new ToolbarClickButton.Listener() {
@Override
public void onClicked() {
diff --git a/src/org/waveprotocol/wave/client/StageThree.java b/src/org/waveprotocol/wave/client/StageThree.java
index 5a8de4d..b748193 100644
--- a/src/org/waveprotocol/wave/client/StageThree.java
+++ b/src/org/waveprotocol/wave/client/StageThree.java
@@ -155,7 +155,7 @@ public interface StageThree {
String sessionId = stageTwo.getSessionId();
SelectionExtractor selectionExtractor = new SelectionExtractor(clock, address, sessionId);
- return EditSession.install(views, documents, selectionExtractor, focus, panel);
+ return EditSession.install(views, documents, selectionExtractor, focus, panel, getLocalDomain());
}
protected EditToolbar createEditToolbar() {
diff --git a/src/org/waveprotocol/wave/client/doodad/link/Link.java b/src/org/waveprotocol/wave/client/doodad/link/Link.java
index f5fb0e4..6b7899c 100644
--- a/src/org/waveprotocol/wave/client/doodad/link/Link.java
+++ b/src/org/waveprotocol/wave/client/doodad/link/Link.java
@@ -39,6 +39,14 @@ public final class Link {
private static final ReadableStringSet WEB_SCHEMES = CollectionUtils.newStringSet(
"http", "https", "ftp", "mailto");
+ /**
+ * http://en.wikipedia.org/wiki/Fragment_identifier
+ * http://tools.ietf.org/html/rfc3986#section-3.5
+ * fragment = *( pchar / "/" / "?" )
+ */
+ private static final String COMMON_REGEX = "[\\w\\-:@!\\$&\'\\(\\)\\*\\+,;=\\/\\?\\.]+";
+ private static final String FRAGMENT_URI_REGEX = "#(" + COMMON_REGEX + "|$)";
+ private static final String QUERY_REGEX = "(\\?" + COMMON_REGEX +"|)($|"+ FRAGMENT_URI_REGEX + ")";
private static final String INVALID_LINK_MSG =
"Invalid link. Should either be a web url\n" +
@@ -125,7 +133,7 @@ public final class Link {
}
}
- assert EscapeUtils.extractScheme(uri) != null;
+ assert uri.matches(QUERY_REGEX) || EscapeUtils.extractScheme(uri) != null;
// Otherwise, just return the given link.
return uri;
@@ -145,7 +153,7 @@ public final class Link {
String scheme = parts != null ? parts[0] : null;
// Normal web url
- if (scheme != null && WEB_SCHEMES.contains(scheme)) {
+ if (rawLinkValue.matches(QUERY_REGEX) || (scheme != null && WEB_SCHEMES.contains(scheme))) {
return rawLinkValue;
}
diff --git a/src/org/waveprotocol/wave/client/editor/Editors.java b/src/org/waveprotocol/wave/client/editor/Editors.java
index fa306d1..2c75370 100644
--- a/src/org/waveprotocol/wave/client/editor/Editors.java
+++ b/src/org/waveprotocol/wave/client/editor/Editors.java
@@ -45,15 +45,19 @@ import org.waveprotocol.wave.model.util.CollectionUtils;
*/
public final class Editors {
+ private static String localDomain;
+
private Editors() {
}
/**
* Creates an editor.
+ * @param localDomain
*
* @return New Editor instance
*/
public static Editor create() {
+ Editors.localDomain = "kk";
Element e = Document.get().createDivElement();
e.setClassName("editor");
return UserAgent.isMobileWebkit() ? // \u2620
@@ -105,7 +109,7 @@ public final class Editors {
LineRendering.registerLines(ROOT_HANDLER_REGISTRY);
Caption.register(ROOT_HANDLER_REGISTRY);
- ChunkyElementHandler.register("br", ROOT_HANDLER_REGISTRY);
+ ChunkyElementHandler.register("br", ROOT_HANDLER_REGISTRY);
AnnotationPaint.register(ROOT_HANDLER_REGISTRY);
ImgDoodad.register(ROOT_HANDLER_REGISTRY);
diff --git a/src/org/waveprotocol/wave/client/editor/content/misc/AnnotationPaint.java b/src/org/waveprotocol/wave/client/editor/content/misc/AnnotationPaint.java
index bb62b1a..6ad01a4 100644
--- a/src/org/waveprotocol/wave/client/editor/content/misc/AnnotationPaint.java
+++ b/src/org/waveprotocol/wave/client/editor/content/misc/AnnotationPaint.java
@@ -82,11 +82,21 @@ public class AnnotationPaint {
/** Full tag name including namespace for boundary nodes */
public static final String BOUNDARY_FULL_TAGNAME = "l:b";
+ private static AnnotationSpreadRenderer paintRenderer;
+
+ /**
+ * Init the localDomain (used to render local links properly)
+ * @param localDomain
+ */
+ public static void init(String localDomain) {
+ paintRenderer.setLocalDomain(localDomain);
+ }
+
/**
- * Registers subclass with ContentElement
+ * Registers subclass with ContentElement
*/
public static void register(ElementHandlerRegistry registry) {
- AnnotationSpreadRenderer paintRenderer = new AnnotationSpreadRenderer();
+ paintRenderer = new AnnotationSpreadRenderer();
registry.registerRenderingMutationHandler(SPREAD_FULL_TAGNAME, paintRenderer);
registry.registerNiceHtmlRenderer(SPREAD_FULL_TAGNAME, PasteFormatRenderers.SHALLOW_CLONE_RENDERER);
diff --git a/src/org/waveprotocol/wave/client/editor/content/misc/AnnotationSpreadRenderer.java b/src/org/waveprotocol/wave/client/editor/content/misc/AnnotationSpreadRenderer.java
index 5a88f48..f69de0d 100644
--- a/src/org/waveprotocol/wave/client/editor/content/misc/AnnotationSpreadRenderer.java
+++ b/src/org/waveprotocol/wave/client/editor/content/misc/AnnotationSpreadRenderer.java
@@ -22,6 +22,7 @@ import com.google.gwt.dom.client.Element;
import com.google.gwt.user.client.DOM;
import com.google.gwt.user.client.Event;
import com.google.gwt.user.client.EventListener;
+import com.google.gwt.user.client.Window;
import org.waveprotocol.wave.client.common.scrub.Scrub;
import org.waveprotocol.wave.client.common.util.DomHelper;
@@ -33,9 +34,9 @@ import org.waveprotocol.wave.client.editor.content.ContentElement;
import org.waveprotocol.wave.client.editor.content.misc.AnnotationPaint.EventHandler;
import org.waveprotocol.wave.client.editor.content.misc.AnnotationPaint.MutationHandler;
import org.waveprotocol.wave.client.scheduler.Scheduler;
-import org.waveprotocol.wave.client.scheduler.SchedulerInstance;
import org.waveprotocol.wave.client.scheduler.Scheduler.Priority;
import org.waveprotocol.wave.client.scheduler.Scheduler.Task;
+import org.waveprotocol.wave.client.scheduler.SchedulerInstance;
import org.waveprotocol.wave.model.util.ReadableStringMap.ProcV;
import java.util.HashSet;
@@ -72,11 +73,13 @@ class AnnotationSpreadRenderer extends RenderingMutationHandler {
}
};
+ private String domain;
+
private static MutationHandler getMutationHandler(ContentElement element) {
String handlerId = element.getAttribute(AnnotationPaint.MUTATION_LISTENER_ATTR);
return handlerId == null ? null : AnnotationPaint.mutationHandlerRegistry.get(handlerId);
}
-
+
@Override
public void onActivationStart(ContentElement element) {
fanoutAttrs(element);
@@ -108,9 +111,9 @@ class AnnotationSpreadRenderer extends RenderingMutationHandler {
if (newValue != null) {
String scrubbedValue = Scrub.scrub(newValue);
implNodelet.setAttribute("href", scrubbedValue);
- if (scrubbedValue.startsWith("#")) {
+ if (scrubbedValue.startsWith("#") || (domain != null && scrubbedValue.matches("^http([s]|)://" + domain + "/.*"))) {
implNodelet.removeAttribute("target");
- } else {
+ } else {
implNodelet.setAttribute("target", "_blank");
}
} else {
@@ -217,4 +220,13 @@ class AnnotationSpreadRenderer extends RenderingMutationHandler {
public void onDescendantsMutated(ContentElement element) {
scheduleMutationNotification(element);
}
+
+ /**
+ * Sets the local domain (used to render local links properly)
+ *
+ * @param localDomain the new local domain
+ */
+ public void setLocalDomain(String localDomain) {
+ domain = localDomain;
+ }
}
diff --git a/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java b/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java
index 1e38273..7088f80 100644
--- a/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java
+++ b/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java
@@ -906,7 +906,6 @@ public class GadgetWidget extends ObservableSupplementedWave.ListenerImpl
String url = cleanUrl(metadata.getIframeUrl(view));
if (url.equals(iframeUrl) && ((token == null) || token.isEmpty())) {
log("Received metadata matches the cached information.");
- constructGadgetSizeFromMetadata(metadata, view, url);
return;
}
// NOTE(user): Technically we should not save iframe URLs for gadgets with security tokens,
@@ -922,10 +921,6 @@ public class GadgetWidget extends ObservableSupplementedWave.ListenerImpl
if ("".equals(ui.getTitleLabelText()) && metadata.hasTitle()) {
ui.setTitleLabelText(metadata.getTitle());
}
- constructGadgetSizeFromMetadata(metadata, view, url);
- }
-
- private void constructGadgetSizeFromMetadata(GadgetMetadata metadata, String view, String url) {
int height =
(int) (metadata.hasHeight() ? metadata.getHeight() : metadata.getPreferredHeight(view));
int width =
diff --git a/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java b/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java
index b4f141b..a8a5b90 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java
+++ b/src/org/waveprotocol/wave/client/wavepanel/impl/edit/EditSession.java
@@ -30,6 +30,7 @@ import org.waveprotocol.wave.client.editor.Editor;
import org.waveprotocol.wave.client.editor.EditorSettings;
import org.waveprotocol.wave.client.editor.Editors;
import org.waveprotocol.wave.client.editor.content.ContentDocument;
+import org.waveprotocol.wave.client.editor.content.misc.AnnotationPaint;
import org.waveprotocol.wave.client.editor.keys.KeyBindingRegistry;
import org.waveprotocol.wave.client.util.ClientFlags;
import org.waveprotocol.wave.client.wave.DocumentRegistry;
@@ -92,7 +93,7 @@ public final class EditSession
public static EditSession install(ModelAsViewProvider views,
DocumentRegistry<? extends InteractiveDocument> documents,
- SelectionExtractor selectionExtractor, FocusFramePresenter focus, WavePanelImpl panel) {
+ SelectionExtractor selectionExtractor, FocusFramePresenter focus, WavePanelImpl panel, String localDomain) {
EditSession edit = new EditSession(views, documents, panel.getGwtPanel(), selectionExtractor);
focus.addListener(edit);
if (panel.hasContents()) {
@@ -103,6 +104,7 @@ public final class EditSession
// Warms up the editor code (e.g., internal statics) by creating and throwing
// away an editor, in order to reduce the latency of starting the first edit
// session.
+ AnnotationPaint.init(localDomain);
Editors.create();
return edit;
diff --git a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java
index 3a470e0..b8d4428 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java
+++ b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java
@@ -436,7 +436,7 @@ public class EditToolbar {
linkAnnotationValue);
} catch (InvalidLinkException e) {
String rawLinkValue =
- Window.prompt("Enter link: URL or Wave ID.", WaveRefConstants.WAVE_URI_PREFIX);
+ Window.prompt("Enter link: URL or Wave ID.", "http://");
// user hit "ESC" or "cancel"
if (rawLinkValue == null) {
return;
diff --git a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml
index c8b7a81..5f41486 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml
+++ b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml
@@ -17,7 +17,7 @@
<ui:UiBinder
xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:w="urn:import:org.waveprotocol.wave.client.widget.common" >
-
+
<ui:style>
.self {
overflow: hidden;
@@ -25,30 +25,32 @@
border: 1px solid #ccc;
margin: 15px 0px;
}
-
+
.self:hover {
background: #ddd;
}
-
+
.img {
float: left;
+ display: none;
}
-
+
.img img {
- width: 120px;
- height: 120px;
+ width: 0px;
+ height: 0px;
}
-
+
.description {
overflow: hidden;
color: #888;
}
-
- .img, .description, .self h3 {
+
+ .img, .description, .self h3 {
margin: 15px;
}
+
</ui:style>
-
+
<w:ImplPanel ui:field="self" styleName="{style.self}">
<div class="{style.img}">
<img ui:field="image"/>
diff --git a/src/org/waveprotocol/wave/client/wavepanel/render/FullDomRenderer.java b/src/org/waveprotocol/wave/client/wavepanel/render/FullDomRenderer.java
index 7bf5d6e..4b5aa25 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/render/FullDomRenderer.java
+++ b/src/org/waveprotocol/wave/client/wavepanel/render/FullDomRenderer.java
@@ -24,6 +24,7 @@ import org.waveprotocol.wave.client.state.ThreadReadStateMonitor;
import org.waveprotocol.wave.client.uibuilder.HtmlClosure;
import org.waveprotocol.wave.client.uibuilder.HtmlClosureCollection;
import org.waveprotocol.wave.client.uibuilder.UiBuilder;
+import org.waveprotocol.wave.client.wavepanel.view.IntrinsicBlipMetaView;
import org.waveprotocol.wave.client.wavepanel.view.ViewIdMapper;
import org.waveprotocol.wave.client.wavepanel.view.dom.full.AnchorViewBuilder;
import org.waveprotocol.wave.client.wavepanel.view.dom.full.BlipMetaViewBuilder;
@@ -48,6 +49,7 @@ import org.waveprotocol.wave.model.wave.ParticipantId;
import java.util.Collections;
import java.util.Comparator;
+import java.util.EnumSet;
import java.util.List;
/**
@@ -220,6 +222,8 @@ public final class FullDomRenderer implements RenderingRules<UiBuilder> {
};
BlipMetaViewBuilder metaUi = BlipMetaViewBuilder.create(viewIdMapper.metaOf(blip), document);
+ if (blip.isRoot())
+ metaUi.disable(BlipMetaViewBuilder.DELETE_MENU_OPTIONS_SET);
blipPopulator.render(blip, metaUi);
return BlipViewBuilder.create(viewIdMapper.blipOf(blip), metaUi, threadsUi, convsUi);
diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/BlipMenuItemDomImpl.java b/src/org/waveprotocol/wave/client/wavepanel/view/dom/BlipMenuItemDomImpl.java
index 4b97489..1507f83 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/BlipMenuItemDomImpl.java
+++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/BlipMenuItemDomImpl.java
@@ -36,7 +36,7 @@ public final class BlipMenuItemDomImpl implements DomView, IntrinsicBlipMenuItem
/** The CSS classes used to manipulate style based on state changes. */
private final BlipViewBuilder.Css css;
-
+
BlipMenuItemDomImpl(Element self, BlipViewBuilder.Css css) {
this.self = self;
this.css = css;
@@ -63,13 +63,13 @@ public final class BlipMenuItemDomImpl implements DomView, IntrinsicBlipMenuItem
@Override
public void select() {
self.setAttribute(OPTION_SELECTED_ATTRIBUTE, "s");
- self.setClassName(css.menuOption() + " " + css.menuOptionSelected());
+ self.addClassName(css.menuOptionSelected());
}
@Override
public void deselect() {
self.removeAttribute(OPTION_SELECTED_ATTRIBUTE);
- self.setClassName(css.menuOption());
+ self.removeClassName(css.menuOptionSelected());
}
@Override
diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/CollapsibleDomImpl.java b/src/org/waveprotocol/wave/client/wavepanel/view/dom/CollapsibleDomImpl.java
index c201793..5ab061d 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/CollapsibleDomImpl.java
+++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/CollapsibleDomImpl.java
@@ -156,13 +156,13 @@ final class CollapsibleDomImpl implements DomView {
public void setTotalBlipCount(int totalBlipCount) {
self.setAttribute(TOTAL_BLIPS_ATTRIBUTE, "" + totalBlipCount);
- getCountTotal().setInnerText("" + totalBlipCount);
+ getCountTotal().setInnerText("" + totalBlipCount + (totalBlipCount > 1? " replies": " reply"));
}
public void setUnreadBlipCount(int unreadBlipCount) {
self.setAttribute(UNREAD_BLIPS_ATTRIBUTE, "" + unreadBlipCount);
Element unread = getCountUnread();
- unread.setInnerText("(" + unreadBlipCount + ")");
+ unread.setInnerText(" (" + unreadBlipCount + " unread)");
if (unreadBlipCount > 0) {
unread.getStyle().clearDisplay();
} else {
diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css
index 57294ec..72b1a86 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css
+++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css
@@ -50,7 +50,7 @@
* metabar element is positioned left by 0.3em with a 0.3em border.
*/
-.blip {
+.blip {
/* Positioned container for focus frame. */
position: relative;
padding: 3px;
@@ -139,7 +139,7 @@
-moz-border-radius: 0.3em;
-webkit-border-radius: 0.3em;
cursor: pointer;
- padding: 0.3em; /* Matches metabar padding. */
+ padding: 0.3em 0.5em 0.3em 1.4em; /* Matches metabar padding. */
}
.read .menuOption:hover {
@@ -168,7 +168,7 @@
}
.privateReplies {
- margin: 0 1em 1em 4.5em;
+ margin: 0 1em 1em 4.5em;
}
.contentContainer, .replies, .privateReplies{word-wrap: break-word;}
diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java
index 9ec4aaf..aaac5be 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java
+++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java
@@ -81,16 +81,27 @@ public final class BlipMetaViewBuilder implements UiBuilder, IntrinsicBlipMetaVi
private final static Map<MenuOption, SafeHtml> MENU_LABELS =
new EnumMap<MenuOption, SafeHtml>(MenuOption.class);
- private final static StringMap<MenuOption> MENU_OPTIONS = CollectionUtils.createStringMap();
+ private final static Map<MenuOption, SafeHtml> MENU_ICONS =
+ new EnumMap<MenuOption, SafeHtml>(MenuOption.class);
+ private final static StringMap<MenuOption> MENU_OPTIONS = CollectionUtils.createStringMap();
+ public final static Set<MenuOption> DELETE_MENU_OPTIONS_SET = EnumSet.of(IntrinsicBlipMetaView.MenuOption.DELETE);
+
public static final String OPTION_ID_ATTRIBUTE = "o";
public static final String OPTION_SELECTED_ATTRIBUTE = "s";
-
+
static {
+ BlipIconResources.Css css = BlipIconResources.Loader.res.css();
+ MENU_ICONS.put(MenuOption.EDIT, EscapeUtils.fromSafeConstant(css.edit()));
+ MENU_ICONS.put(MenuOption.REPLY, EscapeUtils.fromSafeConstant(css.reply()));
+ MENU_ICONS.put(MenuOption.DELETE, EscapeUtils.fromSafeConstant(css.delete()));
+ MENU_ICONS.put(MenuOption.LINK, EscapeUtils.fromSafeConstant(css.link()));
+
MENU_CODES.put(MenuOption.EDIT, EscapeUtils.fromSafeConstant("e"));
MENU_CODES.put(MenuOption.REPLY, EscapeUtils.fromSafeConstant("r"));
MENU_CODES.put(MenuOption.DELETE, EscapeUtils.fromSafeConstant("d"));
MENU_CODES.put(MenuOption.LINK, EscapeUtils.fromSafeConstant("l"));
+
MENU_LABELS.put(MenuOption.EDIT, EscapeUtils.fromSafeConstant("Edit"));
MENU_LABELS.put(MenuOption.REPLY, EscapeUtils.fromSafeConstant("Reply"));
MENU_LABELS.put(MenuOption.DELETE, EscapeUtils.fromSafeConstant("Delete"));
@@ -245,6 +256,7 @@ public final class BlipMetaViewBuilder implements UiBuilder, IntrinsicBlipMetaVi
out.append(EscapeUtils.fromSafeConstant("|"));
String style = selected.contains(option) //
? css.menuOption() + css.menuOptionSelected() : css.menuOption();
+ style += " " + MENU_ICONS.get(option).asString();
String extra = OPTION_ID_ATTRIBUTE + "='" + MENU_CODES.get(option).asString() + "'"
+ (selected.contains(option) ? " " + OPTION_SELECTED_ATTRIBUTE + "='s'" : "");
openSpanWith(out, null, style, TypeCodes.kind(Type.MENU_ITEM), extra);
diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/CollapsibleBuilder.java b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/CollapsibleBuilder.java
index 8436997..8efe09f 100644
--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/CollapsibleBuilder.java
+++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/CollapsibleBuilder.java
@@ -226,11 +226,12 @@ public final class CollapsibleBuilder implements UiBuilder {
{
openSpan(output, Components.COUNT_TOTAL.getDomId(id), null, null);
output.append(totalBlipCount);
+ output.appendEscaped(totalBlipCount > 1? " replies": " reply");
closeSpan(output);
String unreadExtra = unreadBlipCount <= 0 ? " style='display: none;'" : "";
openSpanWith(output, Components.COUNT_UNREAD.getDomId(id), null, null, unreadExtra);
- output.appendEscaped("(" + unreadBlipCount + ")");
+ output.appendEscaped(" (" + unreadBlipCount + " unread)");
closeSpan(output);
openSpan(output, Components.DROP_CONTAINER.getDomId(id), css.dropContainer() +
diff --git a/test/org/waveprotocol/box/server/rpc/UserRegistrationServletTest.java b/test/org/waveprotocol/box/server/rpc/UserRegistrationServletTest.java
index 8b91e7b..100c90b 100644
--- a/test/org/waveprotocol/box/server/rpc/UserRegistrationServletTest.java
+++ b/test/org/waveprotocol/box/server/rpc/UserRegistrationServletTest.java
@@ -33,7 +33,6 @@ import org.waveprotocol.box.server.account.HumanAccountDataImpl;
import org.waveprotocol.box.server.authentication.PasswordDigest;
import org.waveprotocol.box.server.persistence.AccountStore;
import org.waveprotocol.box.server.persistence.memory.MemoryStore;
-import org.waveprotocol.box.server.robots.agent.welcome.WelcomeRobot;
import org.waveprotocol.wave.model.wave.ParticipantId;
import java.io.IOException;
@@ -55,8 +54,6 @@ public class UserRegistrationServletTest extends TestCase {