|
From: <mir...@us...> - 2007-03-05 11:54:03
|
Revision: 2084
http://svn.sourceforge.net/rubyeclipse/?rev=2084&view=rev
Author: mirkostocker
Date: 2007-03-05 03:53:49 -0800 (Mon, 05 Mar 2007)
Log Message:
-----------
externalized all refactoring strings
Modified Paths:
--------------
trunk/org.rubypeople.rdt.refactoring/plugin.xml
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/JRubyRefactoringUtils.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/RefactoringPlugin.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringAction.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringActionGroup.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/classnodeprovider/IncludedClassesProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/FieldProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/FormatWithParenthesis.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/IRefactoringConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeFactory.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/RefactoringConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/SelectionNodeProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/TextSelectionProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/Conversion.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/ConvertTempToFieldRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/TempToFieldConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/EncapsulateFieldConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/EncapsulateFieldRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/FieldEncapsulator.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractMethodConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractMethodRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/ExtractedMethodHelper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/formatsource/EditableFormatHelper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/formatsource/FormatSourceConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/formatsource/FormatSourceRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/formatsource/PreviewGeneratorImpl.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/generateaccessors/AccessorsGenerator.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/generateaccessors/GenerateAccessorsRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/generateconstructor/GenerateConstructorRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/ClassInliner.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/InlineClassConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/InlineClassConfig.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/InlineClassRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/InsertClassBuilder.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/InlineMethodConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/InlineMethodEditProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/InlineMethodRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/MethodBodyStatementReplacer.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/ParameterReplacer.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/RenameDuplicatedVariables.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/ReturnStatementReplacer.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/TargetClassFinder.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinetemp/InlineTempConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinetemp/InlineTempConfig.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinetemp/InlineTempRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinetemp/TempInliner.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergeclasspartsinfile/InFileClassPartsMerger.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergeclasspartsinfile/MergeClassPartsInFileConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergeclasspartsinfile/MergeClassPartsInFileRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergewithexternalclassparts/MergeWithExternalClassPartsConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergewithexternalclassparts/MergeWithExternalClassPartsRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movefield/GenerateAccessorsAtTarget.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movefield/MoveFieldConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movefield/MoveFieldRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movemethod/InsertMethodEditProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movemethod/MethodMover.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movemethod/MoveMethodConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movemethod/MoveMethodRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/overridemethod/MethodsOverrider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/overridemethod/OverrideMethodRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/pushdown/MethodDownPusher.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/pushdown/PushDownRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/rename/RenameConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/rename/RenameRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renameclass/ClassInstanciationFinder.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renameclass/ConstructorCall.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renameclass/RenameClassConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renameclass/RenameClassRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/FieldProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/FieldRenamer.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/RenameFieldConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/RenameFieldRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/fielditems/ClassVarAsgnFieldItem.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/fielditems/ClassVarFieldItem.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/fielditems/FieldCallItem.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/fielditems/FieldItem.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/fielditems/InstAsgnFieldItem.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/fielditems/InstVarFieldItem.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/LocalVariableRenamer.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/LocalVariablesEditProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/RenameLocalConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/RenameLocalConfig.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/RenameLocalVariableRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/VariableNameProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamemethod/RenameMethodConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamemethod/RenameMethodRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/splittemp/LocalVarUsage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/splittemp/SplitTempConditionChecker.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/splittemp/SplitTempRefactoring.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/DocumentWithIncluding.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/documentprovider/WorkspaceDocumentProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/editprovider/DeleteEditProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/editprovider/EditAndTreeContentProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/editprovider/EditProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/editprovider/MultiEditProvider.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/ArgsNodeWrapper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/AttrAccessorNodeWrapper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/FieldNodeWrapper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/PartialClassNodeWrapper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/SClassNodeWrapper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/VisibilityNodeWrapper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/preview/RubyTextEditChangePreviewViewer.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/signatureprovider/MethodSignature.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/ConstructorGenerationTree.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/LabeledTextField.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/NewNameListener.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/NotifiedContainerCheckedTree.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/RdtCodeViewer.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/AccessorSelectionPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/ConstructorSelectionPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/ConvertTempToFieldPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/EncapsulateFieldPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/ExtractMethodPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/FormatSourcePage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/InlineClassPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/InlineMethodPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/InlineTempPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/MergeClassPartsInFilePage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/MergeWithExternalClassPartsPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/MethodDownPusherSelectionPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/MoveFieldPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/OccurenceReplaceSelectionPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/OverrideMethodSelectionPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/RenameFieldPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/RenamePage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/SplitTempPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/encapsulatefield/EncapsulateFieldAccessorComposite.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/extractmethod/ExtractMethodComposite.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/extractmethod/MethodNameListener.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/extractmethod/ParametersTableCellEditorListener.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/extractmethod/SignatureObserver.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/inlinemethod/TargetClassFinderUI.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/movemethod/FirstMoveMethodPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/movemethod/FirstMoveMethodPageComposite.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/movemethod/SecondMoveMethodPage.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/movemethod/SecondMoveMethodPageComposite.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/Constants.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/FileHelper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/HsrFormatter.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/NameHelper.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/NameValidator.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/util/NodeUtil.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/extractmethod/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/formatsource/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/formatsource/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/generateaccessors/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/generateaccessors/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/generateconstructor/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/generateconstructor/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlineclass/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinemethod/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinetemp/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/inlinetemp/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergeclasspartsinfile/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergeclasspartsinfile/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergewithexternalclassparts/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/mergewithexternalclassparts/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movefield/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movefield/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movemethod/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/movemethod/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/overridemethod/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/overridemethod/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/pushdown/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/pushdown/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/rename/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/rename/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renameclass/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renameclass/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamefield/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamelocalvariable/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamemethod/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/renamemethod/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/splittemp/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/splittemp/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/editprovider/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/editprovider/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/nodewrapper/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/preview/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/preview/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/encapsulatefield/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/encapsulatefield/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/extractmethod/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/extractmethod/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/inlinemethod/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/inlinemethod/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/messages.properties
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/movemethod/Messages.java
trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/ui/pages/movemethod/messages.properties
Modified: trunk/org.rubypeople.rdt.refactoring/plugin.xml
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/plugin.xml 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/plugin.xml 2007-03-05 11:53:49 UTC (rev 2084)
@@ -70,43 +70,8 @@
id="org.rubypeople.rdt.refactoring.renameAction"
label="%rubyRefactoring.RenameLabel"
menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
tooltip="Renames the selected element..."/>
-<!-- old renames
<action
- class="org.rubypeople.rdt.refactoring.action.RenameMethodAction"
- definitionId="org.rubypeople.rdt.refactoring.command.RenameMethod"
- id="org.rubypeople.rdt.refactoring.renameMethodAction"
- label="%rubyRefactoring.RenameMethodLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Renames a method."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameLocalVariableAction"
- definitionId="org.rubypeople.rdt.refactoring.command.RenameLocalVariable"
- id="org.rubypeople.rdt.refactoring.renameLocalVariableAction"
- label="%rubyRefactoring.RenameLocalVariableLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Renames a local variable"/>
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameFieldAction"
- definitionId="org.rubypeople.rdt.refactoring.command.RenameField"
- id="org.rubypeople.rdt.refactoring.renameFieldAction"
- label="%rubyRefactoring.RenameFieldLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Renames a field."/>
- <action
- class="org.rubypeople.rdt.refactoring.action.RenameClassAction"
- definitionId="org.rubypeople.rdt.refactoring.command.RenameClass"
- id="org.rubypeople.rdt.refactoring.renameClassAction"
- label="%rubyRefactoring.RenameClassLabel"
- menubarPath="org.rubypeople.rdt.refactoring.refactoringMenu/org.rubypeople.rdt.refactoring.refactoringGroup"
- style="push"
- tooltip="Renames a class."/>
--->
- <action
class="org.rubypeople.rdt.refactoring.action.PushDownAction"
definitionId="org.rubypeople.rdt.refactoring.command.PushDown"
id="org.rubypeople.rdt.refactoring.pushDownAction"
@@ -224,26 +189,8 @@
categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
id="org.rubypeople.rdt.refactoring.command.Rename"
name="%rubyRefactoring.RenameLabel"/>
-<!-- old renames
<command
categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.RenameLocalVariable"
- name="%rubyRefactoring.RenameLocalVariableLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.RenameField"
- name="%rubyRefactoring.RenameFieldLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.RenameClass"
- name="%rubyRefactoring.RenameClassLabel"/>
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
- id="org.rubypeople.rdt.refactoring.command.RenameMethod"
- name="%rubyRefactoring.RenameMethodLabel"/>
--->
- <command
- categoryId="org.rubypeople.rdt.refactoring.commands.refactoring"
id="org.rubypeople.rdt.refactoring.command.SplitTemp"
name="%rubyRefactoring.SplitTempLabel"/>
<command
@@ -329,28 +276,6 @@
contextId="org.rubypeople.rdt.ui.rubyEditorScope"
schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
sequence="M2+M3+R"/>
-<!-- Old Renames
- <key
- commandId="org.rubypeople.rdt.refactoring.command.RenameClass"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+R C"/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.RenameField"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+R F"/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.RenameLocalVariable"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+R L"/>
- <key
- commandId="org.rubypeople.rdt.refactoring.command.RenameMethod"
- contextId="org.rubypeople.rdt.ui.rubyEditorScope"
- schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
- sequence="M2+M3+R M"/>
--->
</extension>
<extension
point="org.eclipse.ui.popupMenus">
@@ -373,6 +298,21 @@
id="org.rubypeople.rdt.refactoring.action.SplitTempAction"
label="%rubyRefactoring.SplitTempLabel"
menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
+ </objectContribution>
+
+ <objectContribution
+ id="org.rubypeople.rdt.refactoring.refactoringContext"
+ objectClass="org.rubypeople.rdt.internal.core.RubyType">
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
</objectContribution>
<objectContribution
@@ -388,6 +328,11 @@
id="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
label="%rubyRefactoring.MoveFieldLabel"
menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
</objectContribution>
<objectContribution
@@ -403,6 +348,11 @@
id="org.rubypeople.rdt.refactoring.action.MoveFieldAction"
label="%rubyRefactoring.MoveFieldLabel"
menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
</objectContribution>
<objectContribution
@@ -413,6 +363,11 @@
id="org.rubypeople.rdt.refactoring.action.MoveMethodAction"
label="%rubyRefactoring.MoveMethodLabel"
menubarPath="additions" />
+ <action
+ class="org.rubypeople.rdt.refactoring.action.RenameAction"
+ id="org.rubypeople.rdt.refactoring.action.RenameAction"
+ label="%rubyRefactoring.RenameLabel"
+ menubarPath="additions" />
</objectContribution>
</extension>
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/JRubyRefactoringUtils.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/JRubyRefactoringUtils.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/JRubyRefactoringUtils.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -72,8 +72,8 @@
String name = ((CallNode) node).getName();
- String[] operators = new String[] { "**", "!", "+", "-", "*", "/", "%", ">>", "<<", "&", "^", "|", "+@", "-@", "<=>", ">", "<", ">=", "<=", "==",
- "===", "~", "&&" };
+ String[] operators = new String[] { "**", "!", "+", "-", "*", "/", "%", ">>", "<<", "&", "^", "|", "+@", "-@", "<=>", ">", "<", ">=", "<=", "==", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$ //$NON-NLS-15$ //$NON-NLS-16$ //$NON-NLS-17$ //$NON-NLS-18$ //$NON-NLS-19$ //$NON-NLS-20$
+ "===", "~", "&&" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
for (String currentOp : operators) {
if (name.equals(currentOp)) {
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/RefactoringPlugin.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/RefactoringPlugin.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/RefactoringPlugin.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -80,7 +80,7 @@
* @return the image descriptor
*/
public static ImageDescriptor getImageDescriptor(String path) {
- return AbstractUIPlugin.imageDescriptorFromPlugin("org.rubypeople.rdt.refactoring", path);
+ return AbstractUIPlugin.imageDescriptorFromPlugin("org.rubypeople.rdt.refactoring", path); //$NON-NLS-1$
}
public static Ruby getRuby() {
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/Messages.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/Messages.java (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/Messages.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -0,0 +1,18 @@
+package org.rubypeople.rdt.refactoring.action;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.rubypeople.rdt.refactoring.action.messages"; //$NON-NLS-1$
+
+ public static String RefactoringActionGroup;
+
+ public static String SourceActionGroup;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringAction.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringAction.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringAction.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -45,7 +45,7 @@
private TextSelectionProvider selectionProvider;
public RefactoringAction(Class<? extends RubyRefactoring> refactoringClass, String refactoringName, TextSelectionProvider selectionProvider) {
- setText(refactoringName + "...");
+ setText(refactoringName + "..."); //$NON-NLS-1$
this.refactoringClass = refactoringClass;
this.selectionProvider = selectionProvider;
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringActionGroup.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringActionGroup.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/RefactoringActionGroup.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -52,7 +52,7 @@
public class RefactoringActionGroup extends ActionGroup {
- private static final String INSERT_AFTER_GROUP_NAME = "group.edit";
+ private static final String INSERT_AFTER_GROUP_NAME = "group.edit"; //$NON-NLS-1$
public void fillContextMenu(IMenuManager menu) {
TextSelectionProvider selectionProvider = new TextSelectionProvider(null);
@@ -63,7 +63,7 @@
}
private IMenuManager getRefactorMenu(TextSelectionProvider selectionProvider) {
- IMenuManager submenu = new MenuManager("Refactor");
+ IMenuManager submenu = new MenuManager(Messages.SourceActionGroup);
submenu.add(new RefactoringAction(ConvertTempToFieldRefactoring.class, ConvertTempToFieldRefactoring.NAME, selectionProvider));
submenu.add(new RefactoringAction(EncapsulateFieldRefactoring.class, EncapsulateFieldRefactoring.NAME, selectionProvider));
submenu.add(new RefactoringAction(ExtractMethodRefactoring.class, ExtractMethodRefactoring.NAME, selectionProvider));
@@ -81,7 +81,7 @@
}
private IMenuManager getSourceMenu(TextSelectionProvider selectionProvider) {
- IMenuManager submenu = new MenuManager("Source");
+ IMenuManager submenu = new MenuManager(Messages.RefactoringActionGroup);
submenu.add(new RefactoringAction(GenerateAccessorsRefactoring.class, GenerateAccessorsRefactoring.NAME, selectionProvider));
submenu.add(new RefactoringAction(GenerateConstructorRefactoring.class, GenerateConstructorRefactoring.NAME, selectionProvider));
submenu.add(new RefactoringAction(OverrideMethodRefactoring.class, OverrideMethodRefactoring.NAME, selectionProvider));
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/messages.properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/messages.properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/action/messages.properties 2007-03-05 11:53:49 UTC (rev 2084)
@@ -0,0 +1,2 @@
+RefactoringActionGroup=Refactor
+SourceActionGroup=Source
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/classnodeprovider/IncludedClassesProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/classnodeprovider/IncludedClassesProvider.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/classnodeprovider/IncludedClassesProvider.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -86,9 +86,9 @@
private void appendPath(String pathName) {
IPath path = new Path(pathName);
if (path.getFileExtension() == null)
- path = path.addFileExtension("rb");
- if (!path.getFileExtension().equalsIgnoreCase("rb"))
- path = path.addFileExtension("rb");
+ path = path.addFileExtension("rb"); //$NON-NLS-1$
+ if (!path.getFileExtension().equalsIgnoreCase("rb")) //$NON-NLS-1$
+ path = path.addFileExtension("rb"); //$NON-NLS-1$
includeFilePaths.add(path);
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/FieldProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/FieldProvider.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/FieldProvider.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -96,9 +96,6 @@
else if (currentAttr instanceof InstAsgnNode){
addInstAsgn((InstAsgnNode)currentAttr);
}
- else{
- System.out.println("An unexpected node of type " + currentAttr.getClass() + " retrieved as an Attribute: " + currentAttr.toString());
- }
}
}
@@ -115,7 +112,7 @@
public static String fieldName(String name) {
- return name.replaceAll("@|:", "");
+ return name.replaceAll("@|:", ""); //$NON-NLS-1$ //$NON-NLS-2$
}
private void addInstVar(InstVarNode currentAttr) {
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/FormatWithParenthesis.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/FormatWithParenthesis.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/FormatWithParenthesis.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -7,10 +7,10 @@
public class FormatWithParenthesis extends DefaultFormatHelper {
public String beforeCallArguments() {
- return "(";
+ return "("; //$NON-NLS-1$
}
public String afterCallArguments() {
- return ")";
+ return ")"; //$NON-NLS-1$
}
}
\ No newline at end of file
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/IRefactoringConditionChecker.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/IRefactoringConditionChecker.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/IRefactoringConditionChecker.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -35,9 +35,9 @@
public interface IRefactoringConditionChecker {
- public static final String ERRORS = "errors";
+ public static final String ERRORS = "errors"; //$NON-NLS-1$
- public static final String WARNING = "warnings";
+ public static final String WARNING = "warnings"; //$NON-NLS-1$
public Map<String, Collection<String>> getInitialMessages();
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/Messages.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/Messages.java (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/Messages.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -0,0 +1,20 @@
+package org.rubypeople.rdt.refactoring.core;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.rubypeople.rdt.refactoring.core.messages"; //$NON-NLS-1$
+
+ public static String RefactoringConditionChecker_EmptyDocument;
+
+ public static String RefactoringConditionChecker_SyntaxErrorInCurrent;
+
+ public static String RefactoringConditionChecker_SyntaxErrorInProject;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeFactory.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeFactory.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeFactory.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -89,7 +89,7 @@
}
public static DefsNode createStaticMethodNode(String methodName, Collection<String> args, StaticScope scopeNode, Node body) {
- return createStaticMethodNode("self", methodName, createArgsNode(args.toArray(new String[args.size()])), scopeNode == null ? new LocalStaticScope(null) : scopeNode, body);
+ return createStaticMethodNode("self", methodName, createArgsNode(args.toArray(new String[args.size()])), scopeNode == null ? new LocalStaticScope(null) : scopeNode, body); //$NON-NLS-1$
}
public static DefnNode createMethodNode(String methodName, String[] args, Node scopeContentNode) {
@@ -300,7 +300,7 @@
}
public static Node createGetterSetter(String attrName, boolean isWriterMethod, VisibilityNodeWrapper.METHOD_VISIBILITY visibility) {
- String methodName = attrName + ((isWriterMethod) ? "=" : "");
+ String methodName = attrName + ((isWriterMethod) ? "=" : ""); //$NON-NLS-1$ //$NON-NLS-2$
String[] args = (isWriterMethod) ? new String[] { attrName } : new String[] {};
DefnNode methodNode = createGetterSetterNode(isWriterMethod, methodName, attrName, args);
BlockNode block = createBlockNode();
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeProvider.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/NodeProvider.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -137,7 +137,7 @@
Collection<Node> fCallNodes = getSubNodes(parent, FCallNode.class);
for (Node node : fCallNodes) {
FCallNode fCallNode = (FCallNode) node;
- if (fCallNode.getName().equals("attr")) {
+ if (fCallNode.getName().equals("attr")) { //$NON-NLS-1$
result.addAll(getSubNodes(fCallNode.getArgsNode(), SymbolNode.class));
}
}
@@ -324,7 +324,7 @@
}
private static boolean isLoadOrRequireNode(FCallNode fCallNode) {
- return fCallNode.getName().equalsIgnoreCase("load") || fCallNode.getName().equalsIgnoreCase("require");
+ return fCallNode.getName().equalsIgnoreCase("load") || fCallNode.getName().equalsIgnoreCase("require"); //$NON-NLS-1$ //$NON-NLS-2$
}
public static Collection<LocalAsgnNode> gatherLocalAsgnNodes(Node baseNode) {
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/RefactoringConditionChecker.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/RefactoringConditionChecker.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/RefactoringConditionChecker.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -78,7 +78,7 @@
}
}
if (syntaxError) {
- addWarning("There is a syntax error somewhere in the project, the refactoring might not work on these files.");
+ addWarning(Messages.RefactoringConditionChecker_SyntaxErrorInProject);
}
}
@@ -105,8 +105,8 @@
String fileName = null;
try {
fileName = docProvider.getActiveFileName();
- if(docProvider.getActiveFileContent().equals("")) {
- addError("Nothing to do in empty document.");
+ if(docProvider.getActiveFileContent().equals("")) { //$NON-NLS-1$
+ addError(Messages.RefactoringConditionChecker_EmptyDocument);
}
for(String aktFileName : docProvider.getFileNames()) {
fileName = aktFileName;
@@ -115,12 +115,12 @@
} catch(SyntaxException se) {
String activeFileName = docProvider.getActiveFileName();
if(fileName == null || fileName.equals(activeFileName)) {
- addError("There is a syntax error in the current file, refactoring is not possible.");
+ addError(Messages.RefactoringConditionChecker_SyntaxErrorInCurrent);
}
}
if(NodeProvider.hasSyntaxErrors(docProvider.getActiveFileName(), docProvider.getActiveFileContent())) {
- addError("There is a syntax error in the current file, refactoring is not possible.");
+ addError(Messages.RefactoringConditionChecker_SyntaxErrorInCurrent);
}
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/SelectionNodeProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/SelectionNodeProvider.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/SelectionNodeProvider.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -236,8 +236,8 @@
Vector<String> names = new Vector<String>();
names.setSize(nodes.size() + 2);
- names.set(0, "_");
- names.set(1, "~");
+ names.set(0, "_"); //$NON-NLS-1$
+ names.set(1, "~"); //$NON-NLS-1$
for (LocalAsgnNode n : nodes) {
if(n.getIndex() >= names.size()) {
names.setSize(n.getIndex() + 1);
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/TextSelectionProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/TextSelectionProvider.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/TextSelectionProvider.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -45,7 +45,7 @@
private int caret;
- @SuppressWarnings("restriction")
+ @SuppressWarnings("restriction") //$NON-NLS-1$
public TextSelectionProvider(IAction action) {
if (action == null || action instanceof org.eclipse.ui.internal.EditorPluginAction) {
@@ -66,7 +66,7 @@
caret = editor.getCaretPosition().getOffset();
}
- @SuppressWarnings("restriction")
+ @SuppressWarnings("restriction") //$NON-NLS-1$
private void initOutline(IAction action) {
TreeSelection selection = (TreeSelection) ((org.eclipse.ui.internal.PluginAction)action).getSelection();
Member member = (Member) selection.toArray()[0];
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/Conversion.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/Conversion.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/Conversion.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -44,7 +44,7 @@
public Conversion(LocalNodeWrapper localNode, String newName, boolean isClassField) {
super(false);
this.localNode = localNode;
- newName = ((isClassField) ? "@@" : "@") + newName;
+ newName = ((isClassField) ? "@@" : "@") + newName; //$NON-NLS-1$ //$NON-NLS-2$
Collection<LocalNodeWrapper> allLocalNodes = new ArrayList<LocalNodeWrapper>();
allLocalNodes.add(localNode);
allLocalNodes.addAll(LocalNodeWrapper.gatherLocalNodes(localNode.getWrappedNode()));
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/ConvertTempToFieldRefactoring.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/ConvertTempToFieldRefactoring.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/ConvertTempToFieldRefactoring.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -35,7 +35,7 @@
public class ConvertTempToFieldRefactoring extends RubyRefactoring {
- public static final String NAME = "Convert Local Variable to Field";
+ public static final String NAME = Messages.ConvertTempToFieldRefactoring_Name;
public ConvertTempToFieldRefactoring(TextSelectionProvider selectionProvider) {
super(NAME);
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/Messages.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/Messages.java (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/Messages.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -0,0 +1,30 @@
+package org.rubypeople.rdt.refactoring.core.converttemptofield;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.rubypeople.rdt.refactoring.core.converttemptofield.messages"; //$NON-NLS-1$
+
+ public static String ConvertTempToFieldRefactoring_Name;
+
+ public static String TempToFieldConditionChecker_AlreadyExists;
+
+ public static String TempToFieldConditionChecker_CannotConvertBlockParameters;
+
+ public static String TempToFieldConditionChecker_CannotConvertMethodParameters;
+
+ public static String TempToFieldConditionChecker_CannotConvertNonlocalVars;
+
+ public static String TempToFieldConditionChecker_FieldWithName;
+
+ public static String TempToFieldConditionChecker_NoEnclosingClassToInsert;
+
+ public static String TempToFieldConditionChecker_NoLocalVarAtpos;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/TempToFieldConditionChecker.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/TempToFieldConditionChecker.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/TempToFieldConditionChecker.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -83,7 +83,7 @@
@Override
public void checkFinalConditions() {
- String fieldTypeName = (config.isClassField()) ? "Class" : "Instance";
+ String fieldTypeName = (config.isClassField()) ? "Class" : "Instance"; //$NON-NLS-1$ //$NON-NLS-2$
for(FieldNodeWrapper aktField : config.getEnclosingClassNode().getFields()) {
if(checkFieldName(config.getNewName(), aktField.getNameWithoutAts(), fieldTypeName)) {
return;
@@ -93,7 +93,7 @@
private boolean checkFieldName(String newName, String aktNodeName, String fieldTypeName) {
if (newName.equals(aktNodeName)) {
- addError(fieldTypeName + " field with name '" + newName + "' already exists.");
+ addError(fieldTypeName + Messages.TempToFieldConditionChecker_FieldWithName + newName + Messages.TempToFieldConditionChecker_AlreadyExists);
return true;
}
return false;
@@ -103,15 +103,15 @@
public void checkInitialConditions() {
if (config.getSelectedNode() == null) {
- addError("There is no local variable at the current caret position.");
+ addError(Messages.TempToFieldConditionChecker_NoLocalVarAtpos);
} else if (config.getEnclosingClassNode() == null) {
- addError("There is no enclosing class to insert fields.");
+ addError(Messages.TempToFieldConditionChecker_NoEnclosingClassToInsert);
} else if (config.getEnclosingMethod() == null) {
- addError("Can only convert local variables in methods to fields.");
+ addError(Messages.TempToFieldConditionChecker_CannotConvertNonlocalVars);
} else if (JRubyRefactoringUtils.isParameter(LocalNodeWrapper.getLocalNodeName(config.getSelectedNode()), config.getEnclosingMethod())) {
- addError("Cannot convert method parameters to fields.");
+ addError(Messages.TempToFieldConditionChecker_CannotConvertMethodParameters);
} else if (isIterParameter()) {
- addError("Cannot convert block parameters to fields.");
+ addError(Messages.TempToFieldConditionChecker_CannotConvertBlockParameters);
}
}
Added: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/messages.properties
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/messages.properties (rev 0)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/converttemptofield/messages.properties 2007-03-05 11:53:49 UTC (rev 2084)
@@ -0,0 +1,8 @@
+ConvertTempToFieldRefactoring_Name=Convert Local Variable to Field
+TempToFieldConditionChecker_FieldWithName=\ field with name '
+TempToFieldConditionChecker_AlreadyExists=' already exists.
+TempToFieldConditionChecker_NoLocalVarAtpos=There is no local variable at the current caret position.
+TempToFieldConditionChecker_NoEnclosingClassToInsert=There is no enclosing class to insert fields.
+TempToFieldConditionChecker_CannotConvertNonlocalVars=Can only convert local variables in methods to fields.
+TempToFieldConditionChecker_CannotConvertMethodParameters=Cannot convert method parameters to fields.
+TempToFieldConditionChecker_CannotConvertBlockParameters=Cannot convert block parameters to fields.
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/EncapsulateFieldConditionChecker.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/EncapsulateFieldConditionChecker.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/EncapsulateFieldConditionChecker.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -76,27 +76,27 @@
public void checkFinalConditions() {
if (config.isWriterGenerationDisabled() && config.isReaderGenerationDisabled()) {
- addError("Nothing to refactor.");
+ addError(Messages.EncapsulateFieldConditionChecker_NothingToRefactor);
}
String readerMethodName = config.getReaderMethodName();
String writerMethodName = config.getWriterMethodName();
for (MethodNodeWrapper aktMethodNode : config.getEnclosingClassNode().getMethods()) {
if (aktMethodNode.getName().equals(readerMethodName) && !config.isReaderGenerationDisabled()) {
- addWarning("A method with the name \"" + aktMethodNode.getName() + "\" allready exists.");
+ addWarning(Messages.EncapsulateFieldConditionChecker_MethodWithName + aktMethodNode.getName() + Messages.EncapsulateFieldConditionChecker_AlreadyExists);
}
if (aktMethodNode.getName().equals(writerMethodName) && !config.isWriterGenerationDisabled()) {
- addWarning("A method with the name \"" + aktMethodNode.getName() + "\" allready exists.");
+ addWarning(Messages.EncapsulateFieldConditionChecker_MethodWithName + aktMethodNode.getName() + Messages.EncapsulateFieldConditionChecker_AlreadyExists);
}
}
}
public void checkInitialConditions() {
if (!config.hasSelectedAccessor() && !config.hasSelectedInstNode()) {
- addError("No instance variable selected for encapsulation.");
+ addError(Messages.EncapsulateFieldConditionChecker_NoInstanceVariableSelected);
} else if (config.getEnclosingClassNode() == null) {
- addError("Curent selection is not inside of a class.");
+ addError(Messages.EncapsulateFieldConditionChecker_NotInsideAClass);
} else if (selectedNodeIsInstVarNodeAndNotInMethod()) {
- addError("Selected field must be inside a method.");
+ addError(Messages.EncapsulateFieldConditionChecker_NotInsideAMethod);
}
}
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/EncapsulateFieldRefactoring.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/EncapsulateFieldRefactoring.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/EncapsulateFieldRefactoring.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -36,7 +36,7 @@
public class EncapsulateFieldRefactoring extends RubyRefactoring {
- public static final String NAME = "Encapsulate Field";
+ public static final String NAME = Messages.EncapsulateFieldRefactoring_Name;
public EncapsulateFieldRefactoring(TextSelectionProvider selectionProvider) {
super(NAME);
Modified: trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/FieldEncapsulator.java
===================================================================
--- trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/FieldEncapsulator.java 2007-03-05 09:29:26 UTC (rev 2083)
+++ trunk/org.rubypeople.rdt.refactoring/src/org/rubypeople/rdt/refactoring/core/encapsulatefield/FieldEncapsulator.java 2007-03-05 11:53:49 UTC (rev 2084)
@@ -114,7 +114,7 @@
...
[truncated message content] |