rpm: improve code using jdt cleanups (round 2)
Change-Id: I84f6d0fdc2e067371ae6147a0a79f99fd0afc1d6
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/c/linuxtools/org.eclipse.linuxtools/+/183291
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
diff --git a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/parser/RpmlintItem.java b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/parser/RpmlintItem.java
index fcc922d..2b997ac 100644
--- a/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/parser/RpmlintItem.java
+++ b/rpm/org.eclipse.linuxtools.rpm.rpmlint/src/org/eclipse/linuxtools/internal/rpm/rpmlint/parser/RpmlintItem.java
@@ -148,7 +148,7 @@
* @param severity The severity of the rpmlint item.
*/
public void setSeverity(String severity) {
- severity = severity.replaceAll(":", "").trim(); //$NON-NLS-1$ //$NON-NLS-2$
+ severity = severity.replace(":", "").trim(); //$NON-NLS-1$ //$NON-NLS-2$
switch (severity.charAt(0)) {
case 'I':
this.severity = 0;
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
index 24275e2..76c9bed 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/RpmMacroProposalsList.java
@@ -99,7 +99,7 @@
isKeyLine = false;
key = item[0];
if (item.length > 1) {
- value += item[1].replaceAll("\\\\", "\n\n"); //$NON-NLS-1$//$NON-NLS-2$
+ value += item[1].replace("\\", "\n\n"); //$NON-NLS-1$//$NON-NLS-2$
}
} else {
value += line.substring(0, line.length() - 1).trim() + "\n\t"; //$NON-NLS-1$
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java
index d47890d..4ff0109 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/actions/SpecfileEditorToggleCommentActionDelegate.java
@@ -50,10 +50,10 @@
if (selection.getStartLine() == selection.getEndLine()) {
selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content;
} else {
- selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content.replaceAll("\n", "\n#"); //$NON-NLS-1$ //$NON-NLS-2$
+ selectedContent = ISpecfileSpecialSymbols.COMMENT_START + content.replace("\n", "\n#"); //$NON-NLS-1$ //$NON-NLS-2$
}
} else {
- selectedContent = content.replaceFirst(ISpecfileSpecialSymbols.COMMENT_START, "").replaceAll( //$NON-NLS-1$
+ selectedContent = content.replaceFirst(ISpecfileSpecialSymbols.COMMENT_START, "").replace( //$NON-NLS-1$
"\n#", "\n"); //$NON-NLS-1$ //$NON-NLS-2$
}
sb.append(selectedContent);
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java
index 5f21ed7..cf7ca06 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/hyperlink/MailHyperlinkDetector.java
@@ -97,7 +97,7 @@
mail = mail.replaceFirst(" ", "@").replaceFirst(" ", "."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
}
- mail = mail.replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ mail = mail.replace(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
} else {
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java
index 5fd3aec..5a9842d 100644
--- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java
+++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/rpm/ui/editor/wizards/SpecfileNewWizardPage.java
@@ -372,7 +372,7 @@
String templateCSV = ""; //$NON-NLS-1$
for (String file : files) {
if (file.startsWith("spectemplate-")) { //$NON-NLS-1$
- templateCSV += file.split("-", 2)[1].replaceAll("\\.spec", //$NON-NLS-1$ //$NON-NLS-2$
+ templateCSV += file.split("-", 2)[1].replace(".spec", //$NON-NLS-1$ //$NON-NLS-2$
"") //$NON-NLS-1$
+ ","; //$NON-NLS-1$
}
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/FeatureModel.java b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/FeatureModel.java
index 54cf026..9432295 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/FeatureModel.java
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/FeatureModel.java
@@ -64,7 +64,7 @@
*/
private String resolveFeatureProperties(String key) {
if (key != null && key.trim().startsWith("%")) {
- return featureProperties.getProperty(key.trim().replaceAll("%", ""));
+ return featureProperties.getProperty(key.trim().replace("%", ""));
} else {
return key;
}
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/GemModel.java b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/GemModel.java
index 2dbcb0c..5386f35 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/GemModel.java
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/GemModel.java
@@ -107,7 +107,7 @@
rc.add(tmp
.replaceFirst("(?:%q|%Q)(?:([\\W])([^\\W]+)[\\W])",
"$2").replaceAll("(\"|'|\\[|\\])", "")
- .replaceAll(",", ""));
+ .replace(",", ""));
}
}
return rc;
@@ -259,7 +259,7 @@
rc.add(tmp
.replaceFirst("(?:%q|%Q)(?:([\\W])([^\\W]+)[\\W])",
"$2").replaceAll("(\"|'|\\[|\\])", "")
- .replaceAll(",", ""));
+ .replace(",", ""));
}
}
diff --git a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/PerlModel.java b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/PerlModel.java
index 28b2b20..bf15bff 100644
--- a/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/PerlModel.java
+++ b/rpm/org.eclipse.linuxtools.rpmstubby/src/org/eclipse/linuxtools/internal/rpmstubby/model/PerlModel.java
@@ -101,7 +101,7 @@
String rc = "";
rc = getValue(CommonMetaData.NAME);
if (!rc.equals(FIX_ME)) {
- rc = rc.replaceAll("::", "-");
+ rc = rc.replace("::", "-");
}
return rc;
}
