[kune-commits] r903 - in trunk: . dev-utils script
src/main/java/org/ourproject/kune/app/public
src/main/java/org/ourproject/kune/app/public/css
src/main/java/org/ourproject/kune/chat/client
src/main/java/org/ourproject/kune/docs/client
src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui
src/main/java/org/ourproject/kune/docs/client/cnt/reader
src/main/java/org/ourproject/kune/platf/client/dto
src/main/java/org/ourproject/kune/platf/client/services
src/main/java/org/ourproject/kune/platf/client/tool
src/main/java/org/ourproject/kune/platf/client/ui
src/main/java/org/ourproject/kune/workspace/client/ctxnav
src/main/java/org/ourproject/kune/workspace/client/editor
src/main/java/org/ourproject/kune/workspace/client/search
src/main/java/org/ourproject/kune/workspace/client/signin
src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo
src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic
src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch
src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign
src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu
src/main/java/org/ourproject/kune/workspace/client/skel
src/main/java/org/ourproject/kune/workspace/client/socialnet
src/main/java/org/ourproject/kune/workspace/client/tags
src/main/java/org/ourproject/kune/workspace/client/title
src/main/resources
vjrj
vjrj at ourproject.org
Sat Oct 11 19:04:40 CEST 2008
Author: vjrj
Date: 2008-10-11 19:04:26 +0200 (Sat, 11 Oct 2008)
New Revision: 903
Modified:
trunk/dev-utils/kune.cleanup.eclipse.preferences.xml
trunk/dev-utils/kune.formatter.eclipse.preferences.xml
trunk/pom.xml
trunk/script/css-compact-and-tidy.css
trunk/src/main/java/org/ourproject/kune/app/public/Kune.html
trunk/src/main/java/org/ourproject/kune/app/public/css/all.css
trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css
trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java
trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java
trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui/FolderViewerPanel.java
trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java
trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java
trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherView.java
trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java
trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java
trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java
trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java
trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java
trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java
trunk/src/main/resources/kune.properties
Log:
Incomplete - task Hosted mode default border layout problems with mozilla 1.7.13
search bug tags fixed
folder navigation selection bug fixed
language shows in subtitle optionally
other fixes
Modified: trunk/dev-utils/kune.cleanup.eclipse.preferences.xml
===================================================================
--- trunk/dev-utils/kune.cleanup.eclipse.preferences.xml 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/dev-utils/kune.cleanup.eclipse.preferences.xml 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,51 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="2">
-<profile kind="CleanUpProfile" name="kune-clean-up" version="2">
-<setting id="cleanup.always_use_blocks" value="true"/>
-<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
-<setting id="cleanup.use_this_for_non_static_field_access" value="false"/>
-<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
-<setting id="cleanup.remove_unused_private_fields" value="true"/>
-<setting id="cleanup.remove_unnecessary_casts" value="true"/>
-<setting id="cleanup.sort_members_all" value="true"/>
-<setting id="cleanup.make_local_variable_final" value="true"/>
-<setting id="cleanup.never_use_parentheses_in_expressions" value="false"/>
-<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
-<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/>
-<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
-<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
-<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
-<setting id="cleanup.always_use_parentheses_in_expressions" value="true"/>
-<setting id="cleanup.remove_unused_private_types" value="true"/>
-<setting id="cleanup.format_source_code" value="true"/>
-<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
-<setting id="cleanup.remove_unused_local_variables" value="false"/>
-<setting id="cleanup.add_missing_nls_tags" value="false"/>
-<setting id="cleanup.add_missing_override_annotations" value="false"/>
-<setting id="cleanup.add_missing_annotations" value="false"/>
-<setting id="cleanup.use_this_for_non_static_method_access" value="false"/>
-<setting id="cleanup.make_variable_declarations_final" value="true"/>
-<setting id="cleanup.make_parameters_final" value="true"/>
-<setting id="cleanup.remove_private_constructors" value="true"/>
-<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
-<setting id="cleanup.add_missing_deprecated_annotations" value="false"/>
-<setting id="cleanup.add_generated_serial_version_id" value="false"/>
-<setting id="cleanup.organize_imports" value="true"/>
-<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
-<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
-<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
-<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
-<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
-<setting id="cleanup.never_use_blocks" value="false"/>
-<setting id="cleanup.sort_members" value="false"/>
-<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
-<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
-<setting id="cleanup.add_serial_version_id" value="true"/>
-<setting id="cleanup.add_default_serial_version_id" value="true"/>
-<setting id="cleanup.use_blocks" value="true"/>
-<setting id="cleanup.make_private_fields_final" value="true"/>
-<setting id="cleanup.remove_unused_imports" value="true"/>
-<setting id="cleanup.remove_unused_private_methods" value="true"/>
-<setting id="cleanup.remove_unused_private_members" value="false"/>
-</profile>
-</profiles>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="2">
+<profile kind="CleanUpProfile" name="kune-clean-up" version="2">
+<setting id="cleanup.remove_unused_private_fields" value="true"/>
+<setting id="cleanup.always_use_parentheses_in_expressions" value="true"/>
+<setting id="cleanup.never_use_blocks" value="false"/>
+<setting id="cleanup.remove_unused_private_methods" value="true"/>
+<setting id="cleanup.add_missing_deprecated_annotations" value="false"/>
+<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/>
+<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
+<setting id="cleanup.sort_members" value="true"/>
+<setting id="cleanup.remove_unused_local_variables" value="false"/>
+<setting id="cleanup.never_use_parentheses_in_expressions" value="false"/>
+<setting id="cleanup.remove_unused_private_members" value="false"/>
+<setting id="cleanup.remove_unnecessary_casts" value="true"/>
+<setting id="cleanup.make_parameters_final" value="true"/>
+<setting id="cleanup.use_this_for_non_static_field_access" value="false"/>
+<setting id="cleanup.remove_private_constructors" value="true"/>
+<setting id="cleanup.use_blocks" value="true"/>
+<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
+<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
+<setting id="cleanup.always_use_this_for_non_static_field_access" value="false"/>
+<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="true"/>
+<setting id="cleanup.add_default_serial_version_id" value="true"/>
+<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
+<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
+<setting id="cleanup.make_variable_declarations_final" value="true"/>
+<setting id="cleanup.add_missing_nls_tags" value="false"/>
+<setting id="cleanup.format_source_code" value="true"/>
+<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
+<setting id="cleanup.add_missing_override_annotations" value="false"/>
+<setting id="cleanup.remove_unused_private_types" value="true"/>
+<setting id="cleanup.add_missing_methods" value="false"/>
+<setting id="cleanup.make_local_variable_final" value="true"/>
+<setting id="cleanup.correct_indentation" value="false"/>
+<setting id="cleanup.remove_unused_imports" value="true"/>
+<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
+<setting id="cleanup.make_private_fields_final" value="true"/>
+<setting id="cleanup.add_generated_serial_version_id" value="false"/>
+<setting id="cleanup.organize_imports" value="true"/>
+<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
+<setting id="cleanup.sort_members_all" value="true"/>
+<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
+<setting id="cleanup.add_missing_annotations" value="false"/>
+<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
+<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
+<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
+<setting id="cleanup.use_this_for_non_static_method_access" value="false"/>
+<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
+<setting id="cleanup.add_serial_version_id" value="true"/>
+<setting id="cleanup.format_source_code_changes_only" value="false"/>
+<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
+<setting id="cleanup.always_use_blocks" value="true"/>
+</profile>
+</profiles>
Modified: trunk/dev-utils/kune.formatter.eclipse.preferences.xml
===================================================================
--- trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/dev-utils/kune.formatter.eclipse.preferences.xml 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,264 +1,267 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="11">
-<profile kind="CodeFormatterProfile" name="kune-formatter" version="11">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="mixed"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-</profile>
-</profiles>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="kune-formatter" version="11">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/pom.xml 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,613 +1,624 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.ourproject</groupId>
- <artifactId>kune</artifactId>
- <packaging>jar</packaging>
- <version>0.0.4</version>
- <description>
- kune free/open/libre collaboration platform
- </description>
- <name>kune</name>
- <url>http://kune.ourproject.org</url>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.ourproject</groupId>
+ <artifactId>kune</artifactId>
+ <packaging>jar</packaging>
+ <version>0.0.4</version>
+ <description>
+ kune free/open/libre collaboration platform
+ </description>
+ <name>kune</name>
+ <url>http://kune.ourproject.org</url>
- <dependencies>
- <!-- guice -->
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice-servlet</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- <version>1.0</version>
- </dependency>
+ <dependencies>
+ <!-- guice -->
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+ </dependency>
- <!-- gwt -->
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>1.5.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-servlet</artifactId>
- <version>1.5.2</version>
- </dependency>
- <!--
- <dependency> <groupId>com.extjs</groupId>
- <artifactId>gxt</artifactId> <version>1.0-beta2</version>
- </dependency>
- -->
- <dependency>
- <groupId>com.gwtext</groupId>
- <artifactId>gwtext</artifactId>
- <version>2.0.5</version>
- </dependency>
- <dependency>
- <groupId>com.gwtextux</groupId>
- <artifactId>gwtextux</artifactId>
- <version>0.3.0b</version>
- </dependency>
- <dependency>
- <groupId>com.allen_sauer.gwt.log.gwt-log</groupId>
- <artifactId>gwt-log</artifactId>
- <version>2.5.2</version>
- </dependency>
- <dependency>
- <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId>
- <artifactId>gwt-voices</artifactId>
- <version>1.5.5</version>
- </dependency>
+ <!-- gwt -->
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <version>1.5.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-servlet</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+ <!--
+ <dependency> <groupId>com.extjs</groupId>
+ <artifactId>gxt</artifactId> <version>1.0-beta2</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>com.gwtext</groupId>
+ <artifactId>gwtext</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.gwtextux</groupId>
+ <artifactId>gwtextux</artifactId>
+ <version>0.3.0b</version>
+ </dependency>
+ <dependency>
+ <groupId>com.allen_sauer.gwt.log.gwt-log</groupId>
+ <artifactId>gwt-log</artifactId>
+ <version>2.5.2</version>
+ </dependency>
+ <dependency>
+ <groupId>com.allen_sauer.gwt.voices.gwt-voices</groupId>
+ <artifactId>gwt-voices</artifactId>
+ <version>1.5.5</version>
+ </dependency>
- <!-- utilities -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- </dependency>
- <dependency>
- <groupId>net.sf.dozer</groupId>
- <artifactId>dozer</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>com.calclab</groupId>
- <artifactId>suco</artifactId>
- <version>0.5.06</version>
- </dependency>
+ <!-- utilities -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.dozer</groupId>
+ <artifactId>dozer</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.calclab</groupId>
+ <artifactId>suco</artifactId>
+ <version>0.5.06</version>
+ </dependency>
- <!-- xmpp -->
- <dependency>
- <groupId>com.calclab.emite</groupId>
- <artifactId>emite</artifactId>
- <version>0.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.jivesoftware.smack</groupId>
- <artifactId>smack</artifactId>
- <version>3.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.jivesoftware.smackx</groupId>
- <artifactId>smackx</artifactId>
- <version>3.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.jivesoftware.smackx.debugger</groupId>
- <artifactId>smackx-debugger</artifactId>
- <version>3.0.4</version>
- </dependency>
+ <!-- xmpp -->
+ <dependency>
+ <groupId>com.calclab.emite</groupId>
+ <artifactId>emite</artifactId>
+ <version>0.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jivesoftware.smack</groupId>
+ <artifactId>smack</artifactId>
+ <version>3.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jivesoftware.smackx</groupId>
+ <artifactId>smackx</artifactId>
+ <version>3.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jivesoftware.smackx.debugger</groupId>
+ <artifactId>smackx-debugger</artifactId>
+ <version>3.0.4</version>
+ </dependency>
- <!-- mysql -->
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>5.0.5</version>
- </dependency>
+ <!-- mysql -->
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.0.5</version>
+ </dependency>
- <!-- hibernate JPA -->
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>3.0.0.GA</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <version>3.2.5.ga</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.ga</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.3.1.ga</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-tools</artifactId>
- <version>3.2.0.beta9a</version>
- </dependency>
- <dependency>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- <version>0.9.1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>com.wideplay</groupId>
- <artifactId>warp-persist</artifactId>
- <version>0.6</version>
- </dependency>
+ <!-- hibernate JPA -->
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>3.0.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.5.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.3.0.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>3.3.1.ga</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-tools</artifactId>
+ <version>3.2.0.beta9a</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.wideplay</groupId>
+ <artifactId>warp-persist</artifactId>
+ <version>0.6</version>
+ </dependency>
- <!-- REST: xml and json (stax) -->
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jettison</groupId>
- <artifactId>jettison</artifactId>
- <version>1.0-RC2</version>
- </dependency>
- <dependency>
- <groupId>net.sf.json-lib</groupId>
- <artifactId>json-lib</artifactId>
- <version>2.1</version>
- <classifier>jdk15</classifier>
- </dependency>
+ <!-- REST: xml and json (stax) -->
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>1.0-RC2</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>2.1</version>
+ <classifier>jdk15</classifier>
+ </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
- <!-- File upload -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- </dependency>
+ <!-- File upload -->
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.1.1</version>
+ </dependency>
- <dependency>
- <groupId>org.cafesip.gwtcomp</groupId>
- <artifactId>gwtcomp</artifactId>
- <version>0.0.3b</version>
- </dependency>
- <dependency>
- <groupId>org.cafesip.gwtcomp</groupId>
- <artifactId>gwtcomp-servlet</artifactId>
- <version>0.0.3b</version>
- </dependency>
+ <dependency>
+ <groupId>org.cafesip.gwtcomp</groupId>
+ <artifactId>gwtcomp</artifactId>
+ <version>0.0.3b</version>
+ </dependency>
+ <dependency>
+ <groupId>org.cafesip.gwtcomp</groupId>
+ <artifactId>gwtcomp-servlet</artifactId>
+ <version>0.0.3b</version>
+ </dependency>
- <!-- db upgrades -->
+ <!-- db upgrades -->
- <dependency>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-core</artifactId>
- <version>1.7.0</version>
- </dependency>
- <dependency>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-plugin</artifactId>
- <version>1.7.0.0</version>
- </dependency>
+ <dependency>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-core</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-plugin</artifactId>
+ <version>1.7.0.0</version>
+ </dependency>
- <!-- jetty dependencies -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.5</version>
- <scope>provided</scope>
- </dependency>
+ <!-- jetty dependencies -->
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.5</version>
+ <scope>provided</scope>
+ </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
- <!-- testing dependencies -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.0.20070617</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <!--
- <scope>test</scope>
- -->
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>1.0-beta-1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- testing dependencies -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.0.20070617</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <!--
+ <scope>test</scope>
+ -->
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openqa.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0-beta-1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <!--
- http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/index.html
- -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Maven Repository</name>
- <url>http://repository.jboss.org/maven2</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>dyndns-repo</id>
- <url>http://maven.dyndns.org/2</url>
- </repository>
- <repository>
- <id>gwt-maven</id>
- <url>
- http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
- </url>
- </repository>
- <repository>
- <id>kune-maven</id>
- <url>http://kune.ourproject.org/mavenrepo/</url>
- </repository>
- <repository>
- <id>gwtext</id>
- <url>http://www.gwt-ext.com/maven2/</url>
- </repository>
- <repository>
- <id>openqa.org</id>
- <name>Openqa Release Repository</name>
- <url>http://archiva.openqa.org/repository/releases</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>openqa.org</id>
- <name>Openqa Snapshot Repository</name>
- <url>http://archiva.openqa.org/repository/snapshots</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.totsp.gwt</groupId>
- <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
- <version>2.0-beta23</version>
- <configuration>
- <logLevel>INFO</logLevel>
- <style>PRETTY</style>
- <runTarget>
- org.ourproject.kune.app.Kune/Kune.html
- </runTarget>
- <compileTargets>
- <compileTarget>
- org.ourproject.kune.app.Kune
- </compileTarget>
- </compileTargets>
- <generatorRootClasses>
- <value>org.ourproject.kune.MyBean</value>
- </generatorRootClasses>
- <generatorDestinationPackage>
- org.ourproject.kune.app.Kune
- </generatorDestinationPackage>
- <generateGettersAndSetters>
- true
- </generateGettersAndSetters>
- <generatePropertyChangeSupport>
- true
- </generatePropertyChangeSupport>
- </configuration>
- <executions>
- <execution>
- <goals>
- <!-- <goal>mergewebxml</goal> -->
- <!-- <goal>compile</goal> -->
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.0</version>
- <configuration>
- <webXml>target/web.xml</webXml>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- <wtpversion>1.5</wtpversion>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.5</version>
- <configuration>
- <contextPath>/</contextPath>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- </configuration>
- </plugin>
+ <!--
+ http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/index.html
+ -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Maven Repository</name>
+ <url>http://repository.jboss.org/maven2</url>
+ <layout>default</layout>
+ </repository>
+ <repository>
+ <id>dyndns-repo</id>
+ <url>http://maven.dyndns.org/2</url>
+ </repository>
+ <repository>
+ <id>gwt-maven</id>
+ <url>
+ http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/
+ </url>
+ </repository>
+ <repository>
+ <id>kune-maven</id>
+ <url>http://kune.ourproject.org/mavenrepo/</url>
+ </repository>
+ <repository>
+ <id>gwtext</id>
+ <url>http://www.gwt-ext.com/maven2/</url>
+ </repository>
+ <repository>
+ <id>openqa.org</id>
+ <name>Openqa Release Repository</name>
+ <url>http://archiva.openqa.org/repository/releases</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>openqa.org</id>
+ <name>Openqa Snapshot Repository</name>
+ <url>http://archiva.openqa.org/repository/snapshots</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <issueManagement>
+ <system>google code issues list</system>
+ <url>http://code.google.com/p/kune/issues/list</url>
+ </issueManagement>
+ <scm>
+ <url>svn://scm.ourproject.org/svnroot/kune/trunk</url>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.totsp.gwt</groupId>
+ <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
+ <version>2.0-beta23</version>
+ <configuration>
+ <logLevel>INFO</logLevel>
+ <style>PRETTY</style>
+ <runTarget>
+ org.ourproject.kune.app.Kune/Kune.html
+ </runTarget>
+ <compileTargets>
+ <compileTarget>
+ org.ourproject.kune.app.Kune
+ </compileTarget>
+ </compileTargets>
+ <generatorRootClasses>
+ <value>org.ourproject.kune.MyBean</value>
+ </generatorRootClasses>
+ <generatorDestinationPackage>
+ org.ourproject.kune.app.Kune
+ </generatorDestinationPackage>
+ <generateGettersAndSetters>
+ true
+ </generateGettersAndSetters>
+ <generatePropertyChangeSupport>
+ true
+ </generatePropertyChangeSupport>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <!-- <goal>mergewebxml</goal> -->
+ <!-- <goal>compile</goal> -->
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <webXml>target/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ <wtpversion>1.5</wtpversion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <version>6.1.5</version>
+ <configuration>
+ <contextPath>/</contextPath>
+ <scanIntervalSeconds>0</scanIntervalSeconds>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.liquibase</groupId>
- <artifactId>liquibase-plugin</artifactId>
- <version>1.7.0.0</version>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <configuration>
- <changeLogFile>
- src/main/resources/db/liquibase_changelog.xml
- </changeLogFile>
- <driver>com.mysql.jdbc.Driver</driver>
- <url>jdbc:mysql://localhost/kune_dev</url>
- <username>kune</username>
- <password>db4kune</password>
- <verbose>true</verbose>
- </configuration>
- <!--
- <configuration> <verbose>true</verbose> <propertiesFile>
- src/main/resources/db/liquibase.properties </propertiesFile>
- </configuration>
- -->
- <goals>
- <goal>update</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>core</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>core</classifier>
- <includes>
- <include>
- **/Kune-Platform.gwt.xml**
- </include>
- <include>
- **/I18nTranslationService**
- </include>
- <include>**/BasicDialog.**</include>
- <include>**/HorizontalLine.**</include>
- <include>**/AbstractLabel.**</include>
- <include>**/IconLabel.**</include>
- <include>
- **/EditableIconLabel.**
- </include>
- <include>
- **/EditableClickListener.**
- </include>
- <include>**/KuneStringUtils.**</include>
- <include>**/IconHyperlink*.**</include>
- <include>**/LabelWrapper*.**</include>
- <include>**/KuneUiUtils.**</include>
- <include>**/View.**</include>
- <!--
- <include>**/platf/**</include>
- <include>**/platf/client/extend/**</include>
- <include>**/platf/client/*java</include>
- <include>**/platf/client/app/**</include>
- <include>**/platf/client/dispatch/**</include>
- -->
- </includes>
- </configuration>
- </execution>
- <execution>
- <id>helloworldplugin</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <classifier>helloworldplugin</classifier>
- <includes>
- <include>**/HelloWorld*</include>
- </includes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>pertest</forkMode>
- <!--
- Skip the normal tests, we'll run them in the integration-test
- phase
- -->
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- </resource>
- </resources>
- </build>
+ <plugin>
+ <groupId>org.liquibase</groupId>
+ <artifactId>liquibase-plugin</artifactId>
+ <version>1.7.0.0</version>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <configuration>
+ <changeLogFile>
+ src/main/resources/db/liquibase_changelog.xml
+ </changeLogFile>
+ <driver>com.mysql.jdbc.Driver</driver>
+ <url>jdbc:mysql://localhost/kune_dev</url>
+ <username>kune</username>
+ <password>db4kune</password>
+ <verbose>true</verbose>
+ </configuration>
+ <!--
+ <configuration> <verbose>true</verbose> <propertiesFile>
+ src/main/resources/db/liquibase.properties </propertiesFile>
+ </configuration>
+ -->
+ <goals>
+ <goal>update</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>core</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>core</classifier>
+ <includes>
+ <include>
+ **/Kune-Platform.gwt.xml**
+ </include>
+ <include>
+ **/I18nTranslationService**
+ </include>
+ <include>**/BasicDialog.**</include>
+ <include>**/HorizontalLine.**</include>
+ <include>**/AbstractLabel.**</include>
+ <include>**/IconLabel.**</include>
+ <include>
+ **/EditableIconLabel.**
+ </include>
+ <include>
+ **/EditableClickListener.**
+ </include>
+ <include>**/KuneStringUtils.**</include>
+ <include>**/IconHyperlink*.**</include>
+ <include>**/LabelWrapper*.**</include>
+ <include>**/KuneUiUtils.**</include>
+ <include>**/View.**</include>
+ <!--
+ <include>**/platf/**</include>
+ <include>**/platf/client/extend/**</include>
+ <include>**/platf/client/*java</include>
+ <include>**/platf/client/app/**</include>
+ <include>**/platf/client/dispatch/**</include>
+ -->
+ </includes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>helloworldplugin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classifier>helloworldplugin</classifier>
+ <includes>
+ <include>**/HelloWorld*</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.2</version>
- <configuration>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>
- net.sourceforge.cobertura.datafile
- </name>
- <value>
- ${project.build.directory}/cobertura/cobertura.ser
- </value>
- </property>
- </systemProperties>
- <forkMode>pertest</forkMode>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jdepend-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <configuration>
+ <port>4441</port>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>pertest</forkMode>
+ <!--
+ Skip the normal tests, we'll run them in the integration-test
+ phase
+ -->
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ </resource>
+ </resources>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <linkXref>true</linkXref>
+ <sourceEncoding>utf-8</sourceEncoding>
+ <minimumTokens>100</minimumTokens>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemProperties>
+ <property>
+ <name>
+ net.sourceforge.cobertura.datafile
+ </name>
+ <value>
+ ${project.build.directory}/cobertura/cobertura.ser
+ </value>
+ </property>
+ </systemProperties>
+ <forkMode>pertest</forkMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Modified: trunk/script/css-compact-and-tidy.css
===================================================================
--- trunk/script/css-compact-and-tidy.css 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/script/css-compact-and-tidy.css 2008-10-11 17:04:26 UTC (rev 903)
@@ -37,7 +37,7 @@
}
function tidy {
-ls `which csstidy | cut -d " " -f 1` 2> /dev/null
+ls `which csstidy | cut -d " " -f 1` 2> /dev/null > /dev/null
if [[ $? -eq 0 ]]
then
csstidy $CATTMPFILE \
Modified: trunk/src/main/java/org/ourproject/kune/app/public/Kune.html
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2008-10-11 17:04:26 UTC (rev 903)
@@ -48,7 +48,7 @@
src="org.ourproject.kune.app.Kune.nocache.js"></script>
<iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe>
<iframe src="" id="__download" style="width:0;height:0;border:0"></iframe>
-<div id="kuneprogresspanel" class="k-sitebar">
+<div id="kuneprogresspanel" class="">
<table cellspacing="0" summary="Starting" cellpadding="0" border="0"
style="height: 16px; margin-top: 5px; margin-left: 5px;">
<tbody>
@@ -58,7 +58,7 @@
src="images/spin-kune-thund-green.gif"
style="height: 16px; width: 16px;" /></td>
<td align="left" style="vertical-align: top;" class="kune-Progress">
- <div class="k-sitebar gwt-Label" id="kuneprogresstext">Starting</div>
+ <div class="gwt-Label" id="kuneprogresstext">Starting</div>
</td>
<td width="100%" height="16" align="left"
style="vertical-align: top;"></td>
Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-10-11 17:04:26 UTC (rev 903)
@@ -35,4 +35,4 @@
}
*/.kune-NavigationBar .topBar .gwt-Image{margin:0 2px 0 5px;}.kune-NavigationBar .Items{margin:2px 0;}.kune-NavigationBar .Items .gwt-Image{margin:2px 0;vertical-align:middle;}.kune-NavigationBar .Items .gwt-Hyperlink a{color:green;/* FIXME: other color */}.kune-NavigationBar .topBar .topBar-margin{margin-left:5px;}.kune-NavigationBar .pathMenu{vertical-align:middle;}.kune-NavigationBar .pathMenu .gwt-MenuItem{background:transparent url(img/button-bg-hard.gif) repeat-x 0 0;border-left:1px solid #AAA;border-right:1px solid #AAA;color:#999;cursor:pointer;white-space:nowrap;padding:3px 6px;}.kune-NavigationBar .pathMenu .gwt-MenuItem-selected{background:transparent url(img/button-bg-soft.gif) repeat-x 0 0;color:#000;}.kune-NavigationBar .kune-IconHyperlink{vertical-align:middle;margin-left:5px;}.kune-NavigationBar .kune-IconHyperlink a{color:green;text-decoration:none;}.kune-NavigationBar .kune-IconHyperlink .gwt-Image{margin-right:3px;vertical-align:middle;}/* Social Network */.kune-StackedDropDownPanel{}.kune-StackedDropDownPanel .gwt-StackPanelItem{border-top:1px solid #CCC;border-bottom:1px solid #CCC;background-color:#EFA;cursor:pointer;padding:1px 3px 0 6px;overflow:hidden;}.kune-StackedDropDownPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-StackedDropDownPanel .kune-DropDownInner table{width:100%;}.kune-StackedDropDownPanel .gwt-StackPanelItem-selected{}.kune-StackedDropDownPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-StackedDropDownPanel .kune-DropDownInner{padding:0;}/* StackedDropDownPanel Members */.kune-StackSubItemLabel{overflow:hidden;}.kune-StackSubItemLabel .gwt-MenuItem{white-space:nowrap;cursor:pointer;border-bottom:1px solid #F2F2F2;}.kune-StackSubItemLabel table{width:100%;}.kune-StackSubItemLabel .gwt-MenuItem img{vertical-align:middle;margin-top:1px;margin-bottom:1px;margin-left:5px;margin-right:3px;}.kune-StackSubItemLabel .gwt-MenuItem-selected{background-color:#FFE6D5;}.kune-StackSubItemActions{background-color:#F2F2F2;border:1px solid #999;vertical-align:middle;padding:5px 0;margin-left:-120px;margin-top:-2px;}.kune-StackSubItemActions .gwt-MenuItem{cursor:pointer;padding:1px 10px;white-space:nowrap;}.kune-StackSubItemActions .gwt-MenuItem img{vertical-align:middle;margin-right:3px;}.kune-StackSubItemActions .gwt-MenuItem-selected{background-color:#FFB958;}/* AccessList */.kune-AccessListSubLabel{font-style:italic;}.kune-AccessList{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel{margin:5px;width:100%;}.kune-AccessList .gwt-DisclosurePanel-open{width:100%;}.kune-AccessList .gwt-DisclosurePanel-closed{width:100%;}.kune-AccessList .header{margin:0 0 3px;text-decoration:none;width:100%;background-color:#8DD35F;}.kune-AccessList .header table{margin:0 5px 0 0;width:100%;color:#FFF;}.kune-AccessList .header img{margin:0 3px 0 0;}.kune-AccessList .content{margin:0 0 0 7px;width:100%;}.kune-AccessList .content table{margin-bottom:5px;width:100%;}/* Rate */.kune-RatePanel-Label{white-space:nowrap;vertical-align:middle;}.kune-RatePanel-Stars{margin-left:5px;vertical-align:middle;}.kune-RatePanel-Stars-RateIt{cursor:pointer;}/* Licenses */.kune-License-CC-Header{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}.kune-License-CC-Header .gwt-Label{color:#15428B;font-weight:700;font-size:85%;margin-top:5px;}/* Theme */.kune-IconBottomPanel .gwt-MenuItem{cursor:pointer;background-color:#FFF;margin:2px 2px 2px 5px;}.kune-IconBottomPanel .gwt-MenuItem-selected{background-color:#F2F2F2;}.gwt-MenuBar-bottomMenu{margin-left:-60px;margin-top:-120px;}/* i18n */.kune-I18nTranslatorCell{white-space:normal;}.kune-i18nTranslator-recommend{margin:10px;}.kune-i18nTranslator-recommend h1{font-size:131%;font-weight:700;}.kune-i18nTranslator-recommend h2{font-size:116%;font-weight:700;}.kune-i18nTranslator-recommend h3{font-size:108%;font-weight:700;font-style:italic;}.kune-i18nTranslator-recommend em{font-weight:700;}.kune-i18nTranslator-recommend strong{font-weight:700;}/* Admin Context */.kune-AdminContextPanel{margin:6px;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem{background:transparent url(img/arrow-right-white.gif) no-repeat scroll 3px 2px;cursor:pointer;padding:3px 10px 1px 20px;overflow:hidden;width:100%;}.kune-AdminContextPanel .gwt-StackPanelItem img{margin:0 0 0 3px;vertical-align:middle;}.kune-AdminContextPanel .gwt-StackPanelItem-selected{background:transparent url(img/arrow-down-white.gif) no-repeat scroll 3px 2px;background-color:#DEE3DB;}.kune-AdminContextPanelLink{background-color:#E6E6E6;border-top:1px solid #CCC;border-bottom:1px solid #F2F2F2;/* white-space: nowrap; */cursor:pointer;}.kune-AdminContextPanel-inner{background-color:#FFF;}.kune-AdminContextPanel-inner-wrap{margin:5px;}.kune-EditableLabel{}.kune-EditableLabel .kune-EditableLabel-editable{}.kune-EditableLabel-high{background-color:#FFFBC1;cursor:pointer;}.kune-EditableLabel-high span{background-color:#FFFBC1;}.kune-EditableLabel a{margin-left:5px;}.kune-EditableLabel a:link{color:green;}.kune-EditableLabel a:hover{text-decoration:underline;}.kune-EditableLabel a:visited{color:olive;}.kune-EditableLabel img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable img{margin-right:4px;vertical-align:middle;}.kune-EditableLabel-editable span{margin:3px;}.kune-EditableLabel span{margin:3px;}.kune-BottomIconsTrayPanel{width:165px;height:21px;vertical-align:middle;background-color:#EFEFEF;}.kune-TagsPanel-tag{float:left;margin-right:5px;cursor:pointer;}.kune-Content-Main{margin:5px;}/* Yahoo ui base.css */.kune-Content-Main h1{font-size:138.5%;}.kune-Content-Main h2{font-size:123.099998%;}.kune-Content-Main h3{font-size:108%;}.kune-Content-Main h1{margin:1em 0;}.kune-Content-Main h2{margin:1em 0;}.kune-Content-Main h3{margin:1em 0;}.kune-Content-Main h1{font-weight:700;}.kune-Content-Main h2{font-weight:700;}.kune-Content-Main h3{font-weight:700;}.kune-Content-Main h4{font-weight:700;}.kune-Content-Main h5{font-weight:700;}.kune-Content-Main h6{font-weight:700;}.kune-Content-Main strong{font-weight:700;}.kune-Content-Main abbr{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main acronym{border-bottom:1px dotted #000;cursor:help;}.kune-Content-Main em{font-style:italic;}.kune-Content-Main blockquote{margin:1em;}.kune-Content-Main ul{margin:1em;}.kune-Content-Main ol{margin:1em;}.kune-Content-Main dl{margin:1em;}.kune-Content-Main ol{margin-left:2em;}.kune-Content-Main ul{margin-left:2em;}.kune-Content-Main dl{margin-left:2em;}.kune-Content-Main ol{list-style:decimal outside;}.kune-Content-Main li{list-style:decimal outside;}.kune-Content-Main li{list-style:disc outside;}.kune-Content-Main ul{list-style:disc outside;}.kune-Content-Main dl{margin-left:1em;}.kune-Content-Main dd{margin-left:1em;}.kune-Content-Main th{border:1px solid #000;padding:.5em;font-weight:700;text-align:center;}.kune-Content-Main td{border:1px solid #000;padding:.5em;}.kune-Content-Main caption{margin-bottom:.5em;text-align:center;}.kune-Content-Main p{margin-bottom:1em;}.kune-Content-Main fieldset{margin-bottom:1em;}.kune-Content-Main table{margin-bottom:1em;}.kune-Content-Main pre{margin-bottom:1em;}.kune-Content-Main input[type=text]{width:12.25em;width:11.9em;}.kune-Content-Main input[type=password]{width:12.25em;width:11.9em;}.kune-Content-Main textarea{width:12.25em;width:11.9em;}.search-icon{background-image:url(img/search.gif)!important;}.i18n-icon{background-image:url(img/language.gif)!important;}/* RTE Text editor */.kune-TexEditorPanel-TextArea{margin:3px;}.gwt-RichTextArea{/* border: 1px solid #000;
background-color: #FFF; */border:1px solid #4D4D4D;background-color:#FFF;margin:5px 0 5px 10px;}.gwt-RichTextToolbar{/* background-color: #F2F2F2;
- padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial,sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;}
\ No newline at end of file
+ padding: 5px; */height:24px;vertical-align:middle;}.gwt-RichTextToolbar table{vertical-align:middle;}.gwt-RichTextToolbar .gwt-ToggleButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton{float:left;margin-top:2px;}.gwt-RichTextToolbar .gwt-PushButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-PushButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-PushButton-down{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-PushButton-down-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-up{margin-right:2px;border:1px solid #F2F2F2;}.gwt-RichTextToolbar .gwt-ToggleButton-up-hovering{margin-right:2px;border:1px solid #C3D9FF;border-color:#E8F1FF #9daecd #9daecd #e8f1ff;}.gwt-RichTextToolbar .gwt-ToggleButton-down{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .gwt-ToggleButton-down-hovering{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.gwt-RichTextToolbar .x-btn{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lSpace{float:left;}.gwt-RichTextToolbar .kune-Button-Large-lrSpace{float:left;}.RichTextToolbar-menu{float:left;margin-top:2px;z-index:4;}.RichTextToolbar-menu table{border-collapse:collapse;border-spacing:0;margin:0;z-index:4;}.RichTextToolbar-menu .gwt-MenuItem{margin-right:2px;border:1px solid #F2F2F2;}.RichTextToolbar-menu .gwt-MenuItem-selected{margin-right:2px;background-color:#E8F1FF;border:1px solid #C3D9FF;border-color:#9DAECD #e8f1ff #e8f1ff #9daecd;}.RichTextToolbar-submenu{background-color:#FFFCD5;border:1px solid #D38D5F;cursor:default;z-index:4;}.RichTextToolbar-submenu .gwt-MenuItem{cursor:default;white-space:nowrap;border:1px solid #FFFCD5;padding:0 4px;}.RichTextToolbar-submenu .gwt-MenuItem-selected{background-color:#FFB958;border:1px solid #C83737;}.kune-WebSafePalette{background-color:#FFF;border:1px solid #AAA;margin:1px;}.kune-WebSafePalette td{width:12px;height:10px;}.k-site-traybar{background:#FFF none repeat scroll 0 50%;}.k-sitebar .kune-IconHyperlink{white-space:nowrap;}.k-sitebar .kune-IconHyperlink a:link{cursor:pointer;text-decoration:underline;color:#B3B3B3;}.k-sitebar .kune-IconHyperlink a:hover{text-decoration:underline;}.k-sitebar .kune-IconHyperlink a:visited{color:#B3B3B3;}.k-sitebar-labellink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-sitebar{margin-right:10px;height:16px;background:#FFF;}.k-sitebar .gwt-TextBox{border:1px solid #E4A374;margin:0 15px 0 3px;padding-left:3px;color:#B3B3B3;}.k-sitebar .gwt-Hyperlink a{white-space:nowrap;color:#B3B3B3;text-decoration:underline;cursor:pointer;}.k-sitebar .gwt-PushButton{cursor:pointer;}.k-sitebar-LabelLink{white-space:nowrap;color:#B3B3B3;cursor:pointer;text-decoration:underline;}.k-entity-summary{border-left-color:#FFF;border-left-width:5px;}.k-entitytextlogo{border:2px solid #F2F2F2;height:60px;margin:0 0 4px -1px;overflow:hidden;width:468px;}.k-entitytextlogo .gwt-Label{font-size:167%;font-weight:700;margin:5px;height:27px;}.k-entitytextlogo-default .gwt-Label{color:#69312F;}.k-entitytextlogo-green .gwt-Label{color:#250;}.k-entitytextlogo-blue .gwt-Label{color:navy;}.k-entitytextlogo-grey .gwt-Label{color:#1A1A1A;}.k-entitytextlogo-purple .gwt-Label{color:#405;}.k-entitytextlogo-red .gwt-Label{color:maroon;}.k-entitytextlogo .gwt-Hyperlink a{color:#CCC;font-size:85%;margin:5px;text-decoration:underline;white-space:nowrap;background-color:#FFF;}.k-entity-default .x-layout-split{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-green .x-layout-split{background:#5FD35F none repeat scroll 0 50%;}.k-entity-blue .x-layout-split{background:#06F none repeat scroll 0 50%;}.k-entity-grey .x-layout-split{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-purple .x-layout-split{background:#660080 none repeat scroll 0 50%;}.k-entity-red .x-layout-split{background:#D40000 none repeat scroll 0 50%;}.k-entityworkspace .x-layout-split{background:transparent none repeat scroll 0 50%;}.k-entityworkspace-default .x-layout-split{background:#DEAA87 none repeat scroll 0 50%;}.k-entityworkspace-green .x-layout-split{background:#DCE8AB none repeat scroll 0 50%;}.k-entityworkspace-blue .x-layout-split{background:#D5D5FF none repeat scroll 0 50%;}.k-entityworkspace-grey .x-layout-split{background:#999 none repeat scroll 0 50%;}.k-entityworkspace-purple .x-layout-split{background:#A793AC none repeat scroll 0 50%;}.k-entityworkspace-red .x-layout-split{background:#F55 none repeat scroll 0 50%;}.k-entity-title{border-left-style:solid;border-left-width:2px;}.k-entity-title div{line-height:22px;white-space:nowrap;}.k-entity-subtitle{}.k-entity-subtitle div{line-height:22px;white-space:nowrap;}.k-entity-title-rd-default{background:#DD8A3D;}.k-entity-title-rd-green{background:#5FD35F;}.k-entity-title-rd-blue{background:#06F;}.k-entity-title-rd-grey{background:#4D4D4D;}.k-entity-title-rd-purple{background:#660080;}.k-entity-title-rd-red{background:#D40000;}.k-entity-title-default{background:#F1BB59 none repeat scroll 0 50%;border-left-color:#DD8A3D;}.k-entity-title-green{background:#AFA none repeat scroll 0 50%;border-left-color:#5FD35F;}.k-entity-title-blue{background:#AFDDE9 none repeat scroll 0 50%;border-left-color:#06F;}.k-entity-title-grey{background:#CCC none repeat scroll 0 50%;border-left-color:#4D4D4D;}.k-entity-title-purple{background:#DDAFE9 none repeat scroll 0 50%;border-left-color:#660080;}.k-entity-title-red{background:#FF8080 none repeat scroll 0 50%;border-left-color:#D40000;}.k-entity-title-default div{color:#69312F;}.k-entity-title-green div{color:#250;}.k-entity-title-blue div{color:navy;}.k-entity-title-grey div{color:#1A1A1A;}.k-entity-title-purple div{color:#405;}.k-entity-title-red div{color:maroon;}.k-entity-subtitle-default{background:#DD8A3D none repeat scroll 0 50%;}.k-entity-subtitle-green{background:#5FD35F none repeat scroll 0 50%;}.k-entity-subtitle-blue{background:#06F none repeat scroll 0 50%;}.k-entity-subtitle-grey{background:#4D4D4D none repeat scroll 0 50%;}.k-entity-subtitle-purple{background:#660080 none repeat scroll 0 50%;}.k-entity-subtitle-red{background:#D40000 none repeat scroll 0 50%;}.k-entity-subtitle-default div{color:#FFF;}.k-entity-subtitle-green div{color:#FFF;}.k-entity-subtitle-blue div{color:#FFF;}.k-entity-subtitle-grey div{color:#FFF;}.k-entity-subtitle-purple div{color:#FFF;}.k-entity-subtitle-red div{color:#FFF;}.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default{background:#DD8A3D;}.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green{background:#5FD35F;}.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue{background:#06F;}.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey{background:#4D4D4D;}.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple{background:#660080;}.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red{background:#D40000;}.k-entitylicensepanel-licensetext{cursor:pointer;margin-left:5px;text-decoration:underline;}.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body{background:#FFD09D none repeat scroll 0 50%;}.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body{background:#CFA none repeat scroll 0 50%;}.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body{background:#ACF none repeat scroll 0 50%;}.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body{background:#B3B3B3 none repeat scroll 0 50%;}.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body{background:#FAA none repeat scroll 0 50%;}.k-entity-context-purple .x-tree .x-panel-body{background:#DDAFE9 none repeat scroll 0 50%;}.k-entity-bottom div{line-height:2em;color:#FFF;}.k-toolbar-top-line{border-top-color:#d0d0d0;border-top-style:solid;border-top-width:1px;}.k-toolbar-bottom-line{border-bottom-color:#d0d0d0;border-bottom-style:solid;border-bottom-width:1px;}.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{white-space:nowrap;font:normal 100% arial, sans;line-height:19px;}.k-toolbar-sep{padding-top:4px;padding-left:5px;}/* Custom gwt-ext styles */.ytb-sep{background-image:url(../js/ext/resources/images/default/grid/grid-split.gif);background-position:center;background-repeat:no-repeat;display:block;font-size:1px;height:16px;width:4px;overflow:hidden;cursor:default;margin:0 2px;border:0;}.ytb-spacer{width:2px;}.x-grid-group-hd{border-bottom:2px solid grey;cursor:pointer;padding-top:3px;}/* Drop down */.k-dropdownouter{background-color:grey;}.k-dropdownouter-members{}.k-dropdownouter-members-default{background-color:#DF5244;}.k-dropdownouter-members-green{background-color:green;}.k-dropdownouter-members-blue{background-color:#5500D4;}.k-dropdownouter-members-grey{background-color:#4D4D4D;}.k-dropdownouter-members-purple{background-color:#672178;}.k-dropdownouter-members-red{background-color:#A02C2C;}.k-dropdownouter-part{}.k-dropdownouter-part-default{background-color:#CA5842;}.k-dropdownouter-part-green{background-color:#0A0;}.k-dropdownouter-part-blue{background-color:#60F;}.k-dropdownouter-part-grey{background-color:#666;}.k-dropdownouter-part-purple{background-color:#892CA0;}.k-dropdownouter-part-red{background-color:#C83737;}.k-dropdownouter-tags{}.k-dropdownouter-tags-default{background-color:#87501E;}.k-dropdownouter-tags-green{background-color:#00D400;}.k-dropdownouter-tags-blue{background-color:#95F;}.k-dropdownouter-tags-grey{background-color:gray;}.k-dropdownouter-tags-purple{background-color:#AB37C8;}.k-dropdownouter-tags-red{background-color:#D35F5F;}.k-dropdownouter-summary{}.k-dropdownouter-summary-default{background-color:#9F734B;}.k-dropdownouter-summary-green{background-color:#4CE14C;}.k-dropdownouter-summary-blue{background-color:#69A5FF;}.k-dropdownouter-summary-grey{background-color:#A6A6A6;}.k-dropdownouter-summary-purple{background-color:#C473D8;}.k-dropdownouter-summary-red{background-color:#E08F8F;}.k-dropdowninner{margin:0 3px 1px;background:green;background-color:#FFF;/* padding: 3px; */}.k-dropdownlabel{color:#FFF;cursor:pointer;}.k-dropdownlabel .gwt-Label{margin:0 5px 0 0;width:100%;}.k-dropdownlabel img{margin:0 3px 0 1px;}/* WsTheme */.k-wstheme-icon-default{background:#FF8C00;}.k-wstheme-icon-green{background:green;}.k-wstheme-icon-blue{background:blue;}.k-wstheme-icon-grey{background:grey;}.k-wstheme-icon-purple{background:purple;}.k-wstheme-icon-red{background:red;}/* Tool selector items */.k-toolselectoritem{width:auto;margin-bottom:5px;cursor:pointer;}.k-toolselectoritem-sel{}.k-toolselectoritem-notsel-default{background:#FFE9A5;}.k-toolselectoritem-notsel-green{background:#D6F4D6;}.k-toolselectoritem-notsel-blue{background:#D7D7F4;}.k-toolselectoritem-notsel-grey{background:#E6E6E6;}.k-toolselectoritem-notsel-purple{background:#EED7F4;}.k-toolselectoritem-notsel-red{background:#FFD5D5;}.k-toolselectoritem-sel a{color:#FFF;padding:0 9px;text-decoration:none;}.k-toolselectoritem-sel a:hover{text-decoration:none;}.k-toolselectoritem-notsel{}.k-toolselectoritem-notsel a{color:#00F;padding:0 9px;text-decoration:none;}.k-toolselectoritem-notsel a:hover{text-decoration:underline;}/* others */.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;color:gray;}
\ No newline at end of file
Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,23 +1,23 @@
.k-site-traybar {
- background: #FFF none repeat scroll 0% 50%;
+ background: #FFF none repeat scroll 0% 50%;
}
.k-sitebar .kune-IconHyperlink {
- white-space: nowrap;
+ white-space: nowrap;
}
.k-sitebar .kune-IconHyperlink a:link {
- cursor: pointer;
- text-decoration: underline;
- color: #B3B3B3;
+ cursor: pointer;
+ text-decoration: underline;
+ color: #B3B3B3;
}
.k-sitebar .kune-IconHyperlink a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
.k-sitebar .kune-IconHyperlink a:visited {
- color: #B3B3B3;
+ color: #B3B3B3;
}
.k-sitebar-labellink {
@@ -28,586 +28,606 @@
}
.k-sitebar {
- margin-right: 10px;
- height: 16px;
+ margin-right: 10px;
+ height: 16px;
+ background: #FFF;
}
.k-sitebar .gwt-TextBox {
- border: 1px solid #E4A374;
- margin: 0 15px 0 3px;
- padding-left: 3px;
- color: #B3B3B3;
+ border: 1px solid #E4A374;
+ margin: 0 15px 0 3px;
+ padding-left: 3px;
+ color: #B3B3B3;
}
.k-sitebar .gwt-Hyperlink a {
- white-space: nowrap;
- color: #B3B3B3;
- text-decoration: underline;
- cursor: pointer;
+ white-space: nowrap;
+ color: #B3B3B3;
+ text-decoration: underline;
+ cursor: pointer;
}
.k-sitebar .gwt-PushButton {
- cursor: pointer;
+ cursor: pointer;
}
.k-sitebar-LabelLink {
- white-space: nowrap;
- color: #B3B3B3;
- cursor: pointer;
- text-decoration: underline;
+ white-space: nowrap;
+ color: #B3B3B3;
+ cursor: pointer;
+ text-decoration: underline;
}
.k-entity-summary {
- border-left-color: #FFF;
- border-left-width: 5px;
+ border-left-color: #FFF;
+ border-left-width: 5px;
}
.k-entitytextlogo {
- border: 2px solid #F2F2F2;
- height: 60px;
- margin: 0 0 4px -1px;
- overflow: hidden;
- width: 468px;
+ border: 2px solid #F2F2F2;
+ height: 60px;
+ margin: 0 0 4px -1px;
+ overflow: hidden;
+ width: 468px;
}
.k-entitytextlogo .gwt-Label {
- font-size: 167%;
- font-weight: 700;
- margin: 5px;
- height: 27px;
+ font-size: 167%;
+ font-weight: 700;
+ margin: 5px;
+ height: 27px;
}
.k-entitytextlogo-default .gwt-Label {
- color: #69312F;
+ color: #69312F;
}
.k-entitytextlogo-green .gwt-Label {
- color: #250;
+ color: #250;
}
.k-entitytextlogo-blue .gwt-Label {
- color: #000080;
+ color: #000080;
}
.k-entitytextlogo-grey .gwt-Label {
- color: #1A1A1A;
+ color: #1A1A1A;
}
.k-entitytextlogo-purple .gwt-Label {
- color: #440055;
+ color: #440055;
}
.k-entitytextlogo-red .gwt-Label {
- color: #800000;
+ color: #800000;
}
.k-entitytextlogo .gwt-Hyperlink a {
- color: #CCC;
- font-size: 85%;
- margin: 5px;
- text-decoration: underline;
- white-space: nowrap;
- background-color: #FFF;
+ color: #CCC;
+ font-size: 85%;
+ margin: 5px;
+ text-decoration: underline;
+ white-space: nowrap;
+ background-color: #FFF;
}
.k-entity-default .x-layout-split {
- background: #DD8A3D none repeat scroll 0% 50%;
+ background: #DD8A3D none repeat scroll 0% 50%;
}
.k-entity-green .x-layout-split {
- background: #5FD35F none repeat scroll 0% 50%;
+ background: #5FD35F none repeat scroll 0% 50%;
}
.k-entity-blue .x-layout-split {
- background: #0066FF none repeat scroll 0% 50%;
+ background: #0066FF none repeat scroll 0% 50%;
}
.k-entity-grey .x-layout-split {
- background: #4D4D4D none repeat scroll 0% 50%;
+ background: #4D4D4D none repeat scroll 0% 50%;
}
.k-entity-purple .x-layout-split {
- background: #660080 none repeat scroll 0% 50%;
+ background: #660080 none repeat scroll 0% 50%;
}
.k-entity-red .x-layout-split {
- background: #D40000 none repeat scroll 0% 50%;
+ background: #D40000 none repeat scroll 0% 50%;
}
.k-entityworkspace .x-layout-split {
- background: transparent none repeat scroll 0% 50%;
+ background: transparent none repeat scroll 0% 50%;
}
.k-entityworkspace-default .x-layout-split {
- background: #DEAA87 none repeat scroll 0% 50%;
+ background: #DEAA87 none repeat scroll 0% 50%;
}
.k-entityworkspace-green .x-layout-split {
- background: #DCE8AB none repeat scroll 0% 50%;
+ background: #DCE8AB none repeat scroll 0% 50%;
}
.k-entityworkspace-blue .x-layout-split {
- background: #D5D5FF none repeat scroll 0% 50%;
+ background: #D5D5FF none repeat scroll 0% 50%;
}
.k-entityworkspace-grey .x-layout-split {
- background: #999999 none repeat scroll 0% 50%;
+ background: #999999 none repeat scroll 0% 50%;
}
.k-entityworkspace-purple .x-layout-split {
- background: #A793AC none repeat scroll 0% 50%;
+ background: #A793AC none repeat scroll 0% 50%;
}
.k-entityworkspace-red .x-layout-split {
- background: #FF5555 none repeat scroll 0% 50%;
+ background: #FF5555 none repeat scroll 0% 50%;
}
.k-entity-title {
- border-left-style: solid;
- border-left-width: 2px;
+ border-left-style: solid;
+ border-left-width: 2px;
}
.k-entity-title div {
- line-height: 22px;
- white-space: nowrap;
+ line-height: 22px;
+ white-space: nowrap;
}
.k-entity-subtitle {
+
}
.k-entity-subtitle div {
- line-height: 22px;
- white-space: nowrap;
+ line-height: 22px;
+ white-space: nowrap;
}
.k-entity-title-rd-default {
- background: #DD8A3D;
+ background: #DD8A3D;
}
.k-entity-title-rd-green {
- background: #5FD35F;
+ background: #5FD35F;
}
.k-entity-title-rd-blue {
- background: #0066FF;
+ background: #0066FF;
}
.k-entity-title-rd-grey {
- background: #4D4D4D;
+ background: #4D4D4D;
}
.k-entity-title-rd-purple {
- background: #660080;
+ background: #660080;
}
.k-entity-title-rd-red {
- background: #D40000;
+ background: #D40000;
}
.k-entity-title-default {
- background: #F1BB59 none repeat scroll 0% 50%;
- border-left-color: #DD8A3D;
+ background: #F1BB59 none repeat scroll 0% 50%;
+ border-left-color: #DD8A3D;
}
.k-entity-title-green {
- background: #AFA none repeat scroll 0% 50%;
- border-left-color: #5FD35F;
+ background: #AFA none repeat scroll 0% 50%;
+ border-left-color: #5FD35F;
}
.k-entity-title-blue {
- background: #AFDDE9 none repeat scroll 0% 50%;
- border-left-color: #0066FF;
+ background: #AFDDE9 none repeat scroll 0% 50%;
+ border-left-color: #0066FF;
}
.k-entity-title-grey {
- background: #CCCCCC none repeat scroll 0% 50%;
- border-left-color: #4D4D4D;
+ background: #CCCCCC none repeat scroll 0% 50%;
+ border-left-color: #4D4D4D;
}
.k-entity-title-purple {
- background: #DDAFE9 none repeat scroll 0% 50%;
- border-left-color: #660080;
+ background: #DDAFE9 none repeat scroll 0% 50%;
+ border-left-color: #660080;
}
.k-entity-title-red {
- background: #FF8080 none repeat scroll 0% 50%;
- border-left-color: #D40000;
+ background: #FF8080 none repeat scroll 0% 50%;
+ border-left-color: #D40000;
}
.k-entity-title-default div {
- color: #69312F;
+ color: #69312F;
}
.k-entity-title-green div {
- color: #250;
+ color: #250;
}
.k-entity-title-blue div {
- color: #000080;
+ color: #000080;
}
.k-entity-title-grey div {
- color: #1A1A1A;
+ color: #1A1A1A;
}
.k-entity-title-purple div {
- color: #440055;
+ color: #440055;
}
.k-entity-title-red div {
- color: #800000;
+ color: #800000;
}
.k-entity-subtitle-default {
- background: #DD8A3D none repeat scroll 0% 50%;
+ background: #DD8A3D none repeat scroll 0% 50%;
}
.k-entity-subtitle-green {
- background: #5FD35F none repeat scroll 0% 50%;
+ background: #5FD35F none repeat scroll 0% 50%;
}
.k-entity-subtitle-blue {
- background: #0066FF none repeat scroll 0% 50%;
+ background: #0066FF none repeat scroll 0% 50%;
}
.k-entity-subtitle-grey {
- background: #4D4D4D none repeat scroll 0% 50%;
+ background: #4D4D4D none repeat scroll 0% 50%;
}
.k-entity-subtitle-purple {
- background: #660080 none repeat scroll 0% 50%;
+ background: #660080 none repeat scroll 0% 50%;
}
.k-entity-subtitle-red {
- background: #D40000 none repeat scroll 0% 50%;
+ background: #D40000 none repeat scroll 0% 50%;
}
.k-entity-subtitle-default div {
- color: #FFF;
+ color: #FFF;
}
.k-entity-subtitle-green div {
- color: #FFF;
+ color: #FFF;
}
.k-entity-subtitle-blue div {
- color: #FFF;
+ color: #FFF;
}
.k-entity-subtitle-grey div {
- color: #FFF;
+ color: #FFF;
}
.k-entity-subtitle-purple div {
- color: #FFF;
+ color: #FFF;
}
.k-entity-subtitle-red div {
- color: #FFF;
+ color: #FFF;
}
-.k-entity-bottom-rd-default, .k-entity-bottom-default, .k-toolselectoritem-sel-default {
- background: #DD8A3D;
+.k-entity-bottom-rd-default,.k-entity-bottom-default,.k-toolselectoritem-sel-default
+ {
+ background: #DD8A3D;
}
-.k-entity-bottom-rd-green, .k-entity-bottom-green, .k-toolselectoritem-sel-green {
- background: #5FD35F;
+.k-entity-bottom-rd-green,.k-entity-bottom-green,.k-toolselectoritem-sel-green
+ {
+ background: #5FD35F;
}
-.k-entity-bottom-rd-blue, .k-entity-bottom-blue, .k-toolselectoritem-sel-blue {
- background: #0066FF;
+.k-entity-bottom-rd-blue,.k-entity-bottom-blue,.k-toolselectoritem-sel-blue
+ {
+ background: #0066FF;
}
-.k-entity-bottom-rd-grey, .k-entity-bottom-grey, .k-toolselectoritem-sel-grey {
- background: #4D4D4D;
+.k-entity-bottom-rd-grey,.k-entity-bottom-grey,.k-toolselectoritem-sel-grey
+ {
+ background: #4D4D4D;
}
-.k-entity-bottom-rd-purple, .k-entity-bottom-purple, .k-toolselectoritem-sel-purple {
- background: #660080;
+.k-entity-bottom-rd-purple,.k-entity-bottom-purple,.k-toolselectoritem-sel-purple
+ {
+ background: #660080;
}
-.k-entity-bottom-rd-red, .k-entity-bottom-red, .k-toolselectoritem-sel-red {
- background: #D40000;
+.k-entity-bottom-rd-red,.k-entity-bottom-red,.k-toolselectoritem-sel-red
+ {
+ background: #D40000;
}
.k-entitylicensepanel-licensetext {
- cursor: pointer;
- margin-left: 5px;
- text-decoration: underline;
+ cursor: pointer;
+ margin-left: 5px;
+ text-decoration: underline;
}
-.k-entity-context-default div, .k-entity-context-default .x-tree .x-panel-body {
- background: #FFD09D none repeat scroll 0% 50%;
+.k-entity-context-default div,.k-entity-context-default .x-tree .x-panel-body
+ {
+ background: #FFD09D none repeat scroll 0% 50%;
}
-.k-entity-context-green div, .k-entity-context-green .x-tree .x-panel-body {
- background: #CFA none repeat scroll 0% 50%;
+.k-entity-context-green div,.k-entity-context-green .x-tree .x-panel-body
+ {
+ background: #CFA none repeat scroll 0% 50%;
}
-.k-entity-context-blue div, .k-entity-context-blue .x-tree .x-panel-body {
- background: #AACCFF none repeat scroll 0% 50%;
+.k-entity-context-blue div,.k-entity-context-blue .x-tree .x-panel-body
+ {
+ background: #AACCFF none repeat scroll 0% 50%;
}
-.k-entity-context-grey div, .k-entity-context-grey .x-tree .x-panel-body {
- background: #B3B3B3 none repeat scroll 0% 50%;
+.k-entity-context-grey div,.k-entity-context-grey .x-tree .x-panel-body
+ {
+ background: #B3B3B3 none repeat scroll 0% 50%;
}
-.k-entity-context-purple div, .k-entity-context-purple .x-tree .x-panel-body {
- background: #DDAFE9 none repeat scroll 0% 50%;
+.k-entity-context-purple div,.k-entity-context-purple .x-tree .x-panel-body
+ {
+ background: #DDAFE9 none repeat scroll 0% 50%;
}
-.k-entity-context-red div, .k-entity-context-red .x-tree .x-panel-body {
- background: #FFAAAA none repeat scroll 0% 50%;
+.k-entity-context-red div,.k-entity-context-red .x-tree .x-panel-body {
+ background: #FFAAAA none repeat scroll 0% 50%;
}
-
.k-entity-context-purple .x-tree .x-panel-body {
- background: #DDAFE9 none repeat scroll 0% 50%;
+ background: #DDAFE9 none repeat scroll 0% 50%;
}
-
.k-entity-bottom div {
- line-height: 2em;
- color: #FFF;
+ line-height: 2em;
+ color: #FFF;
}
.k-toolbar-top-line {
- border-top-color: rgb( 208, 208, 208 );
- border-top-style: solid;
- border-top-width: 1px;
+ border-top-color: rgb(208, 208, 208);
+ border-top-style: solid;
+ border-top-width: 1px;
}
.k-toolbar-bottom-line {
- border-bottom-color: rgb( 208, 208, 208 );
- border-bottom-style: solid;
- border-bottom-width: 1px;
+ border-bottom-color: rgb(208, 208, 208);
+ border-bottom-style: solid;
+ border-bottom-width: 1px;
}
-.x-toolbar td, .x-toolbar span, .x-toolbar input, .x-toolbar div, .x-toolbar select, .x-toolbar label {
- white-space: nowrap;
- font: normal 100% arial,sans;
- line-height: 19px;
+.x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label
+ {
+ white-space: nowrap;
+ font: normal 100% arial, sans;
+ line-height: 19px;
}
.k-toolbar-sep {
- padding-top: 4px;
- padding-left: 5px;
+ padding-top: 4px;
+ padding-left: 5px;
}
+
/* Custom gwt-ext styles */
.ytb-sep {
- background-image: url(../js/ext/resources/images/default/grid/grid-split.gif);
- background-position: center;
- background-repeat: no-repeat;
- display: block;
- font-size: 1px;
- height: 16px;
- width: 4px;
- overflow: hidden;
- cursor: default;
- margin: 0 2px 0;
- border: 0;
+ background-image:
+ url(../js/ext/resources/images/default/grid/grid-split.gif);
+ background-position: center;
+ background-repeat: no-repeat;
+ display: block;
+ font-size: 1px;
+ height: 16px;
+ width: 4px;
+ overflow: hidden;
+ cursor: default;
+ margin: 0 2px 0;
+ border: 0;
}
.ytb-spacer {
- width: 2px;
+ width: 2px;
}
.x-grid-group-hd {
- border-bottom: 2px solid grey;
- cursor: pointer;
- padding-top: 3px;
+ border-bottom: 2px solid grey;
+ cursor: pointer;
+ padding-top: 3px;
}
+
/* Drop down */
.k-dropdownouter {
- background-color: grey;
+ background-color: grey;
}
.k-dropdownouter-members {
+
}
.k-dropdownouter-members-default {
- background-color: #DF5244;
+ background-color: #DF5244;
}
.k-dropdownouter-members-green {
- background-color: #008000;
+ background-color: #008000;
}
.k-dropdownouter-members-blue {
- background-color: #5500D4;
+ background-color: #5500D4;
}
.k-dropdownouter-members-grey {
- background-color: #4D4D4D;
+ background-color: #4D4D4D;
}
.k-dropdownouter-members-purple {
- background-color: #672178;
+ background-color: #672178;
}
.k-dropdownouter-members-red {
- background-color: #A02C2C;
+ background-color: #A02C2C;
}
.k-dropdownouter-part {
+
}
.k-dropdownouter-part-default {
- background-color: #CA5842;
+ background-color: #CA5842;
}
.k-dropdownouter-part-green {
- background-color: #00AA00;
+ background-color: #00AA00;
}
.k-dropdownouter-part-blue {
- background-color: #6600FF;
+ background-color: #6600FF;
}
.k-dropdownouter-part-grey {
- background-color: #666666;
+ background-color: #666666;
}
.k-dropdownouter-part-purple {
- background-color: #892CA0;
+ background-color: #892CA0;
}
.k-dropdownouter-part-red {
- background-color: #C83737;
+ background-color: #C83737;
}
.k-dropdownouter-tags {
+
}
.k-dropdownouter-tags-default {
- background-color: #87501E;
+ background-color: #87501E;
}
.k-dropdownouter-tags-green {
- background-color: #00D400;
+ background-color: #00D400;
}
.k-dropdownouter-tags-blue {
- background-color: #9955FF;
+ background-color: #9955FF;
}
.k-dropdownouter-tags-grey {
- background-color: #808080;
+ background-color: #808080;
}
.k-dropdownouter-tags-purple {
- background-color: #AB37C8;
+ background-color: #AB37C8;
}
.k-dropdownouter-tags-red {
- background-color: #D35F5F;
+ background-color: #D35F5F;
}
.k-dropdownouter-summary {
+
}
.k-dropdownouter-summary-default {
- background-color: #9F734B;
+ background-color: #9F734B;
}
.k-dropdownouter-summary-green {
- background-color: #4CE14C;
+ background-color: #4CE14C;
}
.k-dropdownouter-summary-blue {
- background-color: #69A5FF;
+ background-color: #69A5FF;
}
.k-dropdownouter-summary-grey {
- background-color: #A6A6A6;
+ background-color: #A6A6A6;
}
.k-dropdownouter-summary-purple {
- background-color: #C473D8;
+ background-color: #C473D8;
}
.k-dropdownouter-summary-red {
- background-color: #E08F8F;
+ background-color: #E08F8F;
}
.k-dropdowninner {
- margin: 0 3px 1px 3px;
- background: green;
- background-color: #FFF;
- /* padding: 3px; */
+ margin: 0 3px 1px 3px;
+ background: green;
+ background-color: #FFF;
+ /* padding: 3px; */
}
.k-dropdownlabel {
- color: #FFF;
- cursor: pointer;
+ color: #FFF;
+ cursor: pointer;
}
.k-dropdownlabel .gwt-Label {
- margin: 0 5px 0 0;
- width: 100%;
+ margin: 0 5px 0 0;
+ width: 100%;
}
.k-dropdownlabel img {
- margin: 0 3px 0 1px;
+ margin: 0 3px 0 1px;
}
+
/* WsTheme */
.k-wstheme-icon-default {
- background: #FF8C00;
+ background: #FF8C00;
}
.k-wstheme-icon-green {
- background: green;
+ background: green;
}
.k-wstheme-icon-blue {
- background: blue;
+ background: blue;
}
.k-wstheme-icon-grey {
- background: grey;
+ background: grey;
}
.k-wstheme-icon-purple {
- background: purple;
+ background: purple;
}
.k-wstheme-icon-red {
- background: red;
+ background: red;
}
/* Tool selector items */
-
.k-toolselectoritem {
width: auto;
- margin-bottom: 5px;
+ margin-bottom: 5px;
cursor: pointer;
}
.k-toolselectoritem-sel {
+
}
.k-toolselectoritem-notsel-default {
- background: #FFE9A5;
+ background: #FFE9A5;
}
.k-toolselectoritem-notsel-green {
- background: #D6F4D6;
+ background: #D6F4D6;
}
.k-toolselectoritem-notsel-blue {
- background: #D7D7F4;
+ background: #D7D7F4;
}
.k-toolselectoritem-notsel-grey {
- background: #E6E6E6;
+ background: #E6E6E6;
}
.k-toolselectoritem-notsel-purple {
- background: #EED7F4;
+ background: #EED7F4;
}
.k-toolselectoritem-notsel-red {
- background: #FFD5D5;
+ background: #FFD5D5;
}
.k-toolselectoritem-sel a {
@@ -621,6 +641,7 @@
}
.k-toolselectoritem-notsel {
+
}
.k-toolselectoritem-notsel a {
@@ -635,16 +656,16 @@
/* others */
.k-textlinethrough {
- text-decoration: line-through;
- color: red;
+ text-decoration: line-through;
+ color: red;
}
.k-textnormal {
- text-decoration: inherit;
- color: green;
+ text-decoration: inherit;
+ color: green;
}
.k-textunderline {
- text-decoration: underline;
- color: gray;
-}
+ text-decoration: underline;
+ color: gray;
+}
\ No newline at end of file
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineXmpp.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -45,108 +45,112 @@
private ToolbarButton traybarButton;
public ChatEngineXmpp(final EmiteUIDialog emiteUIDialog, final ChatOptions chatOptions,
- final I18nTranslationService i18n, final WorkspaceSkeleton ws) {
- this.emiteDialog = emiteUIDialog;
- this.chatOptions = chatOptions;
- this.i18n = i18n;
- this.ws = ws;
+ final I18nTranslationService i18n, final WorkspaceSkeleton ws) {
+ this.emiteDialog = emiteUIDialog;
+ this.chatOptions = chatOptions;
+ this.i18n = i18n;
+ this.ws = ws;
}
public ChatOptions getChatOptions() {
- return chatOptions;
+ return chatOptions;
}
public void joinRoom(final String roomName, final String userAlias) {
- if (emiteDialog.isLoggedIn()) {
- final XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + "/"
- + chatOptions.userOptions.getUserJid().getNode());
- emiteDialog.joinRoom(roomURI);
- } else {
- ws.showAlertMessage(i18n.t("Error"), i18n.t("To join a chatroom you need to be 'online'."));
- }
+ if (emiteDialog.isLoggedIn()) {
+ final XmppURI roomURI = XmppURI.uri(roomName + "@" + chatOptions.roomHost + "/"
+ + chatOptions.userOptions.getUserJid().getNode());
+ emiteDialog.joinRoom(roomURI);
+ } else {
+ ws.showAlertMessage(i18n.t("Error"), i18n.t("To join a chatroom you need to be 'online'."));
+ }
}
public void login(final String jid, final String passwd) {
- final UserChatOptions userChatOptions = getUserChatOptions(jid, passwd);
- // FIXME: Avatar provider
- final AvatarProvider avatarProvider = new AvatarProvider() {
- public String getAvatarURL(XmppURI userURI) {
- return "images/person-def.gif";
- }
- };
- final String initialWindowTitle = Window.getTitle();
- chatOptions.userOptions = userChatOptions;
- if (emiteDialog.isDialogNotStarted()) {
- emiteDialog.start(userChatOptions, chatOptions.httpBase, chatOptions.roomHost, initialWindowTitle,
- avatarProvider, i18n.t("Chat"));
- } else {
- emiteDialog.setEnableStatusUI(true);
- emiteDialog.refreshUserInfo(chatOptions.userOptions);
- }
- emiteDialog.show(OwnStatus.online);
- if (traybarButton == null) {
- traybarButton = new ToolbarButton();
- traybarButton.setTooltip(i18n.t("Show/hide the chat window"));
- // traybarButton.setIcon("images/emite-chat.gif");
- traybarButton.setIcon("images/e-icon.gif");
- traybarButton.addListener(new ButtonListenerAdapter() {
- @Override
- public void onClick(final Button button, final EventObject e) {
- if (emiteDialog.isVisible()) {
- emiteDialog.hide();
- } else {
- emiteDialog.show();
- }
- }
- });
- ws.getSiteTraybar().addButton(traybarButton);
- emiteDialog.onChatAttended(new Listener<String>() {
- public void onEvent(final String parameter) {
- traybarButton.setIcon("images/e-icon.gif");
- }
- });
- emiteDialog.onChatUnattendedWithActivity(new Listener<String>() {
- public void onEvent(final String parameter) {
- traybarButton.setIcon("images/e-icon-a.gif");
- }
- });
- }
- emiteDialog.hide();
- emiteDialog.onChatAttended(new Listener<String>() {
- public void onEvent(final String parameter) {
- Window.setTitle(initialWindowTitle);
- }
- });
- emiteDialog.onChatUnattendedWithActivity(new Listener<String>() {
- public void onEvent(final String chatTitle) {
- Window.setTitle("(* " + chatTitle + ") " + initialWindowTitle);
- }
- });
+ final UserChatOptions userChatOptions = getUserChatOptions(jid, passwd);
+ // FIXME: Avatar provider
+ final AvatarProvider avatarProvider = new AvatarProvider() {
+ public String getAvatarURL(XmppURI userURI) {
+ return "images/person-def.gif";
+ }
+ };
+ final String initialWindowTitle = Window.getTitle();
+ chatOptions.userOptions = userChatOptions;
+ if (emiteDialog.isDialogNotStarted()) {
+ emiteDialog.start(userChatOptions, chatOptions.httpBase, chatOptions.roomHost, initialWindowTitle,
+ avatarProvider, i18n.t("Chat"));
+ } else {
+ emiteDialog.setEnableStatusUI(true);
+ emiteDialog.refreshUserInfo(chatOptions.userOptions);
+ }
+ emiteDialog.show(OwnStatus.online);
+ if (traybarButton == null) {
+ traybarButton = new ToolbarButton();
+ traybarButton.setTooltip(i18n.t("Show/hide the chat window"));
+ // traybarButton.setIcon("images/emite-chat.gif");
+ traybarButton.setIcon("images/e-icon.gif");
+ traybarButton.addListener(new ButtonListenerAdapter() {
+ @Override
+ public void onClick(final Button button, final EventObject e) {
+ if (emiteDialog.isVisible()) {
+ emiteDialog.hide();
+ } else {
+ emiteDialog.show();
+ }
+ }
+ });
+ ws.getSiteTraybar().addButton(traybarButton);
+ emiteDialog.onChatAttended(new Listener<String>() {
+ public void onEvent(final String parameter) {
+ traybarButton.setIcon("images/e-icon.gif");
+ }
+ });
+ emiteDialog.onChatUnattendedWithActivity(new Listener<String>() {
+ public void onEvent(final String parameter) {
+ traybarButton.setIcon("images/e-icon-a.gif");
+ }
+ });
+ }
+ emiteDialog.hide();
+ emiteDialog.onChatAttended(new Listener<String>() {
+ public void onEvent(final String parameter) {
+ Window.setTitle(initialWindowTitle);
+ }
+ });
+ emiteDialog.onChatUnattendedWithActivity(new Listener<String>() {
+ public void onEvent(final String chatTitle) {
+ Window.setTitle("(* " + chatTitle + ") " + initialWindowTitle);
+ }
+ });
}
public void logout() {
- if (!emiteDialog.isDialogNotStarted()) {
- emiteDialog.setOwnPresence(OwnStatus.offline);
- chatOptions.userOptions = getUserChatOptions("reset at example.com", "");
- emiteDialog.refreshUserInfo(chatOptions.userOptions);
- emiteDialog.setEnableStatusUI(false);
- }
+ if (!emiteDialog.isDialogNotStarted()) {
+ emiteDialog.setOwnPresence(OwnStatus.offline);
+ chatOptions.userOptions = getUserChatOptions("reset at example.com", "");
+ emiteDialog.refreshUserInfo(chatOptions.userOptions);
+ emiteDialog.setEnableStatusUI(false);
+ }
}
public void show() {
- emiteDialog.show();
+ emiteDialog.show();
}
public void stop() {
- emiteDialog.destroy();
- emiteDialog.getSession().logout();
+ if (!emiteDialog.isDialogNotStarted()) {
+ emiteDialog.destroy();
+ }
+ if (emiteDialog.getSession().isLoggedIn()) {
+ emiteDialog.getSession().logout();
+ }
}
private UserChatOptions getUserChatOptions(final String jid, final String passwd) {
- final String resource = "emiteui-" + new Date().getTime() + "-kune"; // +
- // getGwtMetaProperty(GWT_PROPERTY_RELEASE);
- // FIXME, get this from user profile
- return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, resource, "blue",
- SubscriptionMode.autoAcceptAll, true);
+ final String resource = "emiteui-" + new Date().getTime() + "-kune"; // +
+ // getGwtMetaProperty(GWT_PROPERTY_RELEASE);
+ // FIXME, get this from user profile
+ return new UserChatOptions(jid + "@" + chatOptions.domain, passwd, resource, "blue",
+ SubscriptionMode.autoAcceptAll, true);
}
}
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -118,8 +118,7 @@
register(Singleton.class, new Factory<DocumentReader>(DocumentReader.class) {
public DocumentReader create() {
final DocumentReaderView view = new DocumentReaderPanel($(WorkspaceSkeleton.class));
- final DocumentReaderPresenter presenter = new DocumentReaderPresenter($(Session.class), view,
- $(I18nUITranslationService.class));
+ final DocumentReaderPresenter presenter = new DocumentReaderPresenter($(Session.class), view);
return presenter;
}
});
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui/FolderViewerPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui/FolderViewerPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/folder/viewer/ui/FolderViewerPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -28,6 +28,8 @@
public class FolderViewerPanel extends Label implements FolderViewerView {
public FolderViewerPanel() {
- super("Folder properties, translations ..." + Site.IN_DEVELOPMENT);
+ super("Folder properties, translations ..." + Site.IN_DEVELOPMENT);
+ super.setStyleName("kune-Content-Main");
+ super.addStyleName("kune-Margin-7-trbl");
}
}
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/cnt/reader/DocumentReaderPresenter.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -25,42 +25,36 @@
import org.ourproject.kune.platf.client.dto.BasicMimeTypeDTO;
import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
public class DocumentReaderPresenter implements DocumentReader {
private final DocumentReaderView view;
- private final I18nUITranslationService i18n;
private final Session session;
- public DocumentReaderPresenter(final Session session, final DocumentReaderView view,
- final I18nUITranslationService i18n) {
- this.session = session;
- this.view = view;
- this.i18n = i18n;
+ public DocumentReaderPresenter(final Session session, final DocumentReaderView view) {
+ this.session = session;
+ this.view = view;
}
public View getView() {
- return view;
+ return view;
}
public void showDocument(final StateToken token, final String text, final String typeId,
- final BasicMimeTypeDTO mimeType) {
- if (typeId.equals(DocumentClientTool.TYPE_UPLOADEDFILE)) {
- if (mimeType != null) {
- final String url = "/kune/servlets/FileDownloadManager?token=" + token + "&hash="
- + session.getUserHash();
- if (mimeType.getType().equals("image")) {
- view.setContent("<img src=\"" + url + "\">");
- } else if (mimeType.toString().equals("text/plain")) {
- view.setContent(text);
- } else {
- view.setContent("<a href=\"" + url + "\">" + i18n.t("Download") + "</a>");
- }
- } else {
- view.setContent("<a href=\"" + "dd" + "\">" + i18n.t("Download") + "</a>");
- }
- } else {
- view.setContent(text);
- }
+ final BasicMimeTypeDTO mimeType) {
+ if (typeId.equals(DocumentClientTool.TYPE_UPLOADEDFILE)) {
+ if (mimeType != null) {
+ final String url = "/kune/servlets/FileDownloadManager?token=" + token + "&hash="
+ + session.getUserHash();
+ if (mimeType.getType().equals("image")) {
+ view.setContent("<img src=\"" + url + "\">");
+ } else if (mimeType.toString().equals("text/plain") || mimeType.toString().equals("application/pdf")) {
+ view.setContent(text);
+ } else {
+ view.setContent("");
+ }
+ }
+ } else {
+ view.setContent(text);
+ }
}
}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/StateDTO.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -57,254 +57,255 @@
private StateToken stateToken;
public StateDTO() {
- this(null, null, null);
+ this(null, null, null);
}
public StateDTO(final String docRef, final String title, final String content) {
- this.documentId = docRef;
- this.title = title;
- this.content = content;
+ this.documentId = docRef;
+ this.title = title;
+ this.content = content;
}
public AccessListsDTO getAccessLists() {
- return accessLists;
+ return accessLists;
}
public List<UserSimpleDTO> getAuthors() {
- return authors;
+ return authors;
}
public ContainerDTO getContainer() {
- return container;
+ return container;
}
public AccessRightsDTO getContainerRights() {
- return containerRights;
+ return containerRights;
}
public String getContent() {
- return content;
+ return content;
}
public AccessRightsDTO getContentRights() {
- return this.contentRights;
+ return this.contentRights;
}
public Double getCurrentUserRate() {
- return currentUserRate;
+ return currentUserRate;
}
public String getDocumentId() {
- return documentId;
+ return documentId;
}
public GroupDTO getGroup() {
- return this.group;
+ return this.group;
}
public SocialNetworkDTO getGroupMembers() {
- return groupMembers;
+ return groupMembers;
}
public AccessRightsDTO getGroupRights() {
- return groupRights;
+ return groupRights;
}
public List<TagResultDTO> getGroupTags() {
- return groupTags;
+ return groupTags;
}
public I18nLanguageDTO getLanguage() {
- return language;
+ return language;
}
public LicenseDTO getLicense() {
- return license;
+ return license;
}
public BasicMimeTypeDTO getMimeType() {
- return mimeType;
+ return mimeType;
}
public ParticipationDataDTO getParticipation() {
- return participation;
+ return participation;
}
public Date getPublishedOn() {
- return publishedOn;
+ return publishedOn;
}
public Double getRate() {
- return rate;
+ return rate;
}
public Integer getRateByUsers() {
- return rateByUsers;
+ return rateByUsers;
}
public ContainerDTO getRootContainer() {
- return rootContainer;
+ return rootContainer;
}
public SocialNetworkDTO getSocialNetwork() {
- return socialNetwork;
+ return socialNetwork;
}
public StateToken getStateToken() {
- return stateToken;
+ return stateToken;
}
public ContentStatusDTO getStatus() {
- return status;
+ return status;
}
public String getTags() {
- return tags;
+ return tags;
}
public String getTitle() {
- return title;
+ return title;
}
public String getToolName() {
- return toolName;
+ return toolName;
}
public String getTypeId() {
- return typeId;
+ return typeId;
}
public int getVersion() {
- return version;
+ return version;
}
// FIXME: maybe a tag in the content showing the type, think about this
public boolean hasDocument() {
- return documentId != null;
+ return documentId != null;
}
public boolean isRateable() {
- return isRateable;
+ return isRateable;
}
public void setAccessLists(final AccessListsDTO accessLists) {
- this.accessLists = accessLists;
+ this.accessLists = accessLists;
}
public void setAuthors(final List<UserSimpleDTO> authors) {
- this.authors = authors;
+ this.authors = authors;
}
public void setContainer(final ContainerDTO container) {
- this.container = container;
+ this.container = container;
}
public void setContainerRights(final AccessRightsDTO containerRights) {
- this.containerRights = containerRights;
+ this.containerRights = containerRights;
}
public void setContent(final String content) {
- this.content = content;
+ this.content = content;
}
public void setContentRights(final AccessRightsDTO accessRights) {
- this.contentRights = accessRights;
+ this.contentRights = accessRights;
}
public void setCurrentUserRate(final Double currentUserRate) {
- this.currentUserRate = currentUserRate;
+ this.currentUserRate = currentUserRate;
}
public void setDocumentId(final String docRef) {
- this.documentId = docRef;
+ this.documentId = docRef;
}
public void setGroup(final GroupDTO group) {
- this.group = group;
+ this.group = group;
}
public void setGroupMembers(final SocialNetworkDTO groupMembers) {
- this.groupMembers = groupMembers;
+ this.groupMembers = groupMembers;
}
public void setGroupRights(final AccessRightsDTO groupRights) {
- this.groupRights = groupRights;
+ this.groupRights = groupRights;
}
public void setGroupTags(final List<TagResultDTO> groupTags) {
- this.groupTags = groupTags;
+ this.groupTags = groupTags;
}
public void setLanguage(final I18nLanguageDTO language) {
- this.language = language;
+ this.language = language;
}
public void setLicense(final LicenseDTO license) {
- this.license = license;
+ this.license = license;
}
public void setMimeType(final BasicMimeTypeDTO mimeType) {
- this.mimeType = mimeType;
+ this.mimeType = mimeType;
}
public void setParticipation(final ParticipationDataDTO participation) {
- this.participation = participation;
+ this.participation = participation;
}
public void setPublishedOn(final Date publishedOn) {
- this.publishedOn = publishedOn;
+ this.publishedOn = publishedOn;
}
public void setRate(final Double rate) {
- this.rate = rate;
+ this.rate = rate;
}
public void setRateable(final boolean isRateable) {
- this.isRateable = isRateable;
+ this.isRateable = isRateable;
}
public void setRateByUsers(final Integer rateByUsers) {
- this.rateByUsers = rateByUsers;
+ this.rateByUsers = rateByUsers;
}
public void setRootContainer(final ContainerDTO rootContainer) {
- this.rootContainer = rootContainer;
+ this.rootContainer = rootContainer;
}
public void setSocialNetwork(final SocialNetworkDTO socialNetwork) {
- this.socialNetwork = socialNetwork;
+ this.socialNetwork = socialNetwork;
}
public void setStateToken(final StateToken stateToken) {
- this.stateToken = stateToken;
+ this.stateToken = stateToken;
}
public void setStatus(final ContentStatusDTO status) {
- this.status = status;
+ this.status = status;
}
public void setTags(final String tags) {
- this.tags = tags;
+ this.tags = tags;
}
public void setTitle(final String title) {
- this.title = title;
+ this.title = title;
}
public void setToolName(final String toolName) {
- this.toolName = toolName;
+ this.toolName = toolName;
}
public void setTypeId(final String typeId) {
- this.typeId = typeId;
+ this.typeId = typeId;
}
public void setVersion(final int version) {
- this.version = version;
+ this.version = version;
}
+ @Override
public String toString() {
- return "StateDTO[" + stateToken + "/" + typeId + "]";
+ return "StateDTO[" + stateToken + "/" + typeId + (mimeType != null ? "-" + mimeType : "") + "]";
}
}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -89,245 +89,268 @@
@Override
protected void onLoad() {
- register(ApplicationComponentGroup.class, new Factory<WorkspaceSkeleton>(WorkspaceSkeleton.class) {
- public WorkspaceSkeleton create() {
- return new WorkspaceSkeleton();
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<WorkspaceSkeleton>(WorkspaceSkeleton.class) {
+ @Override
+ public WorkspaceSkeleton create() {
+ return new WorkspaceSkeleton();
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<QuickTipsHelper>(QuickTipsHelper.class) {
- public QuickTipsHelper create() {
- return new QuickTipsHelper();
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<QuickTipsHelper>(QuickTipsHelper.class) {
+ @Override
+ public QuickTipsHelper create() {
+ return new QuickTipsHelper();
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteProgress>(SiteProgress.class) {
- public SiteProgress create() {
- final SiteProgressPresenter presenter = new SiteProgressPresenter();
- final SiteProgressPanel panel = new SiteProgressPanel(presenter, $$(SitePublicSpaceLink.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteProgress>(SiteProgress.class) {
+ @Override
+ public SiteProgress create() {
+ final SiteProgressPresenter presenter = new SiteProgressPresenter();
+ final SiteProgressPanel panel = new SiteProgressPanel(presenter, $$(SitePublicSpaceLink.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<Site>(Site.class) {
- public Site create() {
- return new Site($(I18nUITranslationService.class), $(SiteProgress.class), $$(SiteMessage.class));
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<Site>(Site.class) {
+ @Override
+ public Site create() {
+ return new Site($(I18nUITranslationService.class), $(SiteProgress.class), $$(SiteMessage.class));
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SitePublicSpaceLink>(SitePublicSpaceLink.class) {
- public SitePublicSpaceLink create() {
- final SitePublicSpaceLinkPresenter presenter = new SitePublicSpaceLinkPresenter($(StateManager.class));
- final SitePublicSpaceLinkPanel panel = new SitePublicSpaceLinkPanel(presenter,
- $(WorkspaceSkeleton.class), $(I18nUITranslationService.class), $(Images.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SitePublicSpaceLink>(SitePublicSpaceLink.class) {
+ @Override
+ public SitePublicSpaceLink create() {
+ final SitePublicSpaceLinkPresenter presenter = new SitePublicSpaceLinkPresenter($(StateManager.class));
+ final SitePublicSpaceLinkPanel panel = new SitePublicSpaceLinkPanel(presenter,
+ $(WorkspaceSkeleton.class), $(I18nUITranslationService.class), $(Images.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteMessage>(SiteMessage.class) {
- public SiteMessage create() {
- final SiteMessagePresenter siteMessagePresenter = new SiteMessagePresenter();
- final SiteMessageView siteMessageView = new SiteMessagePanel(siteMessagePresenter, true,
- $(I18nUITranslationService.class));
- siteMessagePresenter.init(siteMessageView);
- return siteMessagePresenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteMessage>(SiteMessage.class) {
+ @Override
+ public SiteMessage create() {
+ final SiteMessagePresenter siteMessagePresenter = new SiteMessagePresenter();
+ final SiteMessageView siteMessageView = new SiteMessagePanel(siteMessagePresenter, true,
+ $(I18nUITranslationService.class));
+ siteMessagePresenter.init(siteMessageView);
+ return siteMessagePresenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteUserMenu>(SiteUserMenu.class) {
- public SiteUserMenu create() {
- final SiteUserMenuPresenter presenter = new SiteUserMenuPresenter($(Session.class),
- $(StateManager.class));
- final SiteUserMenuPanel panel = new SiteUserMenuPanel(presenter, $(WorkspaceSkeleton.class),
- $(I18nUITranslationService.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteUserMenu>(SiteUserMenu.class) {
+ @Override
+ public SiteUserMenu create() {
+ final SiteUserMenuPresenter presenter = new SiteUserMenuPresenter($(Session.class),
+ $(StateManager.class));
+ final SiteUserMenuPanel panel = new SiteUserMenuPanel(presenter, $(WorkspaceSkeleton.class),
+ $(I18nUITranslationService.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteSignInLink>(SiteSignInLink.class) {
- public SiteSignInLink create() {
- final SiteSignInLinkPresenter presenter = new SiteSignInLinkPresenter($(Session.class));
- final SiteSignInLinkPanel panel = new SiteSignInLinkPanel(presenter, $(I18nUITranslationService.class),
- $(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteSignInLink>(SiteSignInLink.class) {
+ @Override
+ public SiteSignInLink create() {
+ final SiteSignInLinkPresenter presenter = new SiteSignInLinkPresenter($(Session.class));
+ final SiteSignInLinkPanel panel = new SiteSignInLinkPanel(presenter, $(I18nUITranslationService.class),
+ $(WorkspaceSkeleton.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteSignOutLink>(SiteSignOutLink.class) {
- public SiteSignOutLink create() {
- final SiteSignOutLinkPresenter presenter = new SiteSignOutLinkPresenter($(Session.class),
- $$(UserServiceAsync.class), $$(KuneErrorHandler.class));
- final SiteSignOutLinkPanel panel = new SiteSignOutLinkPanel(presenter,
- $(I18nUITranslationService.class), $(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteSignOutLink>(SiteSignOutLink.class) {
+ @Override
+ public SiteSignOutLink create() {
+ final SiteSignOutLinkPresenter presenter = new SiteSignOutLinkPresenter($(Session.class),
+ $$(UserServiceAsync.class), $$(KuneErrorHandler.class));
+ final SiteSignOutLinkPanel panel = new SiteSignOutLinkPanel(presenter,
+ $(I18nUITranslationService.class), $(WorkspaceSkeleton.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteNewGroupLink>(SiteNewGroupLink.class) {
- public SiteNewGroupLink create() {
- final SiteNewGroupLinkPresenter presenter = new SiteNewGroupLinkPresenter();
- final SiteNewGroupLinkPanel panel = new SiteNewGroupLinkPanel(presenter, $(WorkspaceSkeleton.class),
- $(I18nUITranslationService.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteNewGroupLink>(SiteNewGroupLink.class) {
+ @Override
+ public SiteNewGroupLink create() {
+ final SiteNewGroupLinkPresenter presenter = new SiteNewGroupLinkPresenter();
+ final SiteNewGroupLinkPanel panel = new SiteNewGroupLinkPanel(presenter, $(WorkspaceSkeleton.class),
+ $(I18nUITranslationService.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteOptions>(SiteOptions.class) {
- public SiteOptions create() {
- final SiteOptionsPresenter presenter = new SiteOptionsPresenter();
- final SiteOptionsPanel panel = new SiteOptionsPanel(presenter, $(WorkspaceSkeleton.class),
- $(I18nUITranslationService.class), $$(I18nTranslator.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteOptions>(SiteOptions.class) {
+ @Override
+ public SiteOptions create() {
+ final SiteOptionsPresenter presenter = new SiteOptionsPresenter();
+ final SiteOptionsPanel panel = new SiteOptionsPanel(presenter, $(WorkspaceSkeleton.class),
+ $(I18nUITranslationService.class), $$(I18nTranslator.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteSearch>(SiteSearch.class) {
- public SiteSearch create() {
- final SiteSearchPresenter presenter = new SiteSearchPresenter($$(SiteSearcher.class));
- final SiteSearchPanel panel = new SiteSearchPanel(presenter, $(WorkspaceSkeleton.class),
- $(I18nUITranslationService.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteSearch>(SiteSearch.class) {
+ @Override
+ public SiteSearch create() {
+ final SiteSearchPresenter presenter = new SiteSearchPresenter($$(SiteSearcher.class));
+ final SiteSearchPanel panel = new SiteSearchPanel(presenter, $(WorkspaceSkeleton.class),
+ $(I18nUITranslationService.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<SiteLogo>(SiteLogo.class) {
- public SiteLogo create() {
- final SiteLogoPresenter presenter = new SiteLogoPresenter($(Session.class));
- final SiteLogoPanel panel = new SiteLogoPanel(presenter, $(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<SiteLogo>(SiteLogo.class) {
+ @Override
+ public SiteLogo create() {
+ final SiteLogoPresenter presenter = new SiteLogoPresenter($(Session.class));
+ final SiteLogoPanel panel = new SiteLogoPanel(presenter, $(WorkspaceSkeleton.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<EntityLogo>(EntityLogo.class) {
- public EntityLogo create() {
- final EntityLogoPresenter presenter = new EntityLogoPresenter($(StateManager.class),
- $(WsThemePresenter.class), $(Session.class));
- final EntityLogoPanel panel = new EntityLogoPanel($(I18nUITranslationService.class),
- $(WorkspaceSkeleton.class), $$(FileDownloadUtils.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<EntityLogo>(EntityLogo.class) {
+ @Override
+ public EntityLogo create() {
+ final EntityLogoPresenter presenter = new EntityLogoPresenter($(StateManager.class),
+ $(WsThemePresenter.class), $(Session.class));
+ final EntityLogoPanel panel = new EntityLogoPanel($(I18nUITranslationService.class),
+ $(WorkspaceSkeleton.class), $$(FileDownloadUtils.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<WsThemePresenter>(WsThemePresenter.class) {
- public WsThemePresenter create() {
- final WsThemePresenter presenter = new WsThemePresenter($(Session.class), $$(GroupServiceAsync.class),
- $(StateManager.class));
- final WsThemePanel panel = new WsThemePanel($(WorkspaceSkeleton.class), presenter,
- $(I18nUITranslationService.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<WsThemePresenter>(WsThemePresenter.class) {
+ @Override
+ public WsThemePresenter create() {
+ final WsThemePresenter presenter = new WsThemePresenter($(Session.class), $$(GroupServiceAsync.class),
+ $(StateManager.class));
+ final WsThemePanel panel = new WsThemePanel($(WorkspaceSkeleton.class), presenter,
+ $(I18nUITranslationService.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<EntityTitle>(EntityTitle.class) {
- public EntityTitle create() {
- final EntityTitlePresenter presenter = new EntityTitlePresenter($(I18nUITranslationService.class),
- $(KuneErrorHandler.class), $(StateManager.class), $(Session.class),
- $$(ContentServiceAsync.class), $$(ContextNavigator.class), $(ContentIconsRegistry.class));
- final EntityTitlePanel panel = new EntityTitlePanel($(WorkspaceSkeleton.class), presenter);
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<EntityTitle>(EntityTitle.class) {
+ @Override
+ public EntityTitle create() {
+ final EntityTitlePresenter presenter = new EntityTitlePresenter($(I18nUITranslationService.class),
+ $(KuneErrorHandler.class), $(StateManager.class), $(Session.class),
+ $$(ContentServiceAsync.class), $$(ContextNavigator.class), $(ContentIconsRegistry.class));
+ final EntityTitlePanel panel = new EntityTitlePanel($(WorkspaceSkeleton.class), presenter);
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<EntitySubTitle>(EntitySubTitle.class) {
- public EntitySubTitle create() {
- final EntitySubTitlePresenter presenter = new EntitySubTitlePresenter(
- $(I18nUITranslationService.class), $(StateManager.class));
- final EntitySubTitlePanel panel = new EntitySubTitlePanel(presenter, $(I18nUITranslationService.class),
- $(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<EntitySubTitle>(EntitySubTitle.class) {
+ @Override
+ public EntitySubTitle create() {
+ final EntitySubTitlePresenter presenter = new EntitySubTitlePresenter(
+ $(I18nUITranslationService.class), $(StateManager.class), false);
+ final EntitySubTitlePanel panel = new EntitySubTitlePanel(presenter, $(WorkspaceSkeleton.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<EntityLicensePresenter>(EntityLicensePresenter.class) {
- public EntityLicensePresenter create() {
- final EntityLicensePresenter presenter = new EntityLicensePresenter($(StateManager.class));
- final EntityLicensePanel panel = new EntityLicensePanel(presenter, $(I18nUITranslationService.class),
- $(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<EntityLicensePresenter>(EntityLicensePresenter.class) {
+ @Override
+ public EntityLicensePresenter create() {
+ final EntityLicensePresenter presenter = new EntityLicensePresenter($(StateManager.class));
+ final EntityLicensePanel panel = new EntityLicensePanel(presenter, $(I18nUITranslationService.class),
+ $(WorkspaceSkeleton.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<RateIt>(RateIt.class) {
- public RateIt create() {
- final RateItPresenter presenter = new RateItPresenter($(I18nUITranslationService.class),
- $(Session.class), $$(ContentServiceAsync.class), $(StateManager.class));
- final RateItPanel panel = new RateItPanel(presenter, $(I18nUITranslationService.class),
- $(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<RateIt>(RateIt.class) {
+ @Override
+ public RateIt create() {
+ final RateItPresenter presenter = new RateItPresenter($(I18nUITranslationService.class),
+ $(Session.class), $$(ContentServiceAsync.class), $(StateManager.class));
+ final RateItPanel panel = new RateItPanel(presenter, $(I18nUITranslationService.class),
+ $(WorkspaceSkeleton.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<RatePresenter>(RatePresenter.class) {
- public RatePresenter create() {
- final RatePresenter presenter = new RatePresenter($(StateManager.class));
- final RatePanel panel = new RatePanel(null, null, $(I18nUITranslationService.class),
- $(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<RatePresenter>(RatePresenter.class) {
+ @Override
+ public RatePresenter create() {
+ final RatePresenter presenter = new RatePresenter($(StateManager.class));
+ final RatePanel panel = new RatePanel(null, null, $(I18nUITranslationService.class),
+ $(WorkspaceSkeleton.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<GroupMembersSummary>(GroupMembersSummary.class) {
- public GroupMembersSummary create() {
- final GroupMembersSummaryPresenter presenter = new GroupMembersSummaryPresenter(
- $(I18nUITranslationService.class), $(StateManager.class), $(ImageUtils.class),
- $(Session.class), $$(SocialNetworkServiceAsync.class), $$(GroupLiveSearcher.class),
- $(WsThemePresenter.class));
- final GroupMembersSummaryView view = new GroupMembersSummaryPanel(presenter,
- $(I18nUITranslationService.class), $(WorkspaceSkeleton.class));
- presenter.init(view);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<GroupMembersSummary>(GroupMembersSummary.class) {
+ @Override
+ public GroupMembersSummary create() {
+ final GroupMembersSummaryPresenter presenter = new GroupMembersSummaryPresenter(
+ $(I18nUITranslationService.class), $(StateManager.class), $(ImageUtils.class),
+ $(Session.class), $$(SocialNetworkServiceAsync.class), $$(GroupLiveSearcher.class),
+ $(WsThemePresenter.class));
+ final GroupMembersSummaryView view = new GroupMembersSummaryPanel(presenter,
+ $(I18nUITranslationService.class), $(WorkspaceSkeleton.class));
+ presenter.init(view);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<GroupSummary>(GroupSummary.class) {
- public GroupSummary create() {
- final GroupSummaryPresenter presenter = new GroupSummaryPresenter($(StateManager.class),
- $(WsThemePresenter.class));
- final GroupSummaryView view = new GroupSummaryPanel(presenter, $(I18nUITranslationService.class),
- $(WorkspaceSkeleton.class));
- presenter.init(view);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<GroupSummary>(GroupSummary.class) {
+ @Override
+ public GroupSummary create() {
+ final GroupSummaryPresenter presenter = new GroupSummaryPresenter($(StateManager.class),
+ $(WsThemePresenter.class));
+ final GroupSummaryView view = new GroupSummaryPanel(presenter, $(I18nUITranslationService.class),
+ $(WorkspaceSkeleton.class));
+ presenter.init(view);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<ParticipationSummary>(ParticipationSummary.class) {
- public ParticipationSummary create() {
- final ParticipationSummaryPresenter presenter = new ParticipationSummaryPresenter(
- $(I18nUITranslationService.class), $(StateManager.class), $(ImageUtils.class),
- $(Session.class), $$(SocialNetworkServiceAsync.class), $(WsThemePresenter.class));
- final ParticipationSummaryView view = new ParticipationSummaryPanel(presenter,
- $(I18nUITranslationService.class), $(WorkspaceSkeleton.class));
- presenter.init(view);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<ParticipationSummary>(ParticipationSummary.class) {
+ @Override
+ public ParticipationSummary create() {
+ final ParticipationSummaryPresenter presenter = new ParticipationSummaryPresenter(
+ $(I18nUITranslationService.class), $(StateManager.class), $(ImageUtils.class),
+ $(Session.class), $$(SocialNetworkServiceAsync.class), $(WsThemePresenter.class));
+ final ParticipationSummaryView view = new ParticipationSummaryPanel(presenter,
+ $(I18nUITranslationService.class), $(WorkspaceSkeleton.class));
+ presenter.init(view);
+ return presenter;
+ }
+ });
- register(ApplicationComponentGroup.class, new Factory<TagsSummary>(TagsSummary.class) {
- public TagsSummary create() {
- final TagsSummaryPresenter presenter = new TagsSummaryPresenter($(Session.class),
- $$(SiteSearcher.class), $(StateManager.class), $(WsThemePresenter.class));
- final TagsSummaryPanel panel = new TagsSummaryPanel(presenter, $(I18nUITranslationService.class),
- $(WorkspaceSkeleton.class));
- presenter.init(panel);
- return presenter;
- }
- });
+ register(ApplicationComponentGroup.class, new Factory<TagsSummary>(TagsSummary.class) {
+ @Override
+ public TagsSummary create() {
+ final TagsSummaryPresenter presenter = new TagsSummaryPresenter($(Session.class),
+ $$(SiteSearcher.class), $(StateManager.class), $(WsThemePresenter.class));
+ final TagsSummaryPanel panel = new TagsSummaryPanel(presenter, $(I18nUITranslationService.class),
+ $(WorkspaceSkeleton.class));
+ presenter.init(panel);
+ return presenter;
+ }
+ });
}
}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -11,40 +11,40 @@
private final Hyperlink hl;
public ToolSelectorItemPanel(final ToolSelectorItemPresenter presenter, final WorkspaceSkeleton ws) {
- super(RoundedPanel.RIGHT, 2);
- hl = new Hyperlink();
- super.setWidget(hl);
- ws.getEntitySummary().addInTools(this);
- super.sinkEvents(Event.ONCLICK);
- super.addStyleName("k-toolselectoritem");
+ super(RoundedPanel.RIGHT, 2);
+ hl = new Hyperlink();
+ super.setWidget(hl);
+ ws.addInTools(this);
+ super.sinkEvents(Event.ONCLICK);
+ super.addStyleName("k-toolselectoritem");
}
@Override
public void onBrowserEvent(final Event event) {
- super.onBrowserEvent(event);
+ super.onBrowserEvent(event);
}
public void setLink(final String text, final String targetHistoryToken) {
- hl.setText(text);
- hl.setTargetHistoryToken(targetHistoryToken);
+ hl.setText(text);
+ hl.setTargetHistoryToken(targetHistoryToken);
}
public void setSelected(final boolean selected) {
- if (selected) {
- hl.setStylePrimaryName("k-toolselectoritem-sel");
- } else {
- hl.setStylePrimaryName("k-toolselectoritem-notsel");
- }
- super.setCornerStyleName(hl.getStyleName());
+ if (selected) {
+ hl.setStylePrimaryName("k-toolselectoritem-sel");
+ } else {
+ hl.setStylePrimaryName("k-toolselectoritem-notsel");
+ }
+ super.setCornerStyleName(hl.getStyleName());
}
public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) {
- if (oldTheme != null) {
- final String oldName = oldTheme.getName();
- hl.removeStyleDependentName(oldName);
- }
- final String newName = newTheme.getName();
- hl.addStyleDependentName(newName);
- super.setCornerStyleName(hl.getStyleName());
+ if (oldTheme != null) {
+ final String oldName = oldTheme.getName();
+ hl.removeStyleDependentName(oldName);
+ }
+ final String newName = newTheme.getName();
+ hl.addStyleDependentName(newName);
+ super.setCornerStyleName(hl.getStyleName());
}
}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/DefaultBorderLayout.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -7,10 +7,11 @@
import com.gwtext.client.widgets.layout.BorderLayout;
import com.gwtext.client.widgets.layout.BorderLayoutData;
+ at Deprecated
public class DefaultBorderLayout {
public enum Position {
- NORTH, CENTER, SOUTH, EAST, WEST
+ NORTH, CENTER, SOUTH, EAST, WEST
}
public static final int DEF_TOOLBAR_HEIGHT = 26;
@@ -18,131 +19,140 @@
private static final int NO_SIZE = -666;
private static RegionPosition[] regionPositions = new RegionPosition[] { RegionPosition.NORTH,
- RegionPosition.CENTER, RegionPosition.SOUTH, RegionPosition.EAST, RegionPosition.WEST };
+ RegionPosition.CENTER, RegionPosition.SOUTH, RegionPosition.EAST, RegionPosition.WEST };
private final Panel mainPanel;
public DefaultBorderLayout() {
- mainPanel = new Panel();
- mainPanel.setLayout(new BorderLayout());
- mainPanel.setBorder(false);
+ mainPanel = new Panel();
+ mainPanel.setLayout(new BorderLayout());
+ mainPanel.setBorder(false);
}
+ public DefaultBorderLayout(String title) {
+ this();
+ mainPanel.setTitle(title);
+ }
+
public void add(final Panel panel, final Position position) {
- add(panel, position, false);
+ add(panel, position, false);
}
public void add(final Panel panel, final Position position, final boolean split) {
- add(panel, position, split, NO_SIZE);
+ add(panel, position, split, NO_SIZE);
}
public void add(final Panel panel, final Position position, final boolean split, final int size) {
- final RegionPosition regionPosition = regionPositions[position.ordinal()];
- final BorderLayoutData borderLayoutData = new BorderLayoutData(regionPosition);
- borderLayoutData.setSplit(split);
- if (split) {
- borderLayoutData.setUseSplitTips(true);
- borderLayoutData.setCollapseModeMini(true);
- }
- if (size != NO_SIZE) {
- switch (position) {
- case NORTH:
- case SOUTH:
- panel.setHeight(size);
- break;
- case EAST:
- case WEST:
- panel.setWidth(size);
- }
- }
- mainPanel.add(panel, borderLayoutData);
- doLayoutIfNeeded();
+ final RegionPosition regionPosition = regionPositions[position.ordinal()];
+ final BorderLayoutData borderLayoutData = new BorderLayoutData(regionPosition);
+ borderLayoutData.setSplit(split);
+ if (split) {
+ borderLayoutData.setUseSplitTips(true);
+ borderLayoutData.setCollapseModeMini(true);
+ }
+ if (size != NO_SIZE) {
+ switch (position) {
+ case NORTH:
+ case SOUTH:
+ panel.setHeight(size);
+ break;
+ case EAST:
+ case WEST:
+ panel.setWidth(size);
+ }
+ }
+ mainPanel.add(panel, borderLayoutData);
+ doLayoutIfNeeded();
}
public void add(final Panel panel, final Position position, final int size) {
- add(panel, position, false, size);
+ add(panel, position, false, size);
}
public void add(final Panel panel, final Widget widget) {
- panel.add(widget);
- if (panel.isRendered()) {
- panel.syncSize();
- panel.doLayout(false);
- }
- doLayoutIfNeeded();
+ panel.add(widget);
+ if (panel.isRendered()) {
+ panel.syncSize();
+ panel.doLayout(false);
+ }
+ doLayoutIfNeeded();
}
public void addStyle(final String style) {
- mainPanel.addClass(style);
+ mainPanel.addClass(style);
}
public Toolbar createBottomBar(final Panel panel) {
- return createBottomBar(panel, null);
+ return createBottomBar(panel, null);
}
public Toolbar createBottomBar(final Panel panel, final String cssStyle) {
- return createBottomBar(panel, cssStyle, null);
+ return createBottomBar(panel, cssStyle, null);
}
public Toolbar createBottomBar(final Panel panel, final String cssStyle, final String id) {
- final Toolbar bottomToolbar = new Toolbar();
- if (id != null) {
- bottomToolbar.setId(id);
- }
- bottomToolbar.setHeight(DEF_TOOLBAR_HEIGHT);
- if (cssStyle != null) {
- bottomToolbar.setCls(cssStyle);
- }
- panel.setBottomToolbar(bottomToolbar);
- return bottomToolbar;
+ final Toolbar bottomToolbar = new Toolbar();
+ if (id != null) {
+ bottomToolbar.setId(id);
+ }
+ bottomToolbar.setHeight(DEF_TOOLBAR_HEIGHT);
+ if (cssStyle != null) {
+ bottomToolbar.setCls(cssStyle);
+ }
+ panel.setBottomToolbar(bottomToolbar);
+ return bottomToolbar;
}
public Toolbar createTopBar(final Panel panel) {
- return createTopBar(panel, null);
+ return createTopBar(panel, null);
}
public Toolbar createTopBar(final Panel panel, final String cssStyle) {
- return createTopBar(panel, cssStyle);
+ return createTopBar(panel, cssStyle);
}
public Toolbar createTopBar(final Panel panel, final String cssStyle, final String id) {
- final Toolbar topToolbar = new Toolbar();
- topToolbar.setHeight(DEF_TOOLBAR_HEIGHT);
- if (id != null) {
- topToolbar.setId(id);
- }
- if (cssStyle != null) {
- topToolbar.setCls(cssStyle);
- }
- panel.setTopToolbar(topToolbar);
- return topToolbar;
+ final Toolbar topToolbar = new Toolbar();
+ topToolbar.setHeight(DEF_TOOLBAR_HEIGHT);
+ if (id != null) {
+ topToolbar.setId(id);
+ }
+ if (cssStyle != null) {
+ topToolbar.setCls(cssStyle);
+ }
+ panel.setTopToolbar(topToolbar);
+ return topToolbar;
}
public void doLayoutIfNeeded() {
- if (mainPanel.isRendered()) {
- mainPanel.doLayout(false);
- }
+ if (mainPanel.isRendered()) {
+ mainPanel.doLayout(false);
+ }
}
public Panel getPanel() {
- return mainPanel;
+ return mainPanel;
}
public void removeStyle(final String style) {
- mainPanel.removeClass(style);
+ mainPanel.removeClass(style);
}
public void setBorder(final boolean border) {
- mainPanel.setBorder(border);
+ mainPanel.setBorder(border);
}
public void setPanel(final Panel panel, final Widget widget) {
- panel.clear();
- add(panel, widget);
- doLayoutIfNeeded();
+ panel.clear();
+ add(panel, widget);
+ doLayoutIfNeeded();
}
+ public void setWidth(int width) {
+ mainPanel.setWidth(width);
+ }
+
public void syncSize() {
- mainPanel.syncSize();
+ mainPanel.syncSize();
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -68,254 +68,256 @@
private final ContextNavigatorPresenter presenter;
public ContextNavigatorPanel(final ContextNavigatorPresenter presenter, final I18nTranslationService i18n,
- final WorkspaceSkeleton ws, final ActionManager actionManager) {
- this.presenter = presenter;
- this.ws = ws;
- this.actionManager = actionManager;
+ final WorkspaceSkeleton ws, final ActionManager actionManager) {
+ this.presenter = presenter;
+ this.ws = ws;
+ this.actionManager = actionManager;
- contextMenus = new HashMap<String, Menu>();
- fireOnTextChange = true;
- isEditable = false;
-
+ contextMenus = new HashMap<String, Menu>();
+ fireOnTextChange = true;
+ isEditable = false;
}
public void addItem(final ContextNavigatorItem item) {
- final String nodeId = item.getId();
- if (treePanel.getNodeById(nodeId) == null) {
- final TreeNode child = new TreeNode(item.getText());
- child.setId(nodeId);
- final String icon = item.getIconUrl();
- if (icon != null) {
- child.setIcon(icon);
- }
- child.setHref("#" + item.getStateToken().toString());
- child.setAllowDrag(item.isDraggable());
- child.setAllowDrop(item.isDroppable());
- createItemMenu(nodeId, item.getActionCollection());
- final TreeNode parent = treePanel.getNodeById(item.getParentId());
- if (parent != null) {
- // Log.info("Adding child node: " + nodeId + " to folder: " +
- // item.getParentId());
- child.addListener(new TreeNodeListenerAdapter() {
- // @Override
- // public void onClick(final Node node, final EventObject e)
- // {
- // Log.info("Tree node clicked: " + getToken(node));
- // // treePanel.getNodeById(node.getId()).select();
- // presenter.gotoToken(getToken(node));
- // }
+ final String nodeId = item.getId();
+ if (treePanel.getNodeById(nodeId) == null) {
+ final TreeNode child = new TreeNode(item.getText());
+ child.setId(nodeId);
+ final String icon = item.getIconUrl();
+ if (icon != null) {
+ child.setIcon(icon);
+ }
+ child.setHref("#" + item.getStateToken().toString());
+ child.setAllowDrag(item.isDraggable());
+ child.setAllowDrop(item.isDroppable());
+ createItemMenu(nodeId, item.getActionCollection());
+ final TreeNode parent = treePanel.getNodeById(item.getParentId());
+ if (parent != null) {
+ child.addListener(new TreeNodeListenerAdapter() {
+ @Override
+ public void onTextChange(final Node node, final String text, final String oldText) {
+ if (fireOnTextChange) {
+ presenter.onItemRename(getToken(node), text, oldText);
+ }
+ }
+ });
+ if (!item.getStateToken().hasAll()) {
+ // is a container
+ child.setExpandable(true);
+ child.setSingleClickExpand(true);
+ child.addListener(new TreeNodeListenerAdapter() {
+ @Override
+ public void onExpand(final Node node) {
+ treePanel.getNodeById(node.getId()).select();
+ presenter.gotoToken(getToken(node));
+ }
+ });
+ } else {
+ // is a document
+ child.setLeaf(true);
+ }
+ child.addListener(new TreeNodeListenerAdapter() {
+ @Override
+ public void onClick(Node node, EventObject e) {
+ presenter.gotoToken(getToken(node));
+ }
+ });
+ parent.appendChild(child);
+ switch (item.getContentStatus()) {
+ case publishedOnline:
+ child.setCls("k-textnormal");
+ break;
+ case inTheDustbin:
+ case rejected:
+ child.setCls("k-textlinethrough");
+ break;
+ case editingInProgress:
+ case submittedForEvaluation:
+ child.setCls("k-textunderline");
+ break;
+ }
+ } else {
+ Log.error("Error building file tree, parent folder not found");
+ }
+ } else {
+ // the node already created
+ }
- @Override
- public void onTextChange(final Node node, final String text, final String oldText) {
- if (fireOnTextChange) {
- presenter.onItemRename(getToken(node), text, oldText);
- }
- }
- });
- if (!item.getStateToken().hasAll()) {
- // is a container
- child.setExpandable(true);
- child.setSingleClickExpand(true);
- child.addListener(new TreeNodeListenerAdapter() {
- public void onExpand(final Node node) {
- treePanel.getNodeById(node.getId()).select();
- presenter.gotoToken(getToken(node));
- child.setIcon("public/nav/folder.png");
- }
- });
- } else {
- // is a document
- child.setLeaf(true);
- }
- parent.appendChild(child);
- switch (item.getContentStatus()) {
- case publishedOnline:
- child.setCls("k-textnormal");
- break;
- case inTheDustbin:
- case rejected:
- child.setCls("k-textlinethrough");
- break;
- case editingInProgress:
- case submittedForEvaluation:
- child.setCls("k-textunderline");
- break;
- }
- } else {
- Log.error("Error building file tree, parent folder not found");
- }
- } else {
- // the node already created
- }
-
}
public void clear() {
- if (treePanel != null) {
- treePanel.clear();
- treePanel = null;
- }
- contextMenus.clear();
+ if (treePanel != null) {
+ treePanel.clear();
+ treePanel = null;
+ }
+ contextMenus.clear();
}
public void editItem(final String id) {
- treeEditor.startEdit(getNode(id));
+ treeEditor.startEdit(getNode(id));
}
public boolean isSelected(final String id) {
- final TreeNode item = getNode(id);
- if (item != null) {
- return item.isSelected();
- }
- return false;
+ final TreeNode item = getNode(id);
+ if (item != null) {
+ return item.isSelected();
+ }
+ return false;
}
public void selectItem(final String id) {
- final TreeNode item = getNode(id);
- if (item != null) {
- item.select();
- if (item.getParentNode() != null) {
- item.ensureVisible();
- }
- if (item.getChildNodes().length > 0) {
- item.expand();
- }
- } else {
- Log.error("Error building file tree, current token not found");
- }
+ final TreeNode item = getNode(id);
+ if (item != null) {
+ item.select();
+ if (item.getParentNode() != null) {
+ if (treePanel.isRendered()) {
+ item.ensureVisible();
+ }
+ }
+ if (item.getChildNodes().length > 0) {
+ item.expand();
+ }
+ } else {
+ Log.error("Error building file tree, current token not found");
+ }
}
public void setEditable(final boolean editable) {
- this.isEditable = editable;
+ this.isEditable = editable;
}
public void setFireOnTextChange(final boolean fireOnTextChange) {
- this.fireOnTextChange = fireOnTextChange;
+ this.fireOnTextChange = fireOnTextChange;
}
public void setItemText(final String genId, final String text) {
- final TreeNode node = getNode(genId);
- node.setText(text);
+ final TreeNode node = getNode(genId);
+ node.setText(text);
}
public void setRootItem(final String id, final String text, final StateToken stateToken) {
- if (treePanel == null || treePanel.getNodeById(id) == null) {
- createTreePanel(id, text, stateToken);
- }
+ if (treePanel == null || treePanel.getNodeById(id) == null) {
+ createTreePanel(id, text, stateToken);
+ }
}
private void createItemMenu(final String nodeId, final ActionItemCollection<StateToken> actionCollection) {
- DeferredCommand.addCommand(new Command() {
- public void execute() {
- Menu menu = null;
- if (actionCollection != null) {
- menu = new Menu();
- // Remove if when retrieved rights of siblings
- for (final ActionItem<StateToken> actionItem : actionCollection) {
- final ActionDescriptor<StateToken> action = actionItem.getAction();
- final Item item = new Item(action.getText());
- item.setIcon(action.getIconUrl());
- menu.addItem(item);
- item.addListener(new BaseItemListenerAdapter() {
- public void onClick(final BaseItem item, final EventObject e) {
- doAction(actionItem);
- }
- });
- }
- }
- contextMenus.put(nodeId, menu);
- }
- });
+ DeferredCommand.addCommand(new Command() {
+ public void execute() {
+ Menu menu = null;
+ if (actionCollection != null) {
+ menu = new Menu();
+ // Remove if when retrieved rights of siblings
+ for (final ActionItem<StateToken> actionItem : actionCollection) {
+ final ActionDescriptor<StateToken> action = actionItem.getAction();
+ final Item item = new Item(action.getText());
+ item.setIcon(action.getIconUrl());
+ menu.addItem(item);
+ item.addListener(new BaseItemListenerAdapter() {
+ @Override
+ public void onClick(final BaseItem item, final EventObject e) {
+ doAction(actionItem);
+ }
+ });
+ }
+ }
+ contextMenus.put(nodeId, menu);
+ }
+ });
}
private void createTreePanel(final String rootId, final String text, final StateToken stateToken) {
- if (treePanel != null) {
- clear();
- }
- treePanel = new TreePanel();
- treePanel.setHeight("100%");
- treePanel.setAutoScroll(true);
- treePanel.setRootVisible(false);
- treePanel.setContainerScroll(true);
- treePanel.setAnimate(true);
- treePanel.setBorder(false);
- treePanel.setUseArrows(true);
- treePanel.setSelectionModel(new MultiSelectionModel());
- // treePanel.setBufferResize(true;)
- // treePanel.setId(CTX_NAVIGATOR_TREEPANEL);
- final TreeNode root = new TreeNode();
- root.setAllowDrag(false);
- root.setExpanded(true);
- root.setId(rootId);
- root.setText(text);
- root.setHref("#" + stateToken);
- root.expand();
- treePanel.addListener(new TreePanelListenerAdapter() {
- public boolean doBeforeNodeDrop(final TreePanel treePanel, final TreeNode target, final DragData dragData,
- final String point, final DragDrop source, final TreeNode dropNode,
- final DropNodeCallback dropNodeCallback) {
- Site.info("Drag & drop of contents in development");
- return false;
- }
+ if (treePanel != null) {
+ clear();
+ }
+ treePanel = new TreePanel();
+ treePanel.setHeight("100%");
+ treePanel.setAutoScroll(true);
+ treePanel.setRootVisible(false);
+ treePanel.setContainerScroll(true);
+ treePanel.setAnimate(true);
+ treePanel.setBorder(false);
+ treePanel.setUseArrows(true);
+ treePanel.setSelectionModel(new MultiSelectionModel());
+ // treePanel.setBufferResize(true;)
+ // treePanel.setId(CTX_NAVIGATOR_TREEPANEL);
+ final TreeNode root = new TreeNode();
+ root.setAllowDrag(false);
+ root.setExpanded(true);
+ root.setId(rootId);
+ root.setText(text);
+ root.setHref("#" + stateToken);
+ root.expand();
+ treePanel.addListener(new TreePanelListenerAdapter() {
+ @Override
+ public boolean doBeforeNodeDrop(final TreePanel treePanel, final TreeNode target, final DragData dragData,
+ final String point, final DragDrop source, final TreeNode dropNode,
+ final DropNodeCallback dropNodeCallback) {
+ Site.info("Drag & drop of contents in development");
+ return false;
+ }
- public void onContextMenu(final TreeNode node, final EventObject e) {
- final Menu menu = contextMenus.get(node.getId());
- if (menu != null && menu.getItems().length > 0) {
- menu.showAt(e.getXY());
- } else {
- Log.info("Empty item menu");
- }
- }
- });
- treePanel.setLines(false);
- treePanel.setEnableDD(isEditable);
- treePanel.setRootNode(root);
- // treePanel.expand();
+ @Override
+ public void onContextMenu(final TreeNode node, final EventObject e) {
+ final Menu menu = contextMenus.get(node.getId());
+ if (menu != null && menu.getItems().length > 0) {
+ menu.showAt(e.getXY());
+ } else {
+ Log.info("Empty item menu");
+ }
+ }
+ });
+ treePanel.setLines(false);
+ treePanel.setEnableDD(isEditable);
+ treePanel.setRootNode(root);
+ // treePanel.expand();
- final TextField field = new TextField();
- treeEditor = new TreeEditor(treePanel, field);
- treeEditor.addListener(new EditorListenerAdapter() {
- public boolean doBeforeStartEdit(final Editor source, final ExtElement boundEl, final Object value) {
- return isEditable;
- }
- });
- // test !?
- treeEditor.setAutosize(false);
+ final TextField field = new TextField();
+ treeEditor = new TreeEditor(treePanel, field);
+ treeEditor.addListener(new EditorListenerAdapter() {
+ @Override
+ public boolean doBeforeStartEdit(final Editor source, final ExtElement boundEl, final Object value) {
+ return isEditable;
+ }
+ });
+ // test !?
+ treeEditor.setAutosize(false);
- treePanel.addListener(new ContainerListenerAdapter() {
- public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
- final int rawWidth, final int rawHeight) {
- // Log.debug("tree-------w: " + adjWidth + " h: " + adjHeight);
- treePanel.doLayout(false);
- }
- });
+ treePanel.addListener(new ContainerListenerAdapter() {
+ @Override
+ public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
+ final int rawWidth, final int rawHeight) {
+ // Log.debug("tree-------w: " + adjWidth + " h: " + adjHeight);
+ treePanel.doLayout(false);
+ }
+ });
- ws.getEntityWorkspace().addContextListener(new ContainerListenerAdapter() {
- @Override
- public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
- final int rawWidth, final int rawHeight) {
- // Log.debug("-------w: " + adjWidth + " h: " + adjHeight);
- // Log.debug("---r---w: " + rawWidth + " h: " + rawHeight);
- }
- });
+ ws.getEntityWorkspace().addContextListener(new ContainerListenerAdapter() {
+ @Override
+ public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
+ final int rawWidth, final int rawHeight) {
+ // Log.debug("-------w: " + adjWidth + " h: " + adjHeight);
+ // Log.debug("---r---w: " + rawWidth + " h: " + rawHeight);
+ }
+ });
- ws.getEntityWorkspace().setContext(treePanel);
+ ws.getEntityWorkspace().setContext(treePanel);
}
private void doAction(final ActionItem<StateToken> actionItem) {
- actionManager.doAction(actionItem);
+ actionManager.doAction(actionItem);
}
private TreeNode getNode(final String id) {
- final TreeNode node = treePanel.getNodeById(id);
- if (node == null) {
- Log.error("Id: " + id + " not found in context navigator");
- }
- return node;
+ final TreeNode node = treePanel.getNodeById(id);
+ if (node == null) {
+ Log.error("Id: " + id + " not found in context navigator");
+ }
+ return node;
}
private String getToken(final Node node) {
- return node.getAttribute("href").substring(1);
+ return node.getAttribute("href").substring(1);
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -248,7 +248,7 @@
final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken,
contentTypeId, session.isLogged(), rights, true);
- final String contentTypeIcon = contentTypeId.equals(TYPE_FOLDER) ? "" : contentIconsRegistry
+ final String contentTypeIcon = contentTypeId.equals(TYPE_FOLDER) ? null : contentIconsRegistry
.getContentTypeIcon(contentTypeId, mimeType);
final ContextNavigatorItem item = new ContextNavigatorItem(genId(stateToken), genId(parentStateToken),
contentTypeIcon, title, status, stateToken, dragDropContentRegistry.isDraggable(contentTypeId, rights
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -21,7 +21,6 @@
package org.ourproject.kune.workspace.client.editor;
import org.ourproject.kune.platf.client.services.I18nTranslationService;
-import org.ourproject.kune.platf.client.ui.DefaultBorderLayout;
import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette;
import org.ourproject.kune.workspace.client.skel.Toolbar;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
@@ -46,102 +45,103 @@
private final WorkspaceSkeleton ws;
public TextEditorPanel(final TextEditorPresenter presenter, final I18nTranslationService i18n,
- final WorkspaceSkeleton ws, final ColorWebSafePalette colorPalette) {
- this.presenter = presenter;
- this.i18n = i18n;
- this.ws = ws;
- mainPanel = new VerticalPanel();
- mainPanel.setWidth("100%");
+ final WorkspaceSkeleton ws, final ColorWebSafePalette colorPalette) {
+ this.presenter = presenter;
+ this.i18n = i18n;
+ this.ws = ws;
+ mainPanel = new VerticalPanel();
+ mainPanel.setWidth("100%");
- gwtRTarea = new RichTextArea();
- gwtRTarea.setWidth("97%");
- gwtRTarea.addStyleName("kune-TexEditorPanel-TextArea");
+ gwtRTarea = new RichTextArea();
+ gwtRTarea.setWidth("97%");
+ gwtRTarea.addStyleName("kune-TexEditorPanel-TextArea");
- final Toolbar editorTopBar = new Toolbar();
- editorTopBar.getPanel().setWidth("auto");
- textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, colorPalette, i18n);
- editorTopBar.add(textEditorToolbar);
- editorTopBar.addStyleName("k-toolbar-bottom-line");
+ final Toolbar editorTopBar = new Toolbar();
+ editorTopBar.getPanel().setWidth("auto");
+ textEditorToolbar = new TextEditorToolbar(gwtRTarea, presenter, colorPalette, i18n);
+ editorTopBar.add(textEditorToolbar);
+ editorTopBar.addStyleName("k-toolbar-bottom-line");
- mainPanel.add(editorTopBar.getPanel());
- mainPanel.add(gwtRTarea);
+ mainPanel.add(editorTopBar.getPanel());
+ mainPanel.add(gwtRTarea);
- ws.getEntityWorkspace().addContentListener(new ContainerListenerAdapter() {
- @Override
- public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
- final int rawWidth, final int rawHeight) {
- adjustSize(adjHeight);
- }
- });
+ ws.getEntityWorkspace().addContentListener(new ContainerListenerAdapter() {
+ @Override
+ public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
+ final int rawWidth, final int rawHeight) {
+ adjustSize(adjHeight);
+ }
+ });
- saveTimer = new Timer() {
- public void run() {
- presenter.onSave();
- }
- };
+ saveTimer = new Timer() {
+ @Override
+ public void run() {
+ presenter.onSave();
+ }
+ };
}
public void attach() {
- ws.getEntityWorkspace().setContent(mainPanel);
+ ws.getEntityWorkspace().setContent(mainPanel);
}
public void detach() {
- mainPanel.removeFromParent();
+ mainPanel.removeFromParent();
}
public void editHTML(final boolean edit) {
- textEditorToolbar.editHTML(edit);
+ textEditorToolbar.editHTML(edit);
}
public String getHTML() {
- return gwtRTarea.getHTML();
+ return gwtRTarea.getHTML();
}
public String getText() {
- return gwtRTarea.getText();
+ return gwtRTarea.getText();
}
public void saveTimerCancel() {
- saveTimer.cancel();
+ saveTimer.cancel();
}
public void scheduleSave(final int delayMillis) {
- saveTimer.schedule(delayMillis);
+ saveTimer.schedule(delayMillis);
}
public void setEnabled(final boolean enabled) {
- final String bgColor = enabled ? BACKCOLOR_ENABLED : BACKCOLOR_DISABLED;
- DOM.setStyleAttribute(gwtRTarea.getElement(), "backgroundColor", bgColor);
- gwtRTarea.setEnabled(enabled);
+ final String bgColor = enabled ? BACKCOLOR_ENABLED : BACKCOLOR_DISABLED;
+ DOM.setStyleAttribute(gwtRTarea.getElement(), "backgroundColor", bgColor);
+ gwtRTarea.setEnabled(enabled);
}
public void setHeight(final String height) {
- gwtRTarea.setHeight(height);
+ gwtRTarea.setHeight(height);
}
public void setHTML(final String html) {
- gwtRTarea.setHTML(html);
+ gwtRTarea.setHTML(html);
}
public void setText(final String text) {
- gwtRTarea.setText(text);
+ gwtRTarea.setText(text);
}
public void showSaveBeforeDialog() {
- MessageBox.confirm(i18n.t("Save confirmation"), i18n.t("Save before close?"), new MessageBox.ConfirmCallback() {
- public void execute(final String btnID) {
- if (btnID.equals("yes")) {
- presenter.onSaveAndClose();
- } else {
- presenter.onCancelConfirmed();
- }
- }
- });
+ MessageBox.confirm(i18n.t("Save confirmation"), i18n.t("Save before close?"), new MessageBox.ConfirmCallback() {
+ public void execute(final String btnID) {
+ if (btnID.equals("yes")) {
+ presenter.onSaveAndClose();
+ } else {
+ presenter.onCancelConfirmed();
+ }
+ }
+ });
}
private void adjustSize(final int height) {
- gwtRTarea.setHeight(""
- + (height - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT - DefaultBorderLayout.DEF_TOOLBAR_HEIGHT));
+ gwtRTarea
+ .setHeight("" + (height - WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT));
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -66,203 +66,214 @@
private SiteBottomTrayButton traybarButton;
public SiteSearcherPanel(final SiteSearcherPresenter initPresenter, final I18nTranslationService i18n,
- final WorkspaceSkeleton ws) {
- super(i18n);
- this.presenter = initPresenter;
- this.ws = ws;
- dialog = createDialog();
+ final WorkspaceSkeleton ws) {
+ super(i18n);
+ this.presenter = initPresenter;
+ this.ws = ws;
+ dialog = createDialog();
}
public String getTextToSearch() {
- return searchField.getValueAsString();
+ return searchField.getValueAsString();
}
public void hide() {
- dialog.hide();
+ dialog.hide();
}
public void search(final String text, final SiteSearcherType type) {
- searchField.setValue(text);
- switch (type) {
- case group_user:
- query(groupStore, groupsGrid, text);
- break;
- case content:
- query(contentStore, contentGrid, text);
- break;
- default:
- break;
- }
+ searchField.setValue(text);
+ switch (type) {
+ case group_user:
+ query(groupStore, groupsGrid, text);
+ break;
+ case content:
+ query(contentStore, contentGrid, text);
+ break;
+ default:
+ break;
+ }
}
+ public void setTextToSearch(String text) {
+ searchField.setValue(text);
+ }
+
public void show() {
- dialog.show();
- dialog.expand();
- dialog.center();
- if (traybarButton == null) {
- traybarButton = new SiteBottomTrayButton("images/kune-search-ico-push.gif", i18n.t("Show/hide searcher"),
- dialog, ws);
- }
+ dialog.show();
+ dialog.expand();
+ dialog.center();
+ if (traybarButton == null) {
+ traybarButton = new SiteBottomTrayButton("images/kune-search-ico-push.gif", i18n.t("Show/hide searcher"),
+ dialog, ws);
+ }
}
private Window createDialog() {
- final Panel north = new Panel();
- north.setHeight(50);
- north.setBorder(false);
+ final Panel north = new Panel();
+ north.setHeight(50);
+ north.setBorder(false);
- final TabPanel centerPanel = new TabPanel();
- centerPanel.setActiveTab(0);
- centerPanel.setAutoScroll(true);
- centerPanel.setClosable(false);
- centerPanel.setBorder(false);
+ final TabPanel centerPanel = new TabPanel();
+ centerPanel.setActiveTab(0);
+ centerPanel.setAutoScroll(true);
+ centerPanel.setClosable(false);
+ centerPanel.setBorder(false);
- final BasicDialog dialog = new BasicDialog(i18n.t("Search"), false, false, 500, 400);
- // dialog.setResizable(false);
- dialog.setIconCls("search-icon");
- final Button closeButton = new Button(i18n.tWithNT("Close", "used in button"));
- closeButton.addListener(new ButtonListenerAdapter() {
- public void onClick(final Button button, final EventObject e) {
- presenter.doClose();
- }
- });
- dialog.addButton(closeButton);
+ final BasicDialog dialog = new BasicDialog(i18n.t("Search"), false, false, 500, 400);
+ // dialog.setResizable(false);
+ dialog.setIconCls("search-icon");
+ final Button closeButton = new Button(i18n.tWithNT("Close", "used in button"));
+ closeButton.addListener(new ButtonListenerAdapter() {
+ @Override
+ public void onClick(final Button button, final EventObject e) {
+ presenter.doClose();
+ }
+ });
+ dialog.addButton(closeButton);
- final Panel searchPanel = createSearchForm(presenter);
- final Panel groupsPanel = new Panel("Groups & Users");
- final Panel contentPanel = new Panel("Content");
- groupsPanel.setLayout(new FitLayout());
- contentPanel.setLayout(new FitLayout());
+ final Panel searchPanel = createSearchForm(presenter);
+ final Panel groupsPanel = new Panel("Groups & Users");
+ final Panel contentPanel = new Panel("Content");
+ groupsPanel.setLayout(new FitLayout());
+ contentPanel.setLayout(new FitLayout());
- groupsGrid = createSearchPanel(SiteSearcherType.group_user);
- contentGrid = createSearchPanel(SiteSearcherType.content);
- groupsPanel.add(groupsGrid);
- contentPanel.add(contentGrid);
- centerPanel.add(groupsPanel);
- centerPanel.add(contentPanel);
- dialog.add(searchPanel, new BorderLayoutData(RegionPosition.NORTH));
- dialog.add(centerPanel, new BorderLayoutData(RegionPosition.CENTER));
+ groupsGrid = createSearchPanel(SiteSearcherType.group_user);
+ contentGrid = createSearchPanel(SiteSearcherType.content);
+ groupsPanel.add(groupsGrid);
+ contentPanel.add(contentGrid);
+ centerPanel.add(groupsPanel);
+ centerPanel.add(contentPanel);
+ dialog.add(searchPanel, new BorderLayoutData(RegionPosition.NORTH));
+ dialog.add(centerPanel, new BorderLayoutData(RegionPosition.CENTER));
- groupsPanel.addListener(new PanelListenerAdapter() {
- public void onActivate(final Panel panel) {
- dialog.setTitle(i18n.t("Search users and groups"));
- presenter.doSearch(SiteSearcherType.group_user);
- }
- });
+ groupsPanel.addListener(new PanelListenerAdapter() {
+ @Override
+ public void onActivate(final Panel panel) {
+ dialog.setTitle(i18n.t("Search users and groups"));
+ presenter.doSearch(SiteSearcherType.group_user);
+ }
+ });
- contentPanel.addListener(new PanelListenerAdapter() {
- public void onActivate(final Panel panel) {
- dialog.setTitle(i18n.t("Search contents"));
- presenter.doSearch(SiteSearcherType.content);
- }
- });
+ contentPanel.addListener(new PanelListenerAdapter() {
+ @Override
+ public void onActivate(final Panel panel) {
+ dialog.setTitle(i18n.t("Search contents"));
+ presenter.doSearch(SiteSearcherType.content);
+ }
+ });
- final String panelId = groupsPanel.getId();
- centerPanel.setActiveItemID(panelId);
+ final String panelId = groupsPanel.getId();
+ centerPanel.setActiveItemID(panelId);
- dialog.setCloseAction(Window.HIDE);
- dialog.ensureDebugId(SITE_SEARCHER_DIALOG);
+ dialog.setCloseAction(Window.HIDE);
+ dialog.ensureDebugId(SITE_SEARCHER_DIALOG);
- return dialog;
+ return dialog;
}
private Panel createSearchForm(final SiteSearcherPresenter presenter) {
- final Panel searchPanel = new Panel();
- searchPanel.setBorder(false);
+ final Panel searchPanel = new Panel();
+ searchPanel.setBorder(false);
- final HorizontalPanel hp = new HorizontalPanel();
+ final HorizontalPanel hp = new HorizontalPanel();
- final FormPanel form = new FormPanel();
- form.setBorder(false);
- form.setWidth(330);
- form.setHideLabels(true);
+ final FormPanel form = new FormPanel();
+ form.setBorder(false);
+ form.setWidth(330);
+ form.setHideLabels(true);
- searchField = new TextField();
- searchField.setWidth(300);
- searchField.addListener(new FieldListenerAdapter() {
+ searchField = new TextField();
+ searchField.setWidth(300);
+ searchField.addListener(new FieldListenerAdapter() {
- public void onSpecialKey(final Field field, final EventObject e) {
- switch (e.getKey()) {
- case KeyboardListener.KEY_ENTER:
- presenter.doSearch(field.getValueAsString());
- break;
- }
- e.stopEvent();
- }
+ @Override
+ public void onSpecialKey(final Field field, final EventObject e) {
+ switch (e.getKey()) {
+ case KeyboardListener.KEY_ENTER:
+ presenter.doSearch(field.getValueAsString());
+ break;
+ }
+ e.stopEvent();
+ }
- });
- form.add(searchField);
+ });
+ form.add(searchField);
- final Button searchBtn = new Button(i18n.tWithNT("Search", "used in button"));
- searchBtn.addListener(new ButtonListenerAdapter() {
- public void onClick(final Button button, final EventObject e) {
- presenter.doSearch(getTextToSearch());
- }
- });
- hp.add(form);
- hp.add(searchBtn);
- hp.setSpacing(7);
- hp.addStyleName("kune-Margin-Large-trbl");
- searchPanel.add(hp);
- return searchPanel;
+ final Button searchBtn = new Button(i18n.tWithNT("Search", "used in button"));
+ searchBtn.addListener(new ButtonListenerAdapter() {
+ @Override
+ public void onClick(final Button button, final EventObject e) {
+ presenter.doSearch(getTextToSearch());
+ }
+ });
+ hp.add(form);
+ hp.add(searchBtn);
+ hp.setSpacing(7);
+ hp.addStyleName("kune-Margin-Large-trbl");
+ searchPanel.add(hp);
+ return searchPanel;
}
private GridPanel createSearchPanel(final SiteSearcherType type) {
- final String id = "shortName";
- final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(id), new StringFieldDef("longName"),
- new StringFieldDef("link"), new StringFieldDef("iconUrl") };
- final Store store;
+ final String id = "shortName";
+ final FieldDef[] fieldDefs = new FieldDef[] { new StringFieldDef(id), new StringFieldDef("longName"),
+ new StringFieldDef("link"), new StringFieldDef("iconUrl") };
+ final Store store;
- switch (type) {
- case group_user:
- store = groupStore = createStore(fieldDefs, "/kune/json/GroupJSONService/search", id);
- break;
- case content:
- store = contentStore = createStore(fieldDefs, "/kune/json/ContentJSONService/search", id);
- break;
- default:
- throw new RuntimeException("Unknown type of search");
- }
+ switch (type) {
+ case group_user:
+ store = groupStore = createStore(fieldDefs, "/kune/json/GroupJSONService/search", id);
+ break;
+ case content:
+ store = contentStore = createStore(fieldDefs, "/kune/json/ContentJSONService/search", id);
+ break;
+ default:
+ throw new RuntimeException("Unknown type of search");
+ }
- final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { new ColumnConfig() {
- {
- setDataIndex(id);
- setWidth(100);
- }
- }, new ColumnConfig() {
- {
- setDataIndex("longName");
- setWidth(350);
- }
- } });
+ final ColumnModel columnModel = new ColumnModel(new ColumnConfig[] { new ColumnConfig() {
+ {
+ setDataIndex(id);
+ setWidth(100);
+ }
+ }, new ColumnConfig() {
+ {
+ setDataIndex("longName");
+ setWidth(350);
+ }
+ } });
- // columnModel.setDefaultSortable(true);
+ // columnModel.setDefaultSortable(true);
- final String gridName = type == SiteSearcherType.group_user ? "group-search" : "content-search";
+ final String gridName = type == SiteSearcherType.group_user ? "group-search" : "content-search";
- final GridPanel grid = new GridPanel(gridName, 474, 250, store, columnModel);
+ final GridPanel grid = new GridPanel(gridName, 474, 250, store, columnModel);
- createPagingToolbar(store, grid);
- grid.setHideColumnHeader(true);
- final GridView view = new GridView();
- view.setForceFit(true);
- view.setEmptyText(i18n.t("No results"));
- grid.setView(view);
+ createPagingToolbar(store, grid);
+ grid.setHideColumnHeader(true);
+ final GridView view = new GridView();
+ view.setForceFit(true);
+ view.setEmptyText(i18n.t("No results"));
+ grid.setView(view);
- grid.addListener(new PanelListenerAdapter() {
- public void onRender(final Component component) {
- Log.debug("Loading store");
- store.load(0, PAGINATION_SIZE);
- }
- });
+ grid.addListener(new PanelListenerAdapter() {
+ @Override
+ public void onRender(final Component component) {
+ Log.debug("Loading store");
+ store.load(0, PAGINATION_SIZE);
+ }
+ });
- grid.addGridCellListener(new GridCellListenerAdapter() {
- public void onCellClick(final GridPanel grid, final int rowIndex, final int colindex, final EventObject e) {
- final Record record = store.getRecordAt(rowIndex);
- final String groupShortName = record.getAsString(id);
- presenter.doGoto(groupShortName);
- }
- });
+ grid.addGridCellListener(new GridCellListenerAdapter() {
+ @Override
+ public void onCellClick(final GridPanel grid, final int rowIndex, final int colindex, final EventObject e) {
+ final Record record = store.getRecordAt(rowIndex);
+ final String groupShortName = record.getAsString(id);
+ presenter.doGoto(groupShortName);
+ }
+ });
- return grid;
+ return grid;
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPresenter.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -20,7 +20,6 @@
package org.ourproject.kune.workspace.client.search;
import java.util.HashMap;
-import java.util.Iterator;
import org.ourproject.kune.platf.client.View;
import org.ourproject.kune.platf.client.state.StateManager;
@@ -36,53 +35,58 @@
private final Provider<StateManager> stateManagerProvider;
public SiteSearcherPresenter(final Provider<StateManager> stateManagerProvider) {
- this.stateManagerProvider = stateManagerProvider;
- searchHistory = new HashMap<String, Integer>();
- currentSearch = SiteSearcherType.group_user;
+ this.stateManagerProvider = stateManagerProvider;
+ searchHistory = new HashMap<String, Integer>();
+ currentSearch = SiteSearcherType.group_user;
}
public void doClose() {
- view.hide();
+ view.hide();
}
public void doGoto(final String groupShortName) {
- stateManagerProvider.get().gotoToken(groupShortName);
+ stateManagerProvider.get().gotoToken(groupShortName);
}
public void doSearch(final SiteSearcherType typeOfSearch) {
- doSearchOfType(view.getTextToSearch(), typeOfSearch);
+ if (view != null) {
+ String textToSearch = view.getTextToSearch();
+ if (textToSearch != null) {
+ doSearchOfType(textToSearch, typeOfSearch);
+ }
+ }
}
public void doSearch(final String text) {
- Site.showProgressLoading();
- searchHistory.put(text, null);
- view.search(text, currentSearch);
- view.show();
- Site.hideProgress();
+ Site.showProgressLoading();
+ searchHistory.put(text, null);
+ view.search(text, currentSearch);
+ view.show();
+ Site.hideProgress();
}
public void doSearchOfType(final String text, final SiteSearcherType typeOfSearch) {
- this.currentSearch = typeOfSearch;
- doSearch(text);
+ view.setTextToSearch(text);
+ this.currentSearch = typeOfSearch;
+ doSearch(text);
}
public Object[][] getSearchHistory() {
- final Object[][] objs = new Object[searchHistory.size()][1];
- int i = 0;
- for (final Iterator<String> iterator = searchHistory.keySet().iterator(); iterator.hasNext();) {
- final String search = iterator.next();
- final Object[] obj = new Object[] { search };
- objs[i++] = obj;
- }
- return objs;
+ final Object[][] objs = new Object[searchHistory.size()][1];
+ int i = 0;
+ for (String search : searchHistory.keySet()) {
+ final Object[] obj = new Object[] { search };
+ objs[i++] = obj;
+ }
+ return objs;
}
public View getView() {
- return view;
+ return view;
}
public void init(final SiteSearcherView view) {
- this.view = view;
+ this.view = view;
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherView.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherView.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -29,6 +29,8 @@
void search(String text, SiteSearcherType currentSearch);
+ void setTextToSearch(String text);
+
void show();
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterForm.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -15,14 +15,14 @@
private static final String MUST_BE_BETWEEN_3_AND_15 = "Must be between 3 and 15 lowercase characters. Can only contain characters, numbers, and dashes";
- private static final String NICK_FIELD = "nick";
- private static final String EMAIL_FIELD = "email";
- private static final String LONGNAME_FIELD = "long_name";
- private static final String PASSWORD_FIELD = "password";
- private static final String PASSWORD_FIELD_DUP = "passwordDup";
- private static final String LANG_FIELD = "lang";
- private static final String COUNTRY_FIELD = "country";
- private static final String TIMEZONE_FIELD = "timezone";
+ private static final String NICK_FIELD = "kune-urf-nick-f";
+ private static final String EMAIL_FIELD = "kune-urf-email-f";
+ private static final String LONGNAME_FIELD = "kune-urf-long_name-f";
+ private static final String PASSWORD_FIELD = "kune-urf-password-f";
+ private static final String PASSWORD_FIELD_DUP = "kune-urf-passwordDup-f";
+ private static final String LANG_FIELD = "kune-urf-lang-f";
+ private static final String COUNTRY_FIELD = "kune-urf-country-f";
+ private static final String TIMEZONE_FIELD = "kune-urf-timezone-f";
private final TextField shortNameRegField;
private final TextField longNameRegField;
@@ -34,173 +34,179 @@
private final ComboBox timezoneCombo;
public RegisterForm(final SignInPresenter presenter, final I18nUITranslationService i18n) {
- super.addStyleName("kune-Margin-Large-l");
+ super.addStyleName("kune-Margin-Large-l");
- shortNameRegField = new TextField();
- shortNameRegField.setFieldLabel(i18n.t("Nickname"));
- shortNameRegField.setName(NICK_FIELD);
- shortNameRegField.setWidth(DEF_FIELD_WIDTH);
- shortNameRegField.setAllowBlank(false);
- shortNameRegField.setMinLength(3);
- shortNameRegField.setMaxLength(15);
- shortNameRegField.setRegex("^[a-z0-9_\\-]+$");
- shortNameRegField.setMinLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15));
- shortNameRegField.setMaxLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15));
- shortNameRegField.setRegexText(i18n.t(MUST_BE_BETWEEN_3_AND_15));
- shortNameRegField.setValidationEvent(false);
- add(shortNameRegField);
+ shortNameRegField = new TextField();
+ shortNameRegField.setFieldLabel(i18n.t("Nickname"));
+ shortNameRegField.setName(NICK_FIELD);
+ shortNameRegField.setWidth(DEF_FIELD_WIDTH);
+ shortNameRegField.setAllowBlank(false);
+ shortNameRegField.setMinLength(3);
+ shortNameRegField.setMaxLength(15);
+ shortNameRegField.setRegex("^[a-z0-9_\\-]+$");
+ shortNameRegField.setMinLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15));
+ shortNameRegField.setMaxLengthText(i18n.t(MUST_BE_BETWEEN_3_AND_15));
+ shortNameRegField.setRegexText(i18n.t(MUST_BE_BETWEEN_3_AND_15));
+ shortNameRegField.setValidationEvent(false);
+ add(shortNameRegField);
- longNameRegField = new TextField();
- longNameRegField.setFieldLabel(i18n.t("Full Name"));
- longNameRegField.setName(LONGNAME_FIELD);
- longNameRegField.setWidth(DEF_FIELD_WIDTH);
- longNameRegField.setAllowBlank(false);
- longNameRegField.setMinLength(3);
- longNameRegField.setMaxLength(50);
- longNameRegField.setValidationEvent(false);
- add(longNameRegField);
+ longNameRegField = new TextField();
+ longNameRegField.setFieldLabel(i18n.t("Full Name"));
+ longNameRegField.setName(LONGNAME_FIELD);
+ longNameRegField.setWidth(DEF_FIELD_WIDTH);
+ longNameRegField.setAllowBlank(false);
+ longNameRegField.setMinLength(3);
+ longNameRegField.setMaxLength(50);
+ longNameRegField.setValidationEvent(false);
+ longNameRegField.setId(LONGNAME_FIELD);
+ add(longNameRegField);
- passwdRegField = new TextField();
- passwdRegField.setFieldLabel(i18n.t("Password"));
- passwdRegField.setName(PASSWORD_FIELD);
- passwdRegField.setPassword(true);
- passwdRegField.setAllowBlank(false);
- passwdRegField.setMaxLength(40);
- passwdRegField.setWidth(DEF_FIELD_WIDTH);
- passwdRegField.setValidationEvent(false);
- add(passwdRegField);
+ passwdRegField = new TextField();
+ passwdRegField.setFieldLabel(i18n.t("Password"));
+ passwdRegField.setName(PASSWORD_FIELD);
+ passwdRegField.setPassword(true);
+ passwdRegField.setAllowBlank(false);
+ passwdRegField.setMaxLength(40);
+ passwdRegField.setWidth(DEF_FIELD_WIDTH);
+ passwdRegField.setValidationEvent(false);
+ passwdRegField.setId(PASSWORD_FIELD);
+ add(passwdRegField);
- passwdRegFieldDup = new TextField();
- passwdRegFieldDup.setFieldLabel(i18n.t("Retype password"));
- passwdRegFieldDup.setName(PASSWORD_FIELD_DUP);
- passwdRegFieldDup.setPassword(true);
- passwdRegFieldDup.setAllowBlank(false);
- passwdRegFieldDup.setMinLength(6);
- passwdRegFieldDup.setMaxLength(40);
- passwdRegFieldDup.setWidth(DEF_FIELD_WIDTH);
- passwdRegFieldDup.setInvalidText(i18n.t("Passwords do not match"));
- passwdRegFieldDup.setValidator(new Validator() {
- public boolean validate(final String value) throws ValidationException {
- return passwdRegField.getValueAsString().equals(passwdRegFieldDup.getValueAsString());
- }
- });
- passwdRegFieldDup.setValidationEvent(false);
- add(passwdRegFieldDup);
+ passwdRegFieldDup = new TextField();
+ passwdRegFieldDup.setFieldLabel(i18n.t("Retype password"));
+ passwdRegField.setName(PASSWORD_FIELD_DUP);
+ passwdRegFieldDup.setPassword(true);
+ passwdRegFieldDup.setAllowBlank(false);
+ passwdRegFieldDup.setMinLength(6);
+ passwdRegFieldDup.setMaxLength(40);
+ passwdRegFieldDup.setWidth(DEF_FIELD_WIDTH);
+ passwdRegFieldDup.setInvalidText(i18n.t("Passwords do not match"));
+ passwdRegFieldDup.setValidator(new Validator() {
+ public boolean validate(final String value) throws ValidationException {
+ return passwdRegField.getValueAsString().equals(passwdRegFieldDup.getValueAsString());
+ }
+ });
+ passwdRegFieldDup.setValidationEvent(false);
+ passwdRegField.setId(PASSWORD_FIELD_DUP);
+ add(passwdRegFieldDup);
- emailRegField = new TextField();
- emailRegField.setFieldLabel(i18n.t("Email"));
- emailRegField.setName(EMAIL_FIELD);
- emailRegField.setVtype(VType.EMAIL);
- emailRegField.setWidth(DEF_FIELD_WIDTH);
- emailRegField.setAllowBlank(false);
- emailRegField.setValidationEvent(false);
+ emailRegField = new TextField();
+ emailRegField.setFieldLabel(i18n.t("Email"));
+ emailRegField.setName(EMAIL_FIELD);
+ emailRegField.setVtype(VType.EMAIL);
+ emailRegField.setWidth(DEF_FIELD_WIDTH);
+ emailRegField.setAllowBlank(false);
+ emailRegField.setValidationEvent(false);
+ emailRegField.setId(EMAIL_FIELD);
+ add(emailRegField);
- add(emailRegField);
+ final Store langStore = new SimpleStore(new String[] { "abbr", "language" }, presenter.getLanguages());
+ langStore.load();
- final Store langStore = new SimpleStore(new String[] { "abbr", "language" }, presenter.getLanguages());
- langStore.load();
+ languageCombo = new ComboBox();
+ languageCombo.setName(LANG_FIELD);
+ languageCombo.setMinChars(1);
+ languageCombo.setFieldLabel(i18n.t("Language"));
+ languageCombo.setStore(langStore);
+ languageCombo.setDisplayField("language");
+ languageCombo.setMode(ComboBox.LOCAL);
+ languageCombo.setTriggerAction(ComboBox.ALL);
+ languageCombo.setEmptyText(i18n.t("Enter language"));
+ languageCombo.setLoadingText(i18n.t("Searching..."));
+ languageCombo.setTypeAhead(true);
+ languageCombo.setTypeAheadDelay(1000);
+ languageCombo.setSelectOnFocus(false);
+ languageCombo.setWidth(186);
+ languageCombo.setAllowBlank(false);
+ languageCombo.setValueField("abbr");
+ languageCombo.setValue(presenter.getCurrentLanguage().getCode());
+ languageCombo.setPageSize(7);
+ languageCombo.setForceSelection(true);
+ languageCombo.setValidationEvent(false);
+ languageCombo.setId(LANG_FIELD);
+ add(languageCombo);
- languageCombo = new ComboBox();
- languageCombo.setName(LANG_FIELD);
- languageCombo.setMinChars(1);
- languageCombo.setFieldLabel(i18n.t("Language"));
- languageCombo.setStore(langStore);
- languageCombo.setDisplayField("language");
- languageCombo.setMode(ComboBox.LOCAL);
- languageCombo.setTriggerAction(ComboBox.ALL);
- languageCombo.setEmptyText(i18n.t("Enter language"));
- languageCombo.setLoadingText(i18n.t("Searching..."));
- languageCombo.setTypeAhead(true);
- languageCombo.setTypeAheadDelay(1000);
- languageCombo.setSelectOnFocus(false);
- languageCombo.setWidth(186);
- languageCombo.setAllowBlank(false);
- languageCombo.setValueField("abbr");
- languageCombo.setValue(presenter.getCurrentLanguage().getCode());
- languageCombo.setPageSize(7);
- languageCombo.setForceSelection(true);
- languageCombo.setValidationEvent(false);
- add(languageCombo);
+ final Store countryStore = new SimpleStore(new String[] { "abbr", "country" }, presenter.getCountries());
+ countryStore.load();
- final Store countryStore = new SimpleStore(new String[] { "abbr", "country" }, presenter.getCountries());
- countryStore.load();
+ countryCombo = new ComboBox();
+ countryCombo.setName(COUNTRY_FIELD);
+ countryCombo.setMinChars(1);
+ countryCombo.setFieldLabel(i18n.t("Country"));
+ countryCombo.setStore(countryStore);
+ countryCombo.setDisplayField("country");
+ countryCombo.setMode(ComboBox.LOCAL);
+ countryCombo.setTriggerAction(ComboBox.ALL);
+ countryCombo.setEmptyText(i18n.t("Enter your country"));
+ countryCombo.setLoadingText(i18n.t("Searching..."));
+ countryCombo.setTypeAhead(true);
+ countryCombo.setTypeAheadDelay(1000);
+ countryCombo.setSelectOnFocus(false);
+ countryCombo.setWidth(186);
+ countryCombo.setAllowBlank(false);
+ countryCombo.setValueField("abbr");
+ countryCombo.setPageSize(7);
+ countryCombo.setForceSelection(true);
+ countryCombo.setValidationEvent(false);
+ countryCombo.setId(COUNTRY_FIELD);
+ add(countryCombo);
- countryCombo = new ComboBox();
- countryCombo.setName(COUNTRY_FIELD);
- countryCombo.setMinChars(1);
- countryCombo.setFieldLabel(i18n.t("Country"));
- countryCombo.setStore(countryStore);
- countryCombo.setDisplayField("country");
- countryCombo.setMode(ComboBox.LOCAL);
- countryCombo.setTriggerAction(ComboBox.ALL);
- countryCombo.setEmptyText(i18n.t("Enter your country"));
- countryCombo.setLoadingText(i18n.t("Searching..."));
- countryCombo.setTypeAhead(true);
- countryCombo.setTypeAheadDelay(1000);
- countryCombo.setSelectOnFocus(false);
- countryCombo.setWidth(186);
- countryCombo.setAllowBlank(false);
- countryCombo.setValueField("abbr");
- countryCombo.setPageSize(7);
- countryCombo.setForceSelection(true);
- countryCombo.setValidationEvent(false);
- add(countryCombo);
+ final Store timezoneStore = new SimpleStore(new String[] { "id" }, presenter.getTimezones());
+ timezoneStore.load();
- final Store timezoneStore = new SimpleStore(new String[] { "id" }, presenter.getTimezones());
- timezoneStore.load();
-
- timezoneCombo = new ComboBox();
- timezoneCombo.setName(TIMEZONE_FIELD);
- timezoneCombo.setMinChars(1);
- timezoneCombo.setFieldLabel(i18n.t("Timezone"));
- timezoneCombo.setStore(timezoneStore);
- timezoneCombo.setDisplayField("id");
- timezoneCombo.setMode(ComboBox.LOCAL);
- timezoneCombo.setTriggerAction(ComboBox.ALL);
- timezoneCombo.setEmptyText(i18n.t("Enter your timezone"));
- timezoneCombo.setLoadingText(i18n.t("Searching..."));
- timezoneCombo.setTypeAhead(true);
- timezoneCombo.setTypeAheadDelay(1000);
- timezoneCombo.setSelectOnFocus(false);
- timezoneCombo.setWidth(186);
- timezoneCombo.setAllowBlank(false);
- timezoneCombo.setValueField("id");
- timezoneCombo.setPageSize(7);
- timezoneCombo.setForceSelection(true);
- timezoneCombo.setValidationEvent(false);
- add(timezoneCombo);
+ timezoneCombo = new ComboBox();
+ timezoneCombo.setName(TIMEZONE_FIELD);
+ timezoneCombo.setMinChars(1);
+ timezoneCombo.setFieldLabel(i18n.t("Timezone"));
+ timezoneCombo.setStore(timezoneStore);
+ timezoneCombo.setDisplayField("id");
+ timezoneCombo.setMode(ComboBox.LOCAL);
+ timezoneCombo.setTriggerAction(ComboBox.ALL);
+ timezoneCombo.setEmptyText(i18n.t("Enter your timezone"));
+ timezoneCombo.setLoadingText(i18n.t("Searching..."));
+ timezoneCombo.setTypeAhead(true);
+ timezoneCombo.setTypeAheadDelay(1000);
+ timezoneCombo.setSelectOnFocus(false);
+ timezoneCombo.setWidth(186);
+ timezoneCombo.setAllowBlank(false);
+ timezoneCombo.setValueField("id");
+ timezoneCombo.setPageSize(7);
+ timezoneCombo.setForceSelection(true);
+ timezoneCombo.setValidationEvent(false);
+ timezoneCombo.setId(TIMEZONE_FIELD);
+ add(timezoneCombo);
}
public String getCountry() {
- return countryCombo.getValueAsString();
+ return countryCombo.getValueAsString();
}
public String getEmail() {
- return emailRegField.getValueAsString();
+ return emailRegField.getValueAsString();
}
public String getLanguage() {
- return languageCombo.getValueAsString();
+ return languageCombo.getValueAsString();
}
public String getLongName() {
- return longNameRegField.getValueAsString();
+ return longNameRegField.getValueAsString();
}
public String getRegisterPassword() {
- return passwdRegField.getValueAsString();
+ return passwdRegField.getValueAsString();
}
public String getRegisterPasswordDup() {
- return passwdRegFieldDup.getValueAsString();
+ return passwdRegFieldDup.getValueAsString();
}
public String getShortName() {
- return shortNameRegField.getValueAsString();
+ return shortNameRegField.getValueAsString();
}
public String getTimezone() {
- return timezoneCombo.getValueAsString();
+ return timezoneCombo.getValueAsString();
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInForm.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -6,8 +6,8 @@
import com.gwtext.client.widgets.form.TextField;
public class SignInForm extends DefaultForm {
- private static final String NICKOREMAIL_FIELD = "nickOrEmail";
- private static final String PASSWORD_FIELD = "password";
+ private static final String NICKOREMAIL_FIELD = "kune-sif-nkf";
+ private static final String PASSWORD_FIELD = "kune-sif-psf";
private final TextField loginNickOrEmailField;
private final TextField loginPassField;
@@ -21,6 +21,7 @@
loginNickOrEmailField.setWidth(DEF_FIELD_WIDTH);
loginNickOrEmailField.setAllowBlank(false);
loginNickOrEmailField.setValidationEvent(false);
+ loginNickOrEmailField.setId(NICKOREMAIL_FIELD);
super.add(loginNickOrEmailField);
loginPassField = new TextField();
@@ -30,6 +31,7 @@
loginPassField.setPassword(true);
loginPassField.setAllowBlank(false);
loginPassField.setValidationEvent(false);
+ loginPassField.setId(PASSWORD_FIELD);
super.add(loginPassField);
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -53,7 +53,7 @@
public class SignInPanel implements SignInView {
private class MessagePanel extends Panel {
- private static final String SIGNIN_MESSAGE_PANEL = "k-signin-message-panel";
+ private static final String SIGNIN_MESSAGE_PANEL = "kune-sip-mp";
private final SimpleMessagePanel messagesPanel;
public MessagePanel() {
@@ -81,8 +81,11 @@
}
}
- private static final String USER_SIGN_IN_PANEL = "k-user-sign-in-panel";
- private static final String USER_REGISTER_PANEL = "k-user-register-panel";
+ private static final String USER_SIGN_IN_PANEL = "kune-sip-usp";
+ private static final String USER_REGISTER_PANEL = "kune-sip-rp";
+ private static final String CANCEL_BUTTON_ID = "kune-sip-cb";
+ private static final String REGISTER_BUTTON_ID = "kune-sip-rb";
+ private static final String SIGN_IN_BUTTON_ID = "kune-sip-sib";
private BasicDialog dialog;
private final SignInPresenter presenter;
@@ -298,6 +301,7 @@
}
}
});
+ signInBtn.setId(SIGN_IN_BUTTON_ID);
dialog.addButton(signInBtn);
final Button registerBtn = new Button(i18n.t("Register"));
@@ -310,9 +314,11 @@
}
});
dialog.addButton(registerBtn);
+ registerBtn.setId(REGISTER_BUTTON_ID);
registerBtn.hide();
final Button cancel = new Button();
+ cancel.setId(CANCEL_BUTTON_ID);
dialog.addButton(cancel);
cancel.setText(i18n.tWithNT("Cancel", "used in button"));
cancel.addListener(new ButtonListenerAdapter() {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,6 +1,5 @@
package org.ourproject.kune.workspace.client.sitebar.sitelogo;
-import org.ourproject.kune.workspace.client.skel.SiteBar;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import com.google.gwt.user.client.ui.Image;
@@ -10,12 +9,11 @@
private final Image siteLogoImg;
public SiteLogoPanel(final SiteLogoPresenter presenter, final WorkspaceSkeleton ws) {
- siteLogoImg = new Image();
- final SiteBar siteBar = ws.getSiteBar();
- siteBar.add(siteLogoImg);
+ siteLogoImg = new Image();
+ ws.getSiteBar().add(siteLogoImg);
}
public void setSiteLogoUrl(final String siteLogoUrl) {
- siteLogoImg.setUrl(siteLogoUrl);
+ siteLogoImg.setUrl(siteLogoUrl);
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -4,7 +4,7 @@
import org.ourproject.kune.platf.client.ui.IconLabel;
import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
import org.ourproject.kune.workspace.client.site.Site;
-import org.ourproject.kune.workspace.client.skel.SiteBar;
+import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import com.google.gwt.user.client.Window;
@@ -14,8 +14,8 @@
public class SitePublicSpaceLinkPanel implements SitePublicSpaceLinkView {
- private static final String SITE_GOTO_PUBLIC = "k-site-goto-public";
- private static final String SITE_CONTENT_NO_PUBLIC = "k-site-content-no-public";
+ private static final String SITE_GOTO_PUBLIC = "kune-spslp-gplb";
+ private static final String SITE_CONTENT_NO_PUBLIC = "knue-spslp-cnp";
private final HorizontalPanel publicHP;
private final IconLabel contentNoPublic;
@@ -23,45 +23,45 @@
private String publicUrl;
public SitePublicSpaceLinkPanel(final SitePublicSpaceLinkPresenter presenter, final WorkspaceSkeleton ws,
- final I18nUITranslationService i18n, final Images img) {
- publicHP = new HorizontalPanel();
- gotoPublic = new IconLabel(img.anybody(), i18n.t("Go to Public Space"), false);
- gotoPublic.ensureDebugId(SITE_GOTO_PUBLIC);
- contentNoPublic = new IconLabel(img.anybody(), i18n.t("This content is not public"));
- contentNoPublic.ensureDebugId(SITE_CONTENT_NO_PUBLIC);
- publicHP.add(gotoPublic);
- publicHP.add(contentNoPublic);
- final SiteBar siteBar = ws.getSiteBar();
- siteBar.add(publicHP);
- siteBar.addFill();
+ final I18nUITranslationService i18n, final Images img) {
+ publicHP = new HorizontalPanel();
+ gotoPublic = new IconLabel(img.anybody(), i18n.t("Go to Public Space"), false);
+ gotoPublic.ensureDebugId(SITE_GOTO_PUBLIC);
+ contentNoPublic = new IconLabel(img.anybody(), i18n.t("This content is not public"));
+ contentNoPublic.ensureDebugId(SITE_CONTENT_NO_PUBLIC);
+ publicHP.add(gotoPublic);
+ publicHP.add(contentNoPublic);
+ final SimpleToolbar siteBar = ws.getSiteBar();
+ siteBar.add(publicHP);
+ siteBar.addFill();
- gotoPublic.addStyleName("kune-Margin-Medium-r");
- setContentPublic(true);
- gotoPublic.addClickListener(new ClickListener() {
- public void onClick(final Widget sender) {
- gotoPublic();
- }
- });
- gotoPublic.setTitle(i18n.t("Leave the workspace and go to the public space of this group")
- + Site.IN_DEVELOPMENT);
- gotoPublic.addStyleName("k-sitebar-labellink");
- contentNoPublic.addStyleName("k-sitebar-labellink");
+ gotoPublic.addStyleName("kune-Margin-Medium-r");
+ setContentPublic(true);
+ gotoPublic.addClickListener(new ClickListener() {
+ public void onClick(final Widget sender) {
+ gotoPublic();
+ }
+ });
+ gotoPublic.setTitle(i18n.t("Leave the workspace and go to the public space of this group")
+ + Site.IN_DEVELOPMENT);
+ gotoPublic.addStyleName("k-sitebar-labellink");
+ contentNoPublic.addStyleName("k-sitebar-labellink");
}
public void setContentGotoPublicUrl(final String publicUrl) {
- this.publicUrl = publicUrl;
+ this.publicUrl = publicUrl;
}
public void setContentPublic(boolean visible) {
- gotoPublic.setVisible(visible);
- contentNoPublic.setVisible(!visible);
+ gotoPublic.setVisible(visible);
+ contentNoPublic.setVisible(!visible);
}
public void setVisible(final boolean visible) {
- publicHP.setVisible(visible);
+ publicHP.setVisible(visible);
}
private void gotoPublic() {
- Window.open(publicUrl, "_blank", "");
+ Window.open(publicUrl, "_blank", "");
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesearch/SiteSearchPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -3,7 +3,7 @@
import org.ourproject.kune.platf.client.services.Images;
import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
import org.ourproject.kune.workspace.client.site.Site;
-import org.ourproject.kune.workspace.client.skel.SiteBar;
+import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import com.google.gwt.user.client.ui.ClickListener;
@@ -16,84 +16,84 @@
public class SiteSearchPanel implements SiteSearchView {
private static final String SEARCH_TEXT_WIDTH_SMALL = "120";
private static final String SEARCH_TEXT_WIDTH_BIG = "180";
- private static final String SITE_SEARCH_BUTTON = "k-site-search-button";
- private static final String SITE_SEARCH_TEXTBOX = "k-site-search-textbox";
+ private static final String SITE_SEARCH_BUTTON = "kune-ssp-bt";
+ private static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tb";
private final PushButton searchButton;
private final TextBox searchTextBox;
private final I18nUITranslationService i18n;
public SiteSearchPanel(final SiteSearchPresenter presenter, final WorkspaceSkeleton ws,
- final I18nUITranslationService i18n) {
- this.i18n = i18n;
- final Images img = Images.App.getInstance();
- final SiteBar siteBar = ws.getSiteBar();
- siteBar.addSpacer();
- siteBar.addSpacer();
- searchButton = new PushButton(img.kuneSearchIco().createImage(), img.kuneSearchIcoPush().createImage());
- searchButton.ensureDebugId(SITE_SEARCH_BUTTON);
- searchTextBox = new TextBox();
- searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX);
+ final I18nUITranslationService i18n) {
+ this.i18n = i18n;
+ final Images img = Images.App.getInstance();
+ final SimpleToolbar siteBar = ws.getSiteBar();
+ siteBar.addSpacer();
+ siteBar.addSpacer();
+ searchButton = new PushButton(img.kuneSearchIco().createImage(), img.kuneSearchIcoPush().createImage());
+ searchButton.ensureDebugId(SITE_SEARCH_BUTTON);
+ searchTextBox = new TextBox();
+ searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX);
- siteBar.add(searchButton);
- siteBar.addSpacer();
- siteBar.add(searchTextBox);
- siteBar.addSpacer();
+ siteBar.add(searchButton);
+ siteBar.addSpacer();
+ siteBar.add(searchTextBox);
+ siteBar.addSpacer();
- setTextSearchSmall();
- setDefaultTextSearch();
- searchTextBox.addFocusListener(new FocusListener() {
- public void onFocus(final Widget arg0) {
- presenter.onSearchFocus();
- }
+ setTextSearchSmall();
+ setDefaultTextSearch();
+ searchTextBox.addFocusListener(new FocusListener() {
+ public void onFocus(final Widget arg0) {
+ presenter.onSearchFocus();
+ }
- public void onLostFocus(final Widget arg0) {
- presenter.onSearchLostFocus(searchTextBox.getText());
- }
- });
+ public void onLostFocus(final Widget arg0) {
+ presenter.onSearchLostFocus(searchTextBox.getText());
+ }
+ });
- searchButton.addClickListener(new ClickListener() {
- public void onClick(final Widget arg0) {
- Site.showProgressProcessing();
- presenter.doSearch(searchTextBox.getText());
- }
- });
+ searchButton.addClickListener(new ClickListener() {
+ public void onClick(final Widget arg0) {
+ Site.showProgressProcessing();
+ presenter.doSearch(searchTextBox.getText());
+ }
+ });
- searchTextBox.addKeyboardListener(new KeyboardListener() {
- public void onKeyDown(final Widget arg0, final char arg1, final int arg2) {
- }
+ searchTextBox.addKeyboardListener(new KeyboardListener() {
+ public void onKeyDown(final Widget arg0, final char arg1, final int arg2) {
+ }
- public void onKeyPress(final Widget arg0, final char arg1, final int arg2) {
- }
+ public void onKeyPress(final Widget arg0, final char arg1, final int arg2) {
+ }
- public void onKeyUp(final Widget widget, final char key, final int mod) {
- if (key == KEY_ENTER) {
- if (searchTextBox.getText().length() > 0) {
- Site.showProgressProcessing();
- presenter.doSearch(searchTextBox.getText());
- }
- }
- }
- });
+ public void onKeyUp(final Widget widget, final char key, final int mod) {
+ if (key == KEY_ENTER) {
+ if (searchTextBox.getText().length() > 0) {
+ Site.showProgressProcessing();
+ presenter.doSearch(searchTextBox.getText());
+ }
+ }
+ }
+ });
}
public void clearSearchText() {
- searchTextBox.setText("");
+ searchTextBox.setText("");
}
public void setDefaultTextSearch() {
- searchTextBox.setText(i18n.t("Search"));
+ searchTextBox.setText(i18n.t("Search"));
}
public void setSearchText(final String text) {
- searchTextBox.setText(text);
+ searchTextBox.setText(text);
}
public void setTextSearchBig() {
- searchTextBox.setWidth(SEARCH_TEXT_WIDTH_BIG);
+ searchTextBox.setWidth(SEARCH_TEXT_WIDTH_BIG);
}
public void setTextSearchSmall() {
- searchTextBox.setWidth(SEARCH_TEXT_WIDTH_SMALL);
+ searchTextBox.setWidth(SEARCH_TEXT_WIDTH_SMALL);
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -8,7 +8,7 @@
public class SiteSignInLinkPanel implements SiteSignInLinkView {
- private static final String SITE_SIGN_IN = "k-site-sign-in";
+ private static final String SITE_SIGN_IN = "kune-ssilp-hy";
private final Hyperlink signInHyperlink;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -10,7 +10,7 @@
public class SiteSignOutLinkPanel implements SiteSignOutLinkView {
- private static final String SITE_SIGN_OUT = "k-site-sign-out";
+ private static final String SITE_SIGN_OUT = "k-ssolp-lb";
private final Label signOutLabel;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -17,10 +17,10 @@
public class SiteUserMenuPanel implements SiteUserMenuView {
- private static final String LOGGED_USER_MENU = "k-logged-user-menu";
- private static final String USER_PREFERENCES_MENU_ITEM = "k-user-pref-menu-item";
- private static final String USER_HOME_PAGE_MENU_ITEM = "k-user-home-page-menu-item";
- private static final String USER_PARTICIPATION_MENU_ITEM = "k-user-participation-menu-item";
+ private static final String LOGGED_USER_MENU = "kune-sump-lum";
+ private static final String USER_PREFERENCES_MENU_ITEM = "kune-sump-uprmi";
+ private static final String USER_HOME_PAGE_MENU_ITEM = "kune-sump-hpmi";
+ private static final String USER_PARTICIPATION_MENU_ITEM = "kune-sump-upami";
private final PushButton loggedUserMenu;
private final Widget separator;
private final Menu userMenu;
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Entity.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,47 +1,102 @@
package org.ourproject.kune.workspace.client.skel;
-import org.ourproject.kune.platf.client.ui.DefaultBorderLayout;
import org.ourproject.kune.workspace.client.themes.WsTheme;
import com.google.gwt.user.client.ui.Widget;
+import com.gwtext.client.core.RegionPosition;
import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.Toolbar;
+import com.gwtext.client.widgets.event.ContainerListenerAdapter;
+import com.gwtext.client.widgets.layout.AnchorLayout;
+import com.gwtext.client.widgets.layout.AnchorLayoutData;
+import com.gwtext.client.widgets.layout.BorderLayout;
+import com.gwtext.client.widgets.layout.BorderLayoutData;
import com.gwtext.client.widgets.layout.FitLayout;
-public class Entity extends DefaultBorderLayout {
+public class Entity {
+ private final Panel entityFitPanel;
private final EntityWorkspace entityWorkspace;
private final EntitySummary entitySummary;
private final Panel entityMainHeader;
public Entity() {
- entityMainHeader = new Panel();
- entityMainHeader.setBorder(false);
- entityMainHeader.setLayout(new FitLayout());
- entitySummary = new EntitySummary();
- entityWorkspace = new EntityWorkspace();
- add(entityMainHeader, DefaultBorderLayout.Position.NORTH, 65);
- add(entityWorkspace.getPanel(), DefaultBorderLayout.Position.CENTER);
- add(entitySummary.getPanel(), DefaultBorderLayout.Position.EAST, true, 150);
+ entityFitPanel = new Panel();
+ entityFitPanel.setLayout(new FitLayout());
+ entityFitPanel.setBorder(false);
+
+ Panel entityAnchorLayout = new Panel();
+ entityAnchorLayout.setBorder(false);
+ entityAnchorLayout.setLayout(new AnchorLayout());
+
+ Panel entityBorderLayout = new Panel();
+ entityBorderLayout.setLayout(new BorderLayout());
+ entityBorderLayout.setBorder(false);
+
+ entityMainHeader = new Panel();
+ entityMainHeader.setBorder(false);
+ entityMainHeader.setHeight(65);
+
+ entityWorkspace = new EntityWorkspace();
+
+ BorderLayoutData eastData = new BorderLayoutData(RegionPosition.EAST);
+ eastData.setMinSize(50);
+ eastData.setSplit(true);
+ eastData.setCollapseModeMini(true);
+ eastData.setUseSplitTips(true);
+
+ entitySummary = new EntitySummary();
+ entityBorderLayout.add(entityWorkspace.getPanel(), new BorderLayoutData(RegionPosition.CENTER));
+ entityBorderLayout.add(entitySummary.getPanel(), eastData);
+
+ entityAnchorLayout.add(entityMainHeader, new AnchorLayoutData("100%"));
+ entityAnchorLayout.add(entityBorderLayout, new AnchorLayoutData("100% -65"));
+ entityFitPanel.add(entityAnchorLayout);
}
- public void addToEntityMainHeader(final Widget widget) {
- entityMainHeader.add(widget);
- doLayoutIfNeeded();
+ public void addInSummary(Widget widget) {
+ entitySummary.addInSummary(widget);
+ doLayoutIfNeeded();
}
- public EntitySummary getEntitySummary() {
- return entitySummary;
+ public void addInTools(final Widget widget) {
+ entitySummary.addInTools(widget);
+ doLayoutIfNeeded();
}
+ public void addListenerInEntitySummary(ContainerListenerAdapter listener) {
+ entitySummary.addListener(listener);
+ }
+
+ public void addToEntityMainHeader(final Widget widget) {
+ entityMainHeader.clear();
+ entityMainHeader.add(widget);
+ doLayoutIfNeeded();
+ }
+
public EntityWorkspace getEntityWorkspace() {
- return entityWorkspace;
+ return entityWorkspace;
}
+ public Panel getPanel() {
+ return entityFitPanel;
+ }
+
+ public Toolbar getSiteTraybar() {
+ return entitySummary.getSiteTraybar();
+ }
+
public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) {
- if (oldTheme != null) {
- super.removeStyle("k-entity-" + oldTheme);
- }
- super.addStyle("k-entity-" + newTheme);
- entityWorkspace.setTheme(oldTheme, newTheme);
+ if (oldTheme != null) {
+ entityFitPanel.removeClass("k-entity-" + oldTheme);
+ }
+ entityFitPanel.addClass("k-entity-" + newTheme);
+ entityWorkspace.setTheme(oldTheme, newTheme);
}
+
+ private void doLayoutIfNeeded() {
+ if (entityFitPanel.isRendered()) {
+ entityFitPanel.doLayout();
+ }
+ }
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntitySummary.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,12 +1,12 @@
package org.ourproject.kune.workspace.client.skel;
-import org.ourproject.kune.platf.client.ui.DefaultBorderLayout;
-
-import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.gwtext.client.widgets.Panel;
import com.gwtext.client.widgets.Toolbar;
import com.gwtext.client.widgets.event.ContainerListener;
+import com.gwtext.client.widgets.layout.AccordionLayout;
+import com.gwtext.client.widgets.layout.AnchorLayout;
+import com.gwtext.client.widgets.layout.AnchorLayoutData;
import com.gwtext.client.widgets.layout.FitLayout;
public class EntitySummary {
@@ -15,57 +15,90 @@
private static final String ENTITY_TOOLS = "k-entity-tools";
private final Panel entityTools;
private final Panel entitySummary;
- private final DefaultBorderLayout mainPanel;
private final Toolbar trayBar;
- private final VerticalPanel vpTools;
+ private final Panel mainFitPanel;
public EntitySummary() {
- mainPanel = new DefaultBorderLayout();
- entityTools = new Panel();
- entityTools.setLayout(new FitLayout());
- entityTools.setId(ENTITY_TOOLS);
- entityTools.setAutoHeight(true);
- vpTools = new VerticalPanel();
- entityTools.add(vpTools);
- entitySummary = new Panel();
- entityTools.setBorder(false);
- entitySummary.setBorder(false);
- entityTools.setAutoScroll(false);
- entitySummary.setAutoScroll(true);
- entitySummary.setCls(ENTITY_SUMMARY);
- entitySummary.setId(ENTITY_SUMMARY);
- trayBar = mainPanel.createBottomBar(entitySummary, SITE_TRAYBAR, SITE_TRAYBAR);
- mainPanel.add(entityTools, DefaultBorderLayout.Position.NORTH);
- mainPanel.add(entitySummary, DefaultBorderLayout.Position.CENTER);
- trayBar.addFill();
+ mainFitPanel = new Panel("");
+ mainFitPanel.setLayout(new FitLayout());
+ mainFitPanel.setBorder(false);
+ mainFitPanel.setWidth(150);
+
+ Panel anchorLayoutPanel = new Panel();
+ anchorLayoutPanel.setLayout(new AnchorLayout());
+ anchorLayoutPanel.setBorder(false);
+ anchorLayoutPanel.setWidth(150);
+ entityTools = new Panel();
+ entityTools.setLayout(new AnchorLayout());
+ entityTools.setId(ENTITY_TOOLS);
+ entityTools.setAutoHeight(true);
+ entitySummary = new Panel();
+ entityTools.setBorder(false);
+ entitySummary.setBorder(false);
+ entityTools.setAutoScroll(false);
+ entitySummary.setAutoScroll(true);
+ entitySummary.setCls(ENTITY_SUMMARY);
+ entitySummary.setId(ENTITY_SUMMARY);
+
+ trayBar = new Toolbar();
+ trayBar.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT);
+ trayBar.setId(SITE_TRAYBAR);
+ trayBar.setCls(SITE_TRAYBAR);
+ trayBar.addFill();
+ entitySummary.setBottomToolbar(trayBar);
+ anchorLayoutPanel.add(entityTools, new AnchorLayoutData("100%"));
+ anchorLayoutPanel.add(entitySummary, new AnchorLayoutData("100% -50"));
+ mainFitPanel.add(anchorLayoutPanel);
}
public void addInSummary(final Widget widget) {
- entitySummary.add(widget);
- entitySummary.syncSize();
- mainPanel.doLayoutIfNeeded();
+ entitySummary.add(widget);
+ doLayoutIfNeeded();
}
public void addInTools(final Widget widget) {
- vpTools.add(widget);
- // entityTools.render(widget.getElement());
- if (entityTools.isRendered()) {
- entityTools.syncSize();
- entityTools.doLayout(false);
- mainPanel.doLayoutIfNeeded();
- }
+ entityTools.add(widget);
+ doLayoutIfNeeded();
}
public void addListener(final ContainerListener listener) {
- entitySummary.addListener(listener);
+ entitySummary.addListener(listener);
}
public Panel getPanel() {
- return mainPanel.getPanel();
+ return mainFitPanel;
}
public Toolbar getSiteTraybar() {
- return trayBar;
+ return trayBar;
}
+ private Panel createAccordionPanel() {
+ Panel accordionPanel = new Panel();
+ accordionPanel.setBorder(false);
+ accordionPanel.setLayout(new AccordionLayout(true));
+
+ Panel panelOne = new Panel("Panel 1", "<p>Panel1 content!</p>");
+ panelOne.setIconCls("settings-icon");
+ accordionPanel.add(panelOne);
+
+ Panel panelTwo = new Panel("Panel 2", "<p>Panel2 content!</p>");
+ panelTwo.setIconCls("folder-icon");
+ accordionPanel.add(panelTwo);
+
+ Panel panelThree = new Panel("Panel 3", "<p>Panel3 content!</p>");
+ panelThree.setIconCls("user-add-icon");
+ accordionPanel.add(panelThree);
+
+ // accordionPanel.setCls(ENTITY_SUMMARY);
+
+ return accordionPanel;
+ }
+
+ private void doLayoutIfNeeded() {
+ if (mainFitPanel.isRendered()) {
+ mainFitPanel.doLayout();
+ }
+ }
+
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,17 +1,20 @@
package org.ourproject.kune.workspace.client.skel;
-import org.ourproject.kune.platf.client.ui.DefaultBorderLayout;
import org.ourproject.kune.platf.client.ui.RoundedPanel;
import org.ourproject.kune.workspace.client.themes.WsTheme;
+import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.ui.Widget;
+import com.gwtext.client.core.RegionPosition;
import com.gwtext.client.widgets.Panel;
import com.gwtext.client.widgets.event.ContainerListener;
import com.gwtext.client.widgets.layout.AnchorLayout;
import com.gwtext.client.widgets.layout.AnchorLayoutData;
+import com.gwtext.client.widgets.layout.BorderLayout;
+import com.gwtext.client.widgets.layout.BorderLayoutData;
import com.gwtext.client.widgets.layout.FitLayout;
-public class EntityWorkspace extends DefaultBorderLayout {
+public class EntityWorkspace {
private static final String ENTITY_TITLE = "k-entity-title";
private static final String ENTITY_SUBTITLE = "k-entity-subtitle";
private static final String ENTITY_BOTTOM = "k-entity-bottom";
@@ -28,131 +31,177 @@
private final Toolbar contextBottomBar;
private final RoundedPanel roundedTitle;
private final RoundedPanel roundedBottom;
+ private final Panel cntCtxBorderLayout;
+ private final Panel mainFitPanel;
public EntityWorkspace() {
- final Panel titles = new Panel();
- titles.setBorder(false);
- titles.setLayout(new AnchorLayout());
- final Panel bottomPanel = new Panel();
- bottomPanel.setBorder(false);
- bottomPanel.setLayout(new AnchorLayout());
+ mainFitPanel = new Panel();
+ mainFitPanel.setLayout(new FitLayout());
+ mainFitPanel.setBorder(false);
- title = new SimpleToolbar();
- title.setHeight("" + (DEF_TOOLBAR_HEIGHT - 2));
- title.setStylePrimaryName(ENTITY_TITLE);
- title.ensureDebugId(ENTITY_TITLE);
- subTitle = new SimpleToolbar();
- subTitle.setStylePrimaryName(ENTITY_SUBTITLE);
- subTitle.ensureDebugId(ENTITY_SUBTITLE);
- bottom = new SimpleToolbar();
- bottom.setHeight("" + (DEF_TOOLBAR_HEIGHT - 2));
- bottom.setStylePrimaryName(ENTITY_BOTTOM);
- bottom.ensureDebugId(ENTITY_BOTTOM);
+ Panel mainAnchorLayout = new Panel();
+ mainAnchorLayout.setLayout(new AnchorLayout());
+ mainAnchorLayout.setBorder(false);
- roundedTitle = new RoundedPanel(title, RoundedPanel.TOPLEFT, 2);
- roundedBottom = new RoundedPanel(bottom, RoundedPanel.BOTTOMLEFT, 2);
+ cntCtxBorderLayout = new Panel();
+ cntCtxBorderLayout.setLayout(new BorderLayout());
+ cntCtxBorderLayout.setBorder(false);
+ final Panel titles = new Panel();
+ titles.setBorder(false);
+ titles.setLayout(new AnchorLayout());
+ final Panel bottomPanel = new Panel();
+ bottomPanel.setBorder(false);
+ bottomPanel.setLayout(new AnchorLayout());
- titles.add(roundedTitle, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT));
- titles.add(subTitle, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT));
- bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT));
+ title = new SimpleToolbar();
+ title.setHeight("" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - 2));
+ title.setStylePrimaryName(ENTITY_TITLE);
+ // title.ensureDebugId(ENTITY_TITLE);
+ subTitle = new SimpleToolbar();
+ subTitle.setStylePrimaryName(ENTITY_SUBTITLE);
+ // subTitle.ensureDebugId(ENTITY_SUBTITLE);
+ bottom = new SimpleToolbar();
+ bottom.setHeight("" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - 2));
+ bottom.setStylePrimaryName(ENTITY_BOTTOM);
+ bottom.ensureDebugId(ENTITY_BOTTOM);
- final DefaultBorderLayout contentWrap = new DefaultBorderLayout();
- final DefaultBorderLayout contextWrap = new DefaultBorderLayout();
- contentWrap.setBorder(true);
- contextWrap.setBorder(true);
- content = new Panel();
- context = new Panel();
- content.setCls(ENTITY_CONTENT);
- context.setCls(ENTITY_CONTEXT);
- context.setLayout(new FitLayout());
- content.setBorder(false);
- context.setBorder(false);
- context.setCollapsible(true);
- // content.setPaddings(7);
- content.setAutoScroll(true);
- // context.setAutoScroll(true);
+ roundedTitle = new RoundedPanel(title, RoundedPanel.TOPLEFT, 2);
+ roundedBottom = new RoundedPanel(bottom, RoundedPanel.BOTTOMLEFT, 2);
- contentTopBar = new Toolbar();
- contentBottomBar = new Toolbar();
- contextTopBar = new Toolbar();
- contextBottomBar = new Toolbar();
- contentTopBar.addStyleName("k-toolbar-bottom-line");
- contentBottomBar.addStyleName("k-toolbar-top-line");
- contextTopBar.addStyleName("k-toolbar-bottom-line");
- contextBottomBar.addStyleName("k-toolbar-top-line");
- contentWrap.add(contentTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT);
- contextWrap.add(contextTopBar.getPanel(), Position.NORTH, false, DEF_TOOLBAR_HEIGHT);
- contentWrap.add(content, Position.CENTER, -1);
- contextWrap.add(context, Position.CENTER, -1);
- contentWrap.add(contentBottomBar.getPanel(), Position.SOUTH, false, DEF_TOOLBAR_HEIGHT);
- contextWrap.add(contextBottomBar.getPanel(), Position.SOUTH, false, DEF_TOOLBAR_HEIGHT);
+ titles.add(roundedTitle, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT));
+ titles.add(subTitle, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT));
+ bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT));
- add(titles, DefaultBorderLayout.Position.NORTH, DEF_TOOLBAR_HEIGHT * 2);
- add(contentWrap.getPanel(), DefaultBorderLayout.Position.CENTER);
- add(contextWrap.getPanel(), DefaultBorderLayout.Position.EAST, true, 175);
- add(bottomPanel, DefaultBorderLayout.Position.SOUTH, DEF_TOOLBAR_HEIGHT + 2);
+ final Panel contentWrap = new Panel();
+ final Panel contextWrap = new Panel();
+ contentWrap.setLayout(new AnchorLayout());
+ contextWrap.setLayout(new AnchorLayout());
+ contentWrap.setBorder(true);
+ contextWrap.setBorder(true);
+ content = new Panel();
+ context = new Panel();
+ content.setCls(ENTITY_CONTENT);
+ context.setCls(ENTITY_CONTEXT);
+ context.setLayout(new FitLayout());
+ content.setBorder(false);
+ context.setBorder(false);
+ context.setCollapsible(true);
+ // content.setPaddings(7);
+ content.setAutoScroll(true);
+ // context.setAutoScroll(true);
+
+ contentTopBar = new Toolbar();
+ contentBottomBar = new Toolbar();
+ contextTopBar = new Toolbar();
+ contextBottomBar = new Toolbar();
+ contentTopBar.getPanel().setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT);
+ contextTopBar.getPanel().setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT);
+ contentBottomBar.getPanel().setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT);
+ contentBottomBar.getPanel().setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT);
+ contentTopBar.addStyleName("k-toolbar-bottom-line");
+ contentBottomBar.addStyleName("k-toolbar-top-line");
+ contextTopBar.addStyleName("k-toolbar-bottom-line");
+ contextBottomBar.addStyleName("k-toolbar-top-line");
+ contentWrap.add(contentTopBar.getPanel());
+ contextWrap.add(contextTopBar.getPanel());
+ contentWrap.add(content, new AnchorLayoutData("100% -" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2)));
+ contextWrap.add(context, new AnchorLayoutData("100% -" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2)));
+ contentWrap.add(contentBottomBar.getPanel());
+ contextWrap.add(contextBottomBar.getPanel());
+ titles.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2);
+ bottomPanel.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT + 2);
+
+ BorderLayoutData eastData = new BorderLayoutData(RegionPosition.EAST);
+ contextWrap.setWidth(175);
+ eastData.setUseSplitTips(true);
+ eastData.setCollapseModeMini(true);
+ cntCtxBorderLayout.add(contentWrap, new BorderLayoutData(RegionPosition.CENTER));
+ cntCtxBorderLayout.add(contextWrap, eastData);
+
+ mainAnchorLayout.add(titles, new AnchorLayoutData("100%"));
+ mainAnchorLayout.add(cntCtxBorderLayout, new AnchorLayoutData("100% -"
+ + ((WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 3) + 2)));
+ mainAnchorLayout.add(bottomPanel, new AnchorLayoutData("100%"));
+ mainFitPanel.add(mainAnchorLayout);
}
public void addContentListener(final ContainerListener listener) {
- content.addListener(listener);
+ content.addListener(listener);
}
public void addContextListener(final ContainerListener listener) {
- context.addListener(listener);
+ context.addListener(listener);
}
public SimpleToolbar getBottomTitle() {
- return bottom;
+ return bottom;
}
public Toolbar getContentBottomBar() {
- return contentBottomBar;
+ return contentBottomBar;
}
public Toolbar getContentTopBar() {
- return contentTopBar;
+ return contentTopBar;
}
public Toolbar getContextBottomBar() {
- return contextBottomBar;
+ return contextBottomBar;
}
public Toolbar getContextTopBar() {
- return contextTopBar;
+ return contextTopBar;
}
+ public Panel getPanel() {
+ return mainFitPanel;
+ }
+
public SimpleToolbar getSubTitle() {
- return subTitle;
+ return subTitle;
}
- public SimpleToolbar getTitle() {
- return title;
+ public SimpleToolbar getTitleComponent() {
+ return title;
}
public void setContent(final Widget widget) {
- setPanel(content, widget);
+ setPanel(content, widget);
}
public void setContext(final Widget widget) {
- setPanel(context, widget);
+ setPanel(context, widget);
}
public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) {
- final String themeS = newTheme.toString();
- if (oldTheme != null) {
- final String previousThemeS = oldTheme.toString();
- title.removeStyleDependentName(previousThemeS);
- subTitle.removeStyleDependentName(previousThemeS);
- bottom.removeStyleDependentName(previousThemeS);
- super.removeStyle("k-entityworkspace-" + previousThemeS);
- context.removeStyleName("k-entity-context-" + previousThemeS);
- }
- super.addStyle("k-entityworkspace-" + newTheme);
- roundedTitle.setCornerStyleName("k-entity-title-rd-" + newTheme);
- roundedBottom.setCornerStyleName("k-entity-bottom-rd-" + newTheme);
- title.addStyleDependentName(themeS);
- subTitle.addStyleDependentName(themeS);
- bottom.addStyleDependentName(themeS);
- context.addStyleName("k-entity-context-" + newTheme);
+ final String themeS = newTheme.toString();
+ if (oldTheme != null) {
+ final String previousThemeS = oldTheme.toString();
+ title.removeStyleDependentName(previousThemeS);
+ subTitle.removeStyleDependentName(previousThemeS);
+ bottom.removeStyleDependentName(previousThemeS);
+ cntCtxBorderLayout.removeClass("k-entityworkspace-" + previousThemeS);
+ context.removeStyleName("k-entity-context-" + previousThemeS);
+ }
+ cntCtxBorderLayout.addClass("k-entityworkspace-" + newTheme);
+ roundedTitle.setCornerStyleName("k-entity-title-rd-" + newTheme);
+ roundedBottom.setCornerStyleName("k-entity-bottom-rd-" + newTheme);
+ title.addStyleDependentName(themeS);
+ subTitle.addStyleDependentName(themeS);
+ bottom.addStyleDependentName(themeS);
+ context.addStyleName("k-entity-context-" + newTheme);
}
+
+ private void doLayoutIfNeeded() {
+ Log.debug("Doing EW layout");
+ if (mainFitPanel.isRendered()) {
+ mainFitPanel.doLayout();
+ }
+ }
+
+ private void setPanel(Panel panel, Widget widget) {
+ panel.clear();
+ panel.add(widget);
+ doLayoutIfNeeded();
+ }
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/SiteBar.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -7,27 +7,31 @@
private final SimpleToolbar simpleToolbar;
+ @Deprecated
public SiteBar() {
- super.setBorder(false);
- simpleToolbar = new SimpleToolbar();
- simpleToolbar.setStyleName("k-sitebar");
- super.add(simpleToolbar);
+ // super.setLayout(new FitLayout());
+ super.setBorder(false);
+ simpleToolbar = new SimpleToolbar();
+ simpleToolbar.setStyleName("k-sitebar");
+ simpleToolbar.addSpacer();
+ super.add(simpleToolbar);
}
+ @Override
public void add(final Widget widget) {
- simpleToolbar.add(widget);
+ simpleToolbar.add(widget);
}
public Widget addFill() {
- return simpleToolbar.addFill();
+ return simpleToolbar.addFill();
}
public Widget addSeparator() {
- return simpleToolbar.addSeparator();
+ return simpleToolbar.addSeparator();
}
public Widget addSpacer() {
- return simpleToolbar.addSpacer();
+ return simpleToolbar.addSpacer();
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/Toolbar.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,7 +1,5 @@
package org.ourproject.kune.workspace.client.skel;
-import org.ourproject.kune.platf.client.ui.DefaultBorderLayout;
-
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.Widget;
@@ -12,67 +10,67 @@
private final HorizontalPanel childPanel;
public Toolbar() {
- container = new Panel();
- container.setBorder(false);
- container.setBodyBorder(false);
- container.setHeight(DefaultBorderLayout.DEF_TOOLBAR_HEIGHT);
- container.setWidth("100%");
- container.setHeader(false);
- container.setBaseCls("x-toolbar");
- container.addClass("x-panel");
- childPanel = new HorizontalPanel();
- container.add(childPanel);
+ container = new Panel();
+ container.setBorder(false);
+ container.setBodyBorder(false);
+ container.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT);
+ container.setWidth("100%");
+ container.setHeader(false);
+ container.setBaseCls("x-toolbar");
+ container.addClass("x-panel");
+ childPanel = new HorizontalPanel();
+ container.add(childPanel);
}
public void add(final Widget widget) {
- childPanel.add(widget);
- doLayoutIfNeeded();
+ childPanel.add(widget);
+ doLayoutIfNeeded();
}
public Widget addFill() {
- final Label emptyLabel = new Label("");
- this.add(emptyLabel);
- childPanel.setCellWidth(emptyLabel, "100%");
- return emptyLabel;
+ final Label emptyLabel = new Label("");
+ this.add(emptyLabel);
+ childPanel.setCellWidth(emptyLabel, "100%");
+ return emptyLabel;
}
public Widget addSeparator() {
- final Label emptyLabel = new Label("");
- emptyLabel.setStyleName("ytb-sep");
- emptyLabel.addStyleName("k-toolbar-sep");
- this.add(emptyLabel);
- return emptyLabel;
+ final Label emptyLabel = new Label("");
+ emptyLabel.setStyleName("ytb-sep");
+ emptyLabel.addStyleName("k-toolbar-sep");
+ this.add(emptyLabel);
+ return emptyLabel;
}
public Widget addSpacer() {
- final Label emptyLabel = new Label("");
- emptyLabel.setStyleName("ytb-spacer");
- this.add(emptyLabel);
- return emptyLabel;
+ final Label emptyLabel = new Label("");
+ emptyLabel.setStyleName("ytb-spacer");
+ this.add(emptyLabel);
+ return emptyLabel;
}
public void addStyleName(final String cls) {
- container.addClass(cls);
+ container.addClass(cls);
}
public void doLayoutIfNeeded() {
- if (container.isRendered()) {
- container.doLayout(false);
- }
+ if (container.isRendered()) {
+ container.doLayout(false);
+ }
}
public Panel getPanel() {
- return container;
+ return container;
}
public void remove(final Widget widget) {
- childPanel.remove(widget);
- doLayoutIfNeeded();
+ childPanel.remove(widget);
+ doLayoutIfNeeded();
}
public void removeAll() {
- childPanel.clear();
- doLayoutIfNeeded();
+ childPanel.clear();
+ doLayoutIfNeeded();
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -1,6 +1,5 @@
package org.ourproject.kune.workspace.client.skel;
-import org.ourproject.kune.platf.client.ui.DefaultBorderLayout;
import org.ourproject.kune.workspace.client.themes.WsTheme;
import com.calclab.suco.client.listener.Listener0;
@@ -13,97 +12,117 @@
import com.gwtext.client.widgets.Panel;
import com.gwtext.client.widgets.Toolbar;
import com.gwtext.client.widgets.Viewport;
+import com.gwtext.client.widgets.event.ContainerListenerAdapter;
+import com.gwtext.client.widgets.layout.AnchorLayout;
+import com.gwtext.client.widgets.layout.AnchorLayoutData;
import com.gwtext.client.widgets.layout.FitLayout;
public class WorkspaceSkeleton {
+ public static final int DEF_TOOLBAR_HEIGHT = 26;
private final Entity entity;
- private final SiteBar sitebar;
- private final DefaultBorderLayout mainPanel;
+ private final SimpleToolbar sitebar;
+ private final Panel mainPanel;
private final Panel container;
private final ExtElement extRootBody;
public WorkspaceSkeleton() {
- extRootBody = new ExtElement(RootPanel.getBodyElement());
- container = new Panel();
- container.setLayout(new FitLayout());
- container.setBorder(false);
- container.setPaddings(5);
- mainPanel = new DefaultBorderLayout();
- sitebar = new SiteBar();
- entity = new Entity();
- mainPanel.add(sitebar, DefaultBorderLayout.Position.NORTH, DefaultBorderLayout.DEF_TOOLBAR_HEIGHT);
- mainPanel.add(entity.getPanel(), DefaultBorderLayout.Position.CENTER);
- container.add(mainPanel.getPanel());
- new Viewport(container);
+ extRootBody = new ExtElement(RootPanel.getBodyElement());
+
+ container = new Panel();
+ container.setLayout(new FitLayout());
+ container.setBorder(false);
+ container.setPaddings(5);
+
+ mainPanel = new Panel();
+ mainPanel.setLayout(new AnchorLayout());
+ mainPanel.setBorder(false);
+
+ sitebar = new SimpleToolbar();
+ sitebar.setStyleName("k-sitebar");
+ sitebar.setHeight("" + DEF_TOOLBAR_HEIGHT);
+
+ entity = new Entity();
+
+ mainPanel.add(sitebar, new AnchorLayoutData("100%"));
+ mainPanel.add(entity.getPanel(), new AnchorLayoutData("100% -" + DEF_TOOLBAR_HEIGHT));
+ container.add(mainPanel);
+ new Viewport(container);
}
+ public void addInSummary(Widget widget) {
+ entity.addInSummary(widget);
+ }
+
+ public void addInTools(final Widget widget) {
+ entity.addInTools(widget);
+ }
+
+ public void addListenerInEntitySummary(ContainerListenerAdapter listener) {
+ entity.addListenerInEntitySummary(listener);
+ }
+
public void addToEntityMainHeader(final Widget widget) {
- entity.addToEntityMainHeader(widget);
+ entity.addToEntityMainHeader(widget);
}
public void askConfirmation(final String title, final String message, final Listener0 onConfirmed,
- final Listener0 onCancel) {
- MessageBox.confirm(title, message, new MessageBox.ConfirmCallback() {
- public void execute(final String btnID) {
- if (btnID.equals("yes")) {
- DeferredCommand.addCommand(new Command() {
- public void execute() {
- onConfirmed.onEvent();
- }
- });
- } else {
- onCancel.onEvent();
- }
- }
- });
+ final Listener0 onCancel) {
+ MessageBox.confirm(title, message, new MessageBox.ConfirmCallback() {
+ public void execute(final String btnID) {
+ if (btnID.equals("yes")) {
+ DeferredCommand.addCommand(new Command() {
+ public void execute() {
+ onConfirmed.onEvent();
+ }
+ });
+ } else {
+ onCancel.onEvent();
+ }
+ }
+ });
}
- public EntitySummary getEntitySummary() {
- return entity.getEntitySummary();
- }
-
public EntityWorkspace getEntityWorkspace() {
- return entity.getEntityWorkspace();
+ return entity.getEntityWorkspace();
}
- public SiteBar getSiteBar() {
- return sitebar;
+ public SimpleToolbar getSiteBar() {
+ return sitebar;
}
public Toolbar getSiteTraybar() {
- return entity.getEntitySummary().getSiteTraybar();
+ return entity.getSiteTraybar();
}
public void mask() {
- extRootBody.mask();
+ extRootBody.mask();
}
public void mask(final String message) {
- extRootBody.mask(message, "x-mask-loading");
+ extRootBody.mask(message, "x-mask-loading");
}
public void promptMessage(final String title, final String message, final Listener0 onEnter) {
- MessageBox.prompt(title, message, new MessageBox.PromptCallback() {
- public void execute(final String btnID, final String text) {
- // FIXME: use btnID
- onEnter.onEvent();
- }
- });
+ MessageBox.prompt(title, message, new MessageBox.PromptCallback() {
+ public void execute(final String btnID, final String text) {
+ // FIXME: use btnID
+ onEnter.onEvent();
+ }
+ });
}
public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) {
- entity.setTheme(oldTheme, newTheme);
+ entity.setTheme(oldTheme, newTheme);
}
public void showAlertMessage(final String title, final String message) {
- MessageBox.alert(title, message, new MessageBox.AlertCallback() {
- public void execute() {
- }
- });
+ MessageBox.alert(title, message, new MessageBox.AlertCallback() {
+ public void execute() {
+ }
+ });
}
public void unMask() {
- extRootBody.unmask();
+ extRootBody.unmask();
}
-
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -9,7 +9,6 @@
import org.ourproject.kune.platf.client.ui.gridmenu.GridItem;
import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel;
import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
-import org.ourproject.kune.workspace.client.skel.EntitySummary;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.themes.WsTheme;
@@ -33,115 +32,117 @@
private final HashMap<GridButton, ToolbarButton> buttonsCache;
public GroupMembersSummaryPanel(final GroupMembersSummaryPresenter presenter, final I18nUITranslationService i18n,
- final WorkspaceSkeleton ws) {
- super(true);
- this.presenter = presenter;
- this.i18n = i18n;
- super.setHeaderText(i18n.t("Group members"));
- super.setHeaderTitle(i18n.t("People and groups collaborating in this group"));
- super.setBorderStylePrimaryName("k-dropdownouter-members");
- super.addStyleName("kune-Margin-Medium-t");
+ final WorkspaceSkeleton ws) {
+ super(true);
+ this.presenter = presenter;
+ this.i18n = i18n;
+ super.setHeaderText(i18n.t("Group members"));
+ super.setHeaderTitle(i18n.t("People and groups collaborating in this group"));
+ super.setBorderStylePrimaryName("k-dropdownouter-members");
+ super.addStyleName("kune-Margin-Medium-t");
- final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD, i18n
- .t("Drop in the chat area to start a chat.")
- + "<br/>" + i18n.t("Drop into a room to invite the user to join the chat room"));
- gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested "
- + "please request to join to work on it"), dragConf, true, true, false, true, false);
- gridMenuPanel.onDoubleClick(new Listener<String>() {
- public void onEvent(final String groupShortName) {
- presenter.onDoubleClick(groupShortName);
- }
- });
- final EntitySummary entitySummary = ws.getEntitySummary();
- this.setContent(gridMenuPanel);
- entitySummary.addInSummary(this);
- entitySummary.addListener(new ContainerListenerAdapter() {
- @Override
- public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
- final int rawWidth, final int rawHeight) {
- gridMenuPanel.setWidth(adjWidth);
- }
- });
- buttonsCache = new HashMap<GridButton, ToolbarButton>();
+ final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD, i18n
+ .t("Drop in the chat area to start a chat.")
+ + "<br/>" + i18n.t("Drop into a room to invite the user to join the chat room"));
+ gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested "
+ + "please request to join to work on it"), dragConf, true, true, false, true, false);
+ gridMenuPanel.onDoubleClick(new Listener<String>() {
+ public void onEvent(final String groupShortName) {
+ presenter.onDoubleClick(groupShortName);
+ }
+ });
+ this.setContent(gridMenuPanel);
+ ws.addInSummary(this);
+ ws.addListenerInEntitySummary(new ContainerListenerAdapter() {
+ @Override
+ public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
+ final int rawWidth, final int rawHeight) {
+ gridMenuPanel.setWidth(adjWidth);
+ }
+ });
+ buttonsCache = new HashMap<GridButton, ToolbarButton>();
}
public void addButton(final GridButton gridButton) {
- // Workaround: gwt-ext don't have toolbar.removeItem method ...
- ToolbarButton button = buttonsCache.get(gridButton);
- if (button == null) {
- button = new ToolbarButton(gridButton.getTitle());
- button.setIcon(gridButton.getIcon());
- button.setTooltip(gridButton.getTooltip());
- button.addListener(new ButtonListenerAdapter() {
- public void onClick(final Button button, final EventObject e) {
- DeferredCommand.addCommand(new Command() {
- public void execute() {
- gridButton.getListener().onEvent("");
- }
- });
- }
- });
- buttonsCache.put(gridButton, button);
- } else {
- button.setVisible(true);
- }
- gridMenuPanel.getBottomBar().addButton(button);
+ // Workaround: gwt-ext don't have toolbar.removeItem method ...
+ ToolbarButton button = buttonsCache.get(gridButton);
+ if (button == null) {
+ button = new ToolbarButton(gridButton.getTitle());
+ button.setIcon(gridButton.getIcon());
+ button.setTooltip(gridButton.getTooltip());
+ button.addListener(new ButtonListenerAdapter() {
+ @Override
+ public void onClick(final Button button, final EventObject e) {
+ DeferredCommand.addCommand(new Command() {
+ public void execute() {
+ gridButton.getListener().onEvent("");
+ }
+ });
+ }
+ });
+ buttonsCache.put(gridButton, button);
+ } else {
+ button.setVisible(true);
+ }
+ gridMenuPanel.getBottomBar().addButton(button);
}
public void addItem(final GridItem<GroupDTO> gridItem) {
- gridMenuPanel.addItem(gridItem);
+ gridMenuPanel.addItem(gridItem);
}
public void addToolbarFill() {
- gridMenuPanel.getBottomBar().addFill();
+ gridMenuPanel.getBottomBar().addFill();
}
public void clear() {
- gridMenuPanel.removeAll();
- for (final ToolbarButton button : buttonsCache.values()) {
- // Workaround: gwt-ext don't have toolbar.removeItem method ...
- // gridMenuPanel.getBottomBar().getEl().removeChild(button.getElement());
- button.setVisible(false);
- button.removeFromParent();
- }
+ gridMenuPanel.removeAll();
+ for (final ToolbarButton button : buttonsCache.values()) {
+ // Workaround: gwt-ext don't have toolbar.removeItem method ...
+ // gridMenuPanel.getBottomBar().getEl().removeChild(button.getElement());
+ button.setVisible(false);
+ button.removeFromParent();
+ }
}
public void confirmAddCollab(final String groupShortName, final String groupLongName) {
- final String groupName = groupLongName + " (" + groupShortName + ")";
- MessageBox.confirm(i18n.t("Confirm addition of member"), i18n.t("Add [%s] as member?", groupName),
- new MessageBox.ConfirmCallback() {
- public void execute(final String btnID) {
- if (btnID.equals("yes")) {
- DeferredCommand.addCommand(new Command() {
- public void execute() {
- presenter.addCollab(groupShortName);
- }
- });
- }
- }
- });
+ final String groupName = groupLongName + " (" + groupShortName + ")";
+ MessageBox.confirm(i18n.t("Confirm addition of member"), i18n.t("Add [%s] as member?", groupName),
+ new MessageBox.ConfirmCallback() {
+ public void execute(final String btnID) {
+ if (btnID.equals("yes")) {
+ DeferredCommand.addCommand(new Command() {
+ public void execute() {
+ presenter.addCollab(groupShortName);
+ }
+ });
+ }
+ }
+ });
}
public void setDefaultHeigth() {
- // super.setContentHeight("");
- // gridMenuPanel.setHeight("auto");
- // gridMenuPanel.doLayoutIfNeeded();
+ // super.setContentHeight("");
+ // gridMenuPanel.setHeight("auto");
+ // gridMenuPanel.doLayoutIfNeeded();
}
public void setDraggable(final boolean draggable) {
- // gridMenuPanel.setDraggable(draggable);
+ // gridMenuPanel.setDraggable(draggable);
}
public void setMaxHeigth() {
- // super.setContentHeight("" + MAX_HEIGHT);
- // gridMenuPanel.setHeight(MAX_HEIGHT - 26);
+ // super.setContentHeight("" + MAX_HEIGHT);
+ // gridMenuPanel.setHeight(MAX_HEIGHT - 26);
}
+ @Override
public void setTheme(final WsTheme oldTheme, final WsTheme newTheme) {
- super.setTheme(oldTheme, newTheme);
+ super.setTheme(oldTheme, newTheme);
}
+ @Override
public void setVisible(final boolean visible) {
- super.setVisible(visible);
+ super.setVisible(visible);
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -24,7 +24,6 @@
import org.ourproject.kune.platf.client.ui.DropDownPanel;
import org.ourproject.kune.platf.client.ui.gridmenu.GridItem;
import org.ourproject.kune.platf.client.ui.gridmenu.GridMenuPanel;
-import org.ourproject.kune.workspace.client.skel.EntitySummary;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
import com.gwtext.client.widgets.BoxComponent;
@@ -35,41 +34,40 @@
private final GridMenuPanel<GroupDTO> gridMenuPanel;
public ParticipationSummaryPanel(final ParticipationSummaryPresenter presenter, final I18nTranslationService i18n,
- final WorkspaceSkeleton ws) {
- super(true);
- // super.setHeaderText(i18n.t("Participates as..."));
- super.setHeaderText(i18n.t("Participates in"));
- super.setHeaderTitle(i18n.t("Groups in which participates"));
- super.setBorderStylePrimaryName("k-dropdownouter-part");
- super.addStyleName("kune-Margin-Medium-t");
- gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user is not member of any group"), false, false,
- false, false, false);
- final EntitySummary entitySummary = ws.getEntitySummary();
- this.setContent(gridMenuPanel);
- entitySummary.addInSummary(this);
- entitySummary.addListener(new ContainerListenerAdapter() {
- @Override
- public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
- final int rawWidth, final int rawHeight) {
- gridMenuPanel.setWidth(adjWidth);
- }
- });
+ final WorkspaceSkeleton ws) {
+ super(true);
+ // super.setHeaderText(i18n.t("Participates as..."));
+ super.setHeaderText(i18n.t("Participates in"));
+ super.setHeaderTitle(i18n.t("Groups in which participates"));
+ super.setBorderStylePrimaryName("k-dropdownouter-part");
+ super.addStyleName("kune-Margin-Medium-t");
+ gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user is not member of any group"), false, false,
+ false, false, false);
+ this.setContent(gridMenuPanel);
+ ws.addInSummary(this);
+ ws.addListenerInEntitySummary(new ContainerListenerAdapter() {
+ @Override
+ public void onResize(final BoxComponent component, final int adjWidth, final int adjHeight,
+ final int rawWidth, final int rawHeight) {
+ gridMenuPanel.setWidth(adjWidth);
+ }
+ });
}
public void addItem(final GridItem<GroupDTO> gridItem) {
- gridMenuPanel.addItem(gridItem);
+ gridMenuPanel.addItem(gridItem);
}
public void clear() {
- gridMenuPanel.removeAll();
+ gridMenuPanel.removeAll();
}
public void hide() {
- this.setVisible(false);
+ this.setVisible(false);
}
public void show() {
- this.setVisible(true);
+ this.setVisible(true);
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -20,7 +20,6 @@
package org.ourproject.kune.workspace.client.tags;
-import java.util.Iterator;
import java.util.List;
import org.ourproject.kune.platf.client.dto.TagResultDTO;
@@ -45,50 +44,49 @@
private final I18nTranslationService i18n;
public TagsSummaryPanel(final TagsSummaryPresenter presenter, final I18nTranslationService i18n,
- final WorkspaceSkeleton ws) {
- super(i18n.t("Tags"), true);
- this.i18n = i18n;
- setHeaderTitle(i18n.t("Keywords or terms associated with this group"));
- this.presenter = presenter;
- flowPanel = new FlowPanel();
- final VerticalPanel vp = new VerticalPanel();
- noTagsLabel = new Label(i18n.t("The contents of this group don't have any tag"));
- vp.add(flowPanel);
- vp.setWidth("100%");
- vp.setCellWidth(flowPanel, "100%");
- super.setContent(vp);
- super.setBorderStylePrimaryName("k-dropdownouter-tags");
- addStyleName("kune-Margin-Medium-t");
- flowPanel.addStyleName("kune-Margin-Small-trbl");
- ws.getEntitySummary().addInSummary(this);
+ final WorkspaceSkeleton ws) {
+ super(i18n.t("Tags"), true);
+ this.i18n = i18n;
+ setHeaderTitle(i18n.t("Keywords or terms associated with this group"));
+ this.presenter = presenter;
+ flowPanel = new FlowPanel();
+ final VerticalPanel vp = new VerticalPanel();
+ noTagsLabel = new Label(i18n.t("The contents of this group don't have any tag"));
+ vp.add(flowPanel);
+ vp.setWidth("100%");
+ vp.setCellWidth(flowPanel, "100%");
+ super.setContent(vp);
+ super.setBorderStylePrimaryName("k-dropdownouter-tags");
+ addStyleName("kune-Margin-Medium-t");
+ flowPanel.addStyleName("kune-Margin-Small-trbl");
+ ws.addInSummary(this);
}
public void setTags(final List<TagResultDTO> groupTags) {
- DeferredCommand.addCommand(new Command() {
- public void execute() {
- flowPanel.clear();
- if (groupTags.size() == 0) {
- flowPanel.add(noTagsLabel);
- } else {
- for (final Iterator<TagResultDTO> iterator = groupTags.iterator(); iterator.hasNext();) {
- final TagResultDTO tagResult = iterator.next();
- final Label label = new Label(tagResult.getName());
- // i18n pluralization
- if (tagResult.getCount().intValue() > 1) {
- KuneUiUtils.setQuickTip(label, i18n.t("[%d] items with this tag", tagResult.getCount()));
- } else {
- KuneUiUtils.setQuickTip(label, i18n.t("[%d] item with this tag", tagResult.getCount()));
- }
- label.addClickListener(new ClickListener() {
- public void onClick(final Widget sender) {
- presenter.doSearchTag(tagResult.getName());
- }
- });
- label.addStyleName("kune-TagsPanel-tag");
- flowPanel.add(label);
- }
- }
- }
- });
+ DeferredCommand.addCommand(new Command() {
+ public void execute() {
+ flowPanel.clear();
+ if (groupTags.size() == 0) {
+ flowPanel.add(noTagsLabel);
+ } else {
+ for (final TagResultDTO tagResult : groupTags) {
+ final Label label = new Label(tagResult.getName());
+ // i18n pluralization
+ if (tagResult.getCount().intValue() > 1) {
+ KuneUiUtils.setQuickTip(label, i18n.t("[%d] items with this tag", tagResult.getCount()));
+ } else {
+ KuneUiUtils.setQuickTip(label, i18n.t("[%d] item with this tag", tagResult.getCount()));
+ }
+ label.addClickListener(new ClickListener() {
+ public void onClick(final Widget sender) {
+ presenter.doSearchTag(tagResult.getName());
+ }
+ });
+ label.addStyleName("kune-TagsPanel-tag");
+ flowPanel.add(label);
+ }
+ }
+ }
+ });
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -20,7 +20,6 @@
package org.ourproject.kune.workspace.client.title;
-import org.ourproject.kune.platf.client.services.I18nTranslationService;
import org.ourproject.kune.workspace.client.skel.SimpleToolbar;
import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
@@ -30,39 +29,38 @@
private final Label subTitleLeftLabel;
private final Label subTitleRightLabel;
- public EntitySubTitlePanel(final EntitySubTitlePresenter presenter, final I18nTranslationService i18n,
- final WorkspaceSkeleton ws) {
- subTitleLeftLabel = new Label();
- subTitleRightLabel = new Label();
+ public EntitySubTitlePanel(final EntitySubTitlePresenter presenter, final WorkspaceSkeleton ws) {
+ subTitleLeftLabel = new Label();
+ subTitleRightLabel = new Label();
- final SimpleToolbar wsSubTitle = ws.getEntityWorkspace().getSubTitle();
- wsSubTitle.add(subTitleLeftLabel);
- wsSubTitle.addFill();
- wsSubTitle.add(subTitleRightLabel);
+ final SimpleToolbar wsSubTitle = ws.getEntityWorkspace().getSubTitle();
+ wsSubTitle.add(subTitleLeftLabel);
+ wsSubTitle.addFill();
+ wsSubTitle.add(subTitleRightLabel);
- subTitleRightLabel.setText(i18n.t("Language:"));
+ subTitleRightLabel.setText("");
- subTitleLeftLabel.addStyleName("kune-Margin-Large-l");
- subTitleLeftLabel.addStyleName("kune-ft15px");
- subTitleRightLabel.addStyleName("kune-Margin-Large-r");
- subTitleRightLabel.addStyleName("kune-ft12px");
+ subTitleLeftLabel.addStyleName("kune-Margin-Large-l");
+ subTitleLeftLabel.addStyleName("kune-ft15px");
+ subTitleRightLabel.addStyleName("kune-Margin-Large-r");
+ subTitleRightLabel.addStyleName("kune-ft12px");
}
public void setContentSubTitleLeft(final String subTitle) {
- subTitleLeftLabel.setText(subTitle);
+ subTitleLeftLabel.setText(subTitle);
}
public void setContentSubTitleLeftVisible(final boolean visible) {
- subTitleLeftLabel.setVisible(visible);
+ subTitleLeftLabel.setVisible(visible);
}
public void setContentSubTitleRight(final String subTitle) {
- subTitleRightLabel.setText(subTitle);
+ subTitleRightLabel.setText(subTitle);
}
public void setContentSubTitleRightVisible(final boolean visible) {
- subTitleRightLabel.setVisible(visible);
+ subTitleRightLabel.setVisible(visible);
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -31,43 +31,48 @@
private EntitySubTitleView view;
private final I18nTranslationService i18n;
+ private final boolean showLanguage;
- public EntitySubTitlePresenter(final I18nTranslationService i18n, final StateManager stateManager) {
- this.i18n = i18n;
- stateManager.onStateChanged(new Listener<StateDTO>() {
- public void onEvent(final StateDTO state) {
- setState(state);
- }
- });
+ public EntitySubTitlePresenter(final I18nTranslationService i18n, final StateManager stateManager,
+ boolean showLanguage) {
+ this.i18n = i18n;
+ this.showLanguage = showLanguage;
+ stateManager.onStateChanged(new Listener<StateDTO>() {
+ public void onEvent(final StateDTO state) {
+ setState(state);
+ }
+ });
}
public View getView() {
- return view;
+ return view;
}
public void init(final EntitySubTitleView view) {
- this.view = view;
+ this.view = view;
}
public void setContentLanguage(final String langName) {
- view.setContentSubTitleRight(i18n.t("Language: [%s]", langName));
+ if (showLanguage) {
+ view.setContentSubTitleRight(i18n.t("Language: [%s]", langName));
+ }
}
private void setState(final StateDTO state) {
- if (state.hasDocument()) {
- view.setContentSubTitleLeft(i18n.tWithNT("by: [%s]", "used in a list of authors", state.getAuthors().get(0)
- .getName()));
- view.setContentSubTitleLeftVisible(true);
- } else {
- view.setContentSubTitleLeftVisible(false);
- }
- if (state.getLanguage() != null) {
- final String langName = state.getLanguage().getEnglishName();
- setContentLanguage(langName);
- view.setContentSubTitleRightVisible(true);
- } else {
- view.setContentSubTitleRightVisible(false);
- }
+ if (state.hasDocument()) {
+ view.setContentSubTitleLeft(i18n.tWithNT("by: [%s]", "used in a list of authors", state.getAuthors().get(0)
+ .getName()));
+ view.setContentSubTitleLeftVisible(true);
+ } else {
+ view.setContentSubTitleLeftVisible(false);
+ }
+ if (state.getLanguage() != null && showLanguage) {
+ final String langName = state.getLanguage().getEnglishName();
+ setContentLanguage(langName);
+ view.setContentSubTitleRightVisible(true);
+ } else {
+ view.setContentSubTitleRightVisible(false);
+ }
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2008-10-11 17:04:26 UTC (rev 903)
@@ -42,7 +42,7 @@
});
dateLabel = new Label();
- final SimpleToolbar wsTitle = ws.getEntityWorkspace().getTitle();
+ final SimpleToolbar wsTitle = ws.getEntityWorkspace().getTitleComponent();
wsTitle.add(icon);
wsTitle.add(titleLabel);
wsTitle.addFill();
Modified: trunk/src/main/resources/kune.properties
===================================================================
--- trunk/src/main/resources/kune.properties 2008-10-06 17:05:30 UTC (rev 902)
+++ trunk/src/main/resources/kune.properties 2008-10-11 17:04:26 UTC (rev 903)
@@ -25,5 +25,5 @@
kune.sitelogourl = images/kune-logo-16px.png
kune.upload.location = /var/lib/kune/uploads/
-kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff
+kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav
kune.upload.maxfilesizeinmegas = 10
More information about the kune-commits
mailing list