[jbosstools-commits] JBoss Tools SVN: r23632 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring and 1 other directory.

Author: dazarov Date: 2010-07-21 06:14:01 -0400 (Wed, 21 Jul 2010) New Revision: 23632 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ElCoreMessages.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RenameMessagePropertyProcessor.java Log: https://jira.jboss.org/browse/JBIDE-4858 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ElCoreMessages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ElCoreMessages.java 2010-07-21 10:05:28 UTC (rev 23631) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ElCoreMessages.java 2010-07-21 10:14:01 UTC (rev 23632) @@ -29,6 +29,7 @@ public static String RENAME_EL_VARIABLE_PROCESSOR_TITLE; public static String RENAME_MESSAGE_PROPERTY_PROCESSOR_TITLE; public static String RENAME_EL_VARIABLE_PROCESSOR_CAN_NOT_FIND_EL_VARIABLE; + public static String RENAME_MESSAGE_PROPERTY_PROCESSOR_CAN_NOT_FIND_MESSAGE_PROPERTY; static { // initialize resource bundle Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties 2010-07-21 10:05:28 UTC (rev 23631) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/messages.properties 2010-07-21 10:14:01 UTC (rev 23632) @@ -22,4 +22,5 @@ RENAME_EL_VARIABLE_PROCESSOR_TITLE=Rename EL Variable RENAME_MESSAGE_PROPERTY_PROCESSOR_TITLE=Rename Resource Bundle Message RENAME_EL_VARIABLE_PROCESSOR_CAN_NOT_FIND_EL_VARIABLE=Can not find EL Variable: ''{0}''. +RENAME_MESSAGE_PROPERTY_PROCESSOR_CAN_NOT_FIND_MESSAGE_PROPERTY=Can not find message: ''{0}''. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RenameMessagePropertyProcessor.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RenameMessagePropertyProcessor.java 2010-07-21 10:05:28 UTC (rev 23631) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/el/refactoring/RenameMessagePropertyProcessor.java 2010-07-21 10:14:01 UTC (rev 23632) @@ -26,6 +26,7 @@ import org.eclipse.text.edits.ReplaceEdit; import org.eclipse.text.edits.TextEdit; import org.jboss.tools.common.el.core.ELReference; +import org.eclipse.ltk.internal.core.refactoring.Messages; import org.jboss.tools.common.el.core.ElCoreMessages; import org.jboss.tools.common.el.core.model.ELExpression; import org.jboss.tools.common.el.core.resolver.ELCompletionEngine; @@ -87,11 +88,22 @@ throws CoreException, OperationCanceledException { RefactoringStatus result = new RefactoringStatus(); - //if(findManagedBean(file, getOldName()) == null) - //result.addFatalError(Messages.format(ElCoreMessages.RENAME_EL_VARIABLE_PROCESSOR_CAN_NOT_FIND_EL_VARIABLE, getOldName())); + if(!validateSegment()) + result.addFatalError(Messages.format(ElCoreMessages.RENAME_MESSAGE_PROPERTY_PROCESSOR_CAN_NOT_FIND_MESSAGE_PROPERTY, getOldName())); return result; } + private boolean validateSegment(){ + if(segment.getMessageBundleResource() == null) + return false; + if(segment.getToken() == null) + return false; + if(segment.getBaseName() == null || segment.getBaseName().isEmpty()) + return false; + + return true; + } + /* * (non-Javadoc) * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#createChange(org.eclipse.core.runtime.IProgressMonitor)