Fixed Bug 409275: [1.8] Change 'default' access modifier in dialogs

6 files changed, 43 insertions, 23 deletions

diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/refactoring.properties b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/refactoring.properties
index ca77d2b84d..044df0ddbe 100644
--- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/refactoring.properties
+++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/refactoring.properties
@@ -5,6 +5,10 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
+# This is an implementation of an early-draft specification developed under the Java
+# Community Process (JCP) and is made available for testing and evaluation purposes
+# only. The code is not compatible with any specification of the JCP.
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 #     Benjamin Muskalla <bmuskalla@eclipsesource.com> - [extract method] Extract method and continue https://bugs.eclipse.org/bugs/show_bug.cgi?id=48056
@@ -150,7 +154,7 @@ ExtractMethodRefactoring_error_vararg_ordering=The variable arity parameter ''{0
 ExtractMethodRefactoring_descriptor_description=Extract method ''{0}'' from ''{1}'' to ''{2}''
 ExtractMethodRefactoring_descriptor_description_short=Extract method ''{0}''
 ExtractMethodRefactoring_destination_pattern=Destination type: ''{0}''
-ExtractMethodRefactoring_default_visibility=(default)
+ExtractMethodRefactoring_default_visibility=(package)
 ExtractMethodRefactoring_declare_thrown_exceptions=Declare thrown runtime exceptions
 
 #-- Inline Method ------------------------------------------------------
@@ -233,7 +237,7 @@ SelfEncapsulateField_getter_pattern=Getter method name: ''{0}''
 SelfEncapsulateField_setter_pattern=Setter method name: ''{0}''
 SelfEncapsulateField_change_visibility=Change visibility to private
 SelfEncapsulateField_original_pattern=Original element: ''{0}''
-SelfEncapsulateField_default_visibility=(default)
+SelfEncapsulateField_default_visibility=(package)
 SelfEncapsulateField_visibility_pattern=Field visibility: ''{0}''
 SelfEncapsulateField_generate_comments=Generate method comments
 SelfEncapsulateField_add_setter=Add Setter method
@@ -330,7 +334,7 @@ ExtractConstantRefactoring_visibility_pattern=Declared visibility: ''{0}''
 ExtractConstantRefactoring_replace_occurrences=Replace occurrences of expression with constant
 ExtractConstantRefactoring_qualify_references=Qualify references to constant
 ExtractConstantRefactoring_declare_constant=Add constant declaration
-ExtractConstantRefactoring_default_visibility=(default)
+ExtractConstantRefactoring_default_visibility=(package)
 ExtractConstantRefactoring_replace=Replace expression with constant reference
 ExtractConstantRefactoring_another_variable=A variable with name ''{0}'' is already defined in the visible scope.
 ExtractConstantRefactoring_no_void=Cannot extract an expression of type \'void\'.
@@ -611,7 +615,7 @@ PullUpRefactoring_field_not_accessible=Field ''{0}'' referenced in one of the mo
 PullUpRefactoring_method_not_accessible=Method ''{0}'' referenced in one of the moved elements is not accessible from type ''{1}''
 PullUpRefactoring_different_method_return_type=Method ''{0}'' declared in type''{1}'' has a different return type than its moved counterpart, which will result in compile errors if you proceed
 PullUpRefactoring_different_field_type=Field ''{0}'' declared in type ''{1}'' has a different type than its moved counterpart
-PullUpRefactoring_lower_default_visibility=Method ''{0}'' declared in type ''{1}'' has visibility lower than ''default'', which will result in compile errors if you proceed
+PullUpRefactoring_lower_default_visibility=Method ''{0}'' declared in type ''{1}'' has visibility lower than ''package'', which will result in compile errors if you proceed
 PullUpRefactoring_lower_protected_visibility=Method ''{0}'' declared in type ''{1}'' has visibility lower than ''protected'', which will result in compile errors if you proceed
 PullUpRefactoring_checking=Checking preconditions...
 PullUpRefactoring_add_method_stub=Add method stub
@@ -782,7 +786,7 @@ ChangeSignatureRefactoring_duplicate_name=Duplicate parameter name: ''{0}''.
 ChangeSignatureRefactoring_return_type_contains_type_variable=The return type ''{0}'' contains the type variable ''{1}'', which may not be available in related methods.
 ChangeSignatureRefactoring_method_name_not_empty=The method name cannot be empty.
 ChangeSignatureRefactoring_default_value=Enter the default value for parameter ''{0}''.
-ChangeSignatureRefactoring_default_visibility=(default)
+ChangeSignatureRefactoring_default_visibility=(package)
 ChangeSignatureRefactoring_invalid_expression=''{0}'' is not a valid expression.
 ChangeSignatureRefactoring_parameter_type_contains_type_variable=The type ''{0}'' of parameter ''{1}'' contains the type variable ''{2}'', which may not be available in related methods.
 ChangeSignatureRefactoring_old_and_new_signatures_not_sufficiently_different=The old and new method signatures do not differ sufficiently for creating a delegate method. Delegate will introduce compile errors.
@@ -838,7 +842,7 @@ MoveInnerToTopRefactoring_descriptor_description_short=Move type ''{0}'' to new
 MoveInnerToTopRefactoring_update_constructor_reference=Update constructor occurrence
 MoveInnerToTopRefactoring_move_to_Top=Move Type to New File
 MoveInnerToTopRefactoring_parameter_pattern=Parameter name: ''{0}''
-MoveInnerToTopRefactoring_change_visibility_type_warning=The visibility of type ''{0}'' will be changed to default.
+MoveInnerToTopRefactoring_change_visibility_type_warning=The visibility of type ''{0}'' will be changed to package.
 MoveInnerToTopRefactoring_change_qualifier=Qualify class name
 MoveInnerToTopRefactoring_type_exists=Type named ''{0}'' already exists in package ''{1}''
 
@@ -923,7 +927,7 @@ MemberVisibilityAdjustor_change_visibility_type_warning=The visibility of type '
 MemberVisibilityAdjustor_change_visibility_method_warning=The visibility of method ''{0}'' will be changed to {1}.
 MemberVisibilityAdjustor_change_visibility_field_warning=The visibility of field ''{0}'' will be changed to {1}.
 #End - Do not remove
-MemberVisibilityAdjustor_change_visibility_default=default
+MemberVisibilityAdjustor_change_visibility_default=package
 MemberVisibilityAdjustor_change_visibility_public=public
 MemberVisibilityAdjustor_change_visibility_protected=protected
 MemberVisibilityAdjustor_change_visibility_private=private
@@ -965,7 +969,7 @@ MovePackageFragmentRootChange_move=Move Package Fragment Root ''{0}'' to ''{1}''
 
 PromoteTempToFieldRefactoring_name=Convert Local Variable to Field
 PromoteTempToFieldRefactoring_select_declaration=Select a declaration or a reference to a local variable.
-PromoteTempToFieldRefactoring_default_visibility=(default)
+PromoteTempToFieldRefactoring_default_visibility=(package)
 PromoteTempToFieldRefactoring_visibility_pattern=Declared visibility: ''{0}''
 PromoteTempToFieldRefactoring_only_declared_in_methods=Only local variables declared in methods can be converted to fields.
 PromoteTempToFieldRefactoring_method_parameters=Cannot convert method parameters to fields.
@@ -1001,7 +1005,7 @@ ConvertAnonymousToNestedRefactoring_declare_final_static=Declare class \'final\'
 ConvertAnonymousToNestedRefactoring_extends_local_class=Cannot convert this anonymous class to a nested class since it extends a local class.
 ConvertAnonymousToNestedRefactoring_class_name_pattern=Class name: ''{0}''
 ConvertAnonymousToNestedRefactoring_visibility_pattern=Declared visibility: ''{0}''
-ConvertAnonymousToNestedRefactoring_default_visibility=(default)
+ConvertAnonymousToNestedRefactoring_default_visibility=(package)
 ConvertAnonymousToNestedRefactoring_original_pattern=Original element: ''{0}''
 
 InlineConstantRefactoring_Inline=Inline Constant
diff --git a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties
index 81aad03dc0..056b5a9bde 100644
--- a/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties
+++ b/org.eclipse.jdt.ui/ui refactoring/org/eclipse/jdt/internal/ui/refactoring/refactoringui.properties
@@ -1,10 +1,14 @@
 ###############################################################################
-# Copyright (c) 2000, 2012 IBM Corporation and others.
+# Copyright (c) 2000, 2013 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
+# This is an implementation of an early-draft specification developed under the Java
+# Community Process (JCP) and is made available for testing and evaluation purposes
+# only. The code is not compatible with any specification of the JCP.
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
@@ -57,7 +61,7 @@ ExtractMethodWizard_extract_method=Extract Method
 
 ExtractMethodInputPage_access_Modifiers=&Access modifier:
 ExtractMethodInputPage_public=public
-ExtractMethodInputPage_default=default
+ExtractMethodInputPage_default=package
 ExtractMethodInputPage_protected=protected
 ExtractMethodInputPage_private=private
 ExtractMethodInputPage_signature_preview=Method signature preview:
@@ -92,7 +96,7 @@ SelfEncapsulateFieldInputPage_first_method=As first method
 SelfEncapsulateFieldInputPage_access_Modifiers=Access modifier:
 SelfEncapsulateFieldInputPage_configure_link=<a>Configure naming conventions...</a>
 SelfEncapsulateFieldInputPage_public=&public
-SelfEncapsulateFieldInputPage_default=defa&ult
+SelfEncapsulateFieldInputPage_default=p&ackage
 SelfEncapsulateFieldInputPage_protected=pro&tected
 SelfEncapsulateFieldInputPage_private=pri&vate
 SelfEncapsulateFieldInputPage_generateJavadocComment=Generate method &comments
@@ -198,7 +202,7 @@ PullUpInputPage_see_log=An unexpected exception occurred. See the error log for
 ##Change Signature
 ChangeSignatureInputPage_change=Change the signature of the selected method and all its overriding methods.
 ChangeSignatureInputPage_access_modifier=A&ccess modifier:
-ChangeSignatureInputPage_default=default
+ChangeSignatureInputPage_default=package
 ChangeSignatureInputPage_return_type=Return &type:
 ChangeSignatureInputPage_method_name=Method &name:
 ChangeSignatureInputPage_parameters=Pa&rameters
@@ -340,7 +344,7 @@ UseSupertypeInputPage_updates_possible_in_files={0} - updates possible in {1} fi
 UseSupertypeWizard_Use_Super_Type_Where_Possible=Use Super Type Where Possible
 
 VisibilityControlUtil_Access_modifier=Access modifier
-VisibilityControlUtil_defa_ult_4=d&efault
+VisibilityControlUtil_defa_ult_4=packag&e
 
 PullUpWizard_defaultPageTitle=Pull Up
 PullUpWizard_select_all_label=Select &All
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties
index 5b96a9f8f5..a1e6223081 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties
@@ -1,10 +1,14 @@
 ###############################################################################
-# Copyright (c) 2000, 2011 IBM Corporation and others.
+# Copyright (c) 2000, 2013 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
+# This is an implementation of an early-draft specification developed under the Java
+# Community Process (JCP) and is made available for testing and evaluation purposes
+# only. The code is not compatible with any specification of the JCP.
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 #     Sebastian Davids <sdavids@gmx.de> - Bug 114276
@@ -127,7 +131,7 @@ SourceActionDialog_enterAt_label=&Insertion point:
 SourceActionDialog_modifier_group=Access modifier
 SourceActionDialog_modifier_public=&public
 SourceActionDialog_modifier_protected=protec&ted
-SourceActionDialog_modifier_default=d&efault
+SourceActionDialog_modifier_default=packag&e
 SourceActionDialog_modifier_private=pri&vate
 SourceActionDialog_modifier_synchronized=s&ynchronized
 SourceActionDialog_modifier_final=&final
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
index a79bde3160..759f016f3e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
@@ -499,7 +499,7 @@ JavadocProblemsPreferencePage_title=Javadoc Comments
 JavadocProblemsConfigurationBlock_allStandardTags=Validate all standard tags
 JavadocProblemsConfigurationBlock_public=Public
 JavadocProblemsConfigurationBlock_protected=Protected
-JavadocProblemsConfigurationBlock_default=Default
+JavadocProblemsConfigurationBlock_default=Package
 JavadocProblemsConfigurationBlock_private=Private
 
 JavadocProblemsConfigurationBlock_error=Error
@@ -638,7 +638,7 @@ MembersOrderPreferencePage_types_label=Types
 MembersOrderPreferencePage_public_label=Public
 MembersOrderPreferencePage_private_label=Private
 MembersOrderPreferencePage_protected_label=Protected
-MembersOrderPreferencePage_default_label=Default
+MembersOrderPreferencePage_default_label=Package
 MembersOrderPreferencePage_usevisibilitysort_label=&Sort members in same category by visibility
 CodeTemplateBlock_templates_comment_node=Comments
 CodeTemplateBlock_templates_code_node=Code
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties
index b7c7ac6e3b..6e9dbe5c12 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/text/correction/CorrectionMessages.properties
@@ -5,6 +5,10 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
+# This is an implementation of an early-draft specification developed under the Java
+# Community Process (JCP) and is made available for testing and evaluation purposes
+# only. The code is not compatible with any specification of the JCP.
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 #     Benjamin Muskalla <b.muskalla@gmx.net> - [quick fix] Quick fix for missing synchronized modifier - https://bugs.eclipse.org/bugs/show_bug.cgi?id=245250
@@ -152,12 +156,12 @@ ModifierCorrectionSubProcessor_removeabstract_description=Remove 'abstract' modi
 ModifierCorrectionSubProcessor_removevolatile_description=Remove 'volatile' modifier
 ModifierCorrectionSubProcessor_removebody_description=Remove method body
 ModifierCorrectionSubProcessor_remove_override=Remove '@Override' annotation
-ModifierCorrectionSubProcessor_default=default
+ModifierCorrectionSubProcessor_default=package
 ModifierCorrectionSubProcessor_addabstract_description=Make type ''{0}'' abstract
 SuppressWarningsSubProcessor_suppress_warnings_label=Add @SuppressWarnings ''{0}'' to ''{1}''
 ModifierCorrectionSubProcessor_removenative_description=Remove 'native' modifier
 ModifierCorrectionSubProcessor_removefinal_description=Remove 'final' modifier
-ModifierCorrectionSubProcessor_default_visibility_label=(default)
+ModifierCorrectionSubProcessor_default_visibility_label=(package)
 ModifierCorrectionSubProcessor_addmissingbody_description=Add body
 ModifierCorrectionSubProcessor_setmethodabstract_description=Add 'abstract' modifier
 GetterSetterCorrectionSubProcessor_additional_info=Starts the 'Encapsulate field' refactoring to create getter and setters
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties
index aaf428525c..0fe567c7ad 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/wizards/NewWizardMessages.properties
@@ -1,10 +1,14 @@
 ###############################################################################
-# Copyright (c) 2000, 2012 IBM Corporation and others.
+# Copyright (c) 2000, 2013 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
+# This is an implementation of an early-draft specification developed under the Java
+# Community Process (JCP) and is made available for testing and evaluation purposes
+# only. The code is not compatible with any specification of the JCP.
+#
 # Contributors:
 #     IBM Corporation - initial API and implementation
 #     Philippe Marschall <philippe.marschall@netcetera.ch> - [type wizards] Allow the creation of a compilation unit called package-info.java - https://bugs.eclipse.org/86168
@@ -112,7 +116,7 @@ NewTypeWizardPage_modifiers_acc_label=Modifiers:
 NewTypeWizardPage_modifiers_public=&public
 NewTypeWizardPage_modifiers_private=pri&vate
 NewTypeWizardPage_modifiers_protected=pro&tected
-NewTypeWizardPage_modifiers_default=defa&ult
+NewTypeWizardPage_modifiers_default=pa&ckage
 NewTypeWizardPage_modifiers_abstract=abs&tract
 NewTypeWizardPage_modifiers_final=fina&l
 NewTypeWizardPage_modifiers_static=stati&c
@@ -163,7 +167,7 @@ NewClassWizardPage_description=Create a new Java class.
 
 NewClassWizardPage_methods_label=Which method stubs would you like to create?
 NewClassWizardPage_methods_main=public static &void main(String[] args)
-NewClassWizardPage_methods_constructors=&Constructors from superclass
+NewClassWizardPage_methods_constructors=Constr&uctors from superclass
 NewClassWizardPage_methods_inherited=In&herited abstract methods