diff options
| author | Markus Keller | 2014-06-13 16:46:39 +0000 |
|---|---|---|
| committer | Markus Keller | 2014-06-13 16:46:39 +0000 |
| commit | ad9f28d7525b62a0337f9c78c48a7c25c677e243 (patch) | |
| tree | 1600495c3816dda58c2c0499c53fd920c404c67c | |
| parent | 5d8489cc77b5b4a988146501b33c35b84a263f76 (diff) | |
| download | eclipse.jdt.ui-ad9f28d7525b62a0337f9c78c48a7c25c677e243.tar.gz eclipse.jdt.ui-ad9f28d7525b62a0337f9c78c48a7c25c677e243.tar.xz eclipse.jdt.ui-ad9f28d7525b62a0337f9c78c48a7c25c677e243.zip | |
Bug 151668: [reorg] Copy action should NOT add 'copy of' prefix
code cleanup
| -rw-r--r-- | org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java index d6e0597d86..423b56b688 100644 --- a/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java +++ b/org.eclipse.jdt.ui/core refactoring/org/eclipse/jdt/internal/corext/refactoring/reorg/ReorgPolicyFactory.java @@ -2561,19 +2561,19 @@ public final class ReorgPolicyFactory { private final Set<String> fAutoGeneratedNewNames= new HashSet<String>(2); private String computeNewName(String str, int resourceType) { - final int lastIndexOfDot= str.lastIndexOf('.'); + int lastIndexOfDot= str.lastIndexOf('.'); String fileExtension= ""; //$NON-NLS-1$ String fileNameNoExtension= str; if (resourceType == IResource.FILE && lastIndexOfDot > 0) { fileExtension= str.substring(lastIndexOfDot); fileNameNoExtension= str.substring(0, lastIndexOfDot); } - final Pattern p= Pattern.compile("[0-9]+$"); //$NON-NLS-1$ - final Matcher m= p.matcher(fileNameNoExtension); + Pattern p= Pattern.compile("[0-9]+$"); //$NON-NLS-1$ + Matcher m= p.matcher(fileNameNoExtension); if (m.find()) { // String ends with a number: increment it by 1 - final Integer newNumber= new Integer(Integer.parseInt(m.group()) + 1); - final String numberStr= m.replaceFirst(newNumber.toString()); + int newNumber= Integer.parseInt(m.group()) + 1; + String numberStr= m.replaceFirst(Integer.toString(newNumber)); return numberStr + fileExtension; } else { return fileNameNoExtension + "2" + fileExtension; //$NON-NLS-1$ |
