Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/examples/org.eclipse.compare.examples.xml
diff options
context:
space:
mode:
authorKarsten Thoms2017-11-08 21:36:10 +0000
committerAlexander Kurtakov2017-11-09 10:54:30 +0000
commitcb39d43edc678e2eac00bb0f93f55a4e0b25dc4a (patch)
treeb3c87a33363f74d6ea2b5a48ff3aa8f558ae091e /examples/org.eclipse.compare.examples.xml
parent5685ec90433f9182cb664c38b014b848da8a5495 (diff)
downloadeclipse.platform.team-cb39d43edc678e2eac00bb0f93f55a4e0b25dc4a.tar.gz
eclipse.platform.team-cb39d43edc678e2eac00bb0f93f55a4e0b25dc4a.tar.xz
eclipse.platform.team-cb39d43edc678e2eac00bb0f93f55a4e0b25dc4a.zip
Bug 527018 - [refactoring] Replace use of Number constructors by valueOfI20171113-2000I20171112-2000I20171111-1500I20171111-0410I20171111-0155I20171110-2000I20171109-2000
Bump micro version for 4.8 Change-Id: Ib0bee17c6905c38cab7d4701f6339bfd63d9c45e Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
Diffstat (limited to 'examples/org.eclipse.compare.examples.xml')
-rw-r--r--examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF2
-rw-r--r--examples/org.eclipse.compare.examples.xml/pom.xml2
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java2
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java4
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java8
-rw-r--r--examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java4
6 files changed, 11 insertions, 11 deletions
diff --git a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
index 536dad53b..482e75e70 100644
--- a/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.compare.examples.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.examples.xml; singleton:=true
-Bundle-Version: 3.4.100.qualifier
+Bundle-Version: 3.4.200.qualifier
Bundle-Activator: org.eclipse.compare.examples.xml.XMLPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/examples/org.eclipse.compare.examples.xml/pom.xml b/examples/org.eclipse.compare.examples.xml/pom.xml
index 58534334f..ef4a0f35c 100644
--- a/examples/org.eclipse.compare.examples.xml/pom.xml
+++ b/examples/org.eclipse.compare.examples.xml/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.examples.xml</artifactId>
- <version>3.4.100-SNAPSHOT</version>
+ <version>3.4.200-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java
index c1bcc67b5..bff22f00b 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareEditMappingDialog.java
@@ -175,7 +175,7 @@ public class XMLCompareEditMappingDialog extends StatusDialog {
fMapping.setSignature(fSignatureText.getText());
String idtext= fIdAttributeText.getText();
if (fIdTypeChildBodyButton.getSelection()) {
- idtext= new Character(XMLStructureCreator.ID_TYPE_BODY) + idtext;
+ idtext= Character.valueOf(XMLStructureCreator.ID_TYPE_BODY) + idtext;
}
fMapping.setIdAttribute(idtext);
super.okPressed();
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java
index 23f8e93c5..f941cfadb 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLPlugin.java
@@ -174,7 +174,7 @@ public final class XMLPlugin extends AbstractUIPlugin {
fOrderedElements= new HashMap();
String OrderedPrefValue= fPrefStore.getString(ORDERED_PREFERENCE_NAME);
- StringTokenizer orderedTokens= new StringTokenizer(OrderedPrefValue, (new Character(ORDERED_FIELDS_SEPARATOR)).toString());
+ StringTokenizer orderedTokens= new StringTokenizer(OrderedPrefValue, (Character.valueOf(ORDERED_FIELDS_SEPARATOR)).toString());
while (orderedTokens.hasMoreTokens()) {
String IdMapName= orderedTokens.nextToken();
String signature= orderedTokens.nextToken();
@@ -309,7 +309,7 @@ public final class XMLPlugin extends AbstractUIPlugin {
if (signature != null && !signature.equals("") //$NON-NLS-1$
&& attribute != null && !attribute.equals("")) { //$NON-NLS-1$
if (idsource != null && idsource.equals(MAPPING_ID_SOURCE_BODY))
- bodyid= (new Character(XMLStructureCreator.ID_TYPE_BODY)).toString();
+ bodyid= (Character.valueOf(XMLStructureCreator.ID_TYPE_BODY)).toString();
idmapHM.put(XMLStructureCreator.ROOT_ID + XMLStructureCreator.SIGN_SEPARATOR
+ signature + XMLStructureCreator.SIGN_SEPARATOR, bodyid + attribute);
}
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java
index 3f8141a76..d02e99194 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureCreator.java
@@ -159,15 +159,15 @@ public class XMLStructureCreator implements IStructureCreator {
if (isUseIdMap() && idMap.containsKey(fsignature)) {
String attrName= (String) idMap.get(fsignature);
- elementId= raw + new Character(ID_SEPARATOR) + attrs.getValue(attrName);
+ elementId= raw + Character.valueOf(ID_SEPARATOR) + attrs.getValue(attrName);
elementName= raw + " [" + attrName + "=" + attrs.getValue(attrName) + "]"; //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$
} else {
if (!currentParent.childElements.containsKey(raw)) {
- currentParent.childElements.put(raw, new Integer(1));
+ currentParent.childElements.put(raw, Integer.valueOf(1));
} else {
- currentParent.childElements.put(raw, new Integer(((Integer) currentParent.childElements.get(raw)).intValue() + 1));
+ currentParent.childElements.put(raw, Integer.valueOf(((Integer) currentParent.childElements.get(raw)).intValue() + 1));
}
- elementId= raw + new Character(ID_SEPARATOR) + "[" + currentParent.childElements.get(raw) + "]"; //$NON-NLS-2$ //$NON-NLS-1$
+ elementId= raw + Character.valueOf(ID_SEPARATOR) + "[" + currentParent.childElements.get(raw) + "]"; //$NON-NLS-2$ //$NON-NLS-1$
elementName= MessageFormat.format("{0} [{1}]", raw, currentParent.childElements.get(raw).toString()); //$NON-NLS-1$
}
int start= r.getOffset() + prevlocator.getColumnNumber() - 1;
diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
index 8ea560cc2..cf3613fd1 100644
--- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
+++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLStructureViewer.java
@@ -316,7 +316,7 @@ public class XMLStructureViewer extends StructureDiffViewer {
idname.indexOf(
XMLStructureCreator.ID_SEPARATOR));
idname=
- new Character(XMLStructureCreator.ID_TYPE_BODY)
+ Character.valueOf(XMLStructureCreator.ID_TYPE_BODY)
+ idname;
}
if (idmapHM.containsKey(signature)) {
@@ -451,7 +451,7 @@ public class XMLStructureViewer extends StructureDiffViewer {
0,
idname.indexOf(XMLStructureCreator.ID_SEPARATOR));
idname=
- new Character(XMLStructureCreator.ID_TYPE_BODY)
+ Character.valueOf(XMLStructureCreator.ID_TYPE_BODY)
+ idname;
idmapHM.put(signature, idname);
XMLPlugin.getDefault().setIdMaps(

Back to the top