Author: dazarov Date: 2009-04-24 12:54:41 -0400 (Fri, 24 Apr 2009) New Revision: 14914 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-1077 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-24 16:33:21 UTC (rev 14913) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/RenameComponentProcessor.java 2009-04-24 16:54:41 UTC (rev 14914) @@ -98,6 +98,7 @@ private static final String PROPERTIES_EXT = "properties"; private static final String COMPONENTS_FILE = "components.xml"; + private static final String SEAM_PROPERTIES_FILE = "seam.properties"; private static final String COMPONENT_NODE = "component"; private static final String FACTORY_NODE = "factory"; private static final String NAME_ATTRIBUTE = "name"; @@ -565,15 +566,19 @@ private void scanProperties(IFile file, String content){ scanString(file, content, 0); - StringTokenizer tokenizer = new StringTokenizer(content, ".#= \t\r\n\f", true); + if(!file.getName().equals(SEAM_PROPERTIES_FILE)) + return; + + StringTokenizer tokenizer = new StringTokenizer(content, "#= \t\r\n\f", true); + String lastToken = "\n"; int offset = 0; boolean comment = false; boolean key = true; while(tokenizer.hasMoreTokens()){ - String token = tokenizer.nextToken(".#= \t\r\n\f"); //$NON-NLS-1$ + String token = tokenizer.nextToken("#= \t\r\n\f"); //$NON-NLS-1$ if(token.equals("\r")) token = "\n"; @@ -588,9 +593,10 @@ else if(key && (token.equals("=") || token.equals(" "))) key = false; - if(key && token.equals(component.getName())){ + if(key && token.startsWith(component.getName())){ + String changeText = token.replaceFirst(component.getName(), newName); TextFileChange change = getChange(file); - TextEdit edit = new ReplaceEdit(offset, token.length(), newName); + TextEdit edit = new ReplaceEdit(offset, token.length(), changeText); change.addEdit(edit); } }