From 7d0b201368e91209b32a427f1467277d69b65e7f Mon Sep 17 00:00:00 2001 From: Stefan Xenos Date: Wed, 23 Mar 2016 10:17:44 -0700 Subject: Bug 489805 - Fix warnings in org.eclipse.compare.examples Change-Id: I3101a8ceb86de1920e5cd4b3c384185475b727c7 Signed-off-by: Stefan Xenos --- .../org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java | 2 +- .../src/org/eclipse/compare/examples/xml/XMLStructureCreator.java | 6 +++--- .../src/org/eclipse/compare/examples/xml/XMLStructureViewer.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java index 7e0eb9615..60f8645e6 100644 --- a/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java +++ b/examples/org.eclipse.compare.examples.xml/src/org/eclipse/compare/examples/xml/XMLCompareAddIdMapDialog.java @@ -125,7 +125,7 @@ public class XMLCompareAddIdMapDialog extends StatusDialog { if (newText.indexOf(".") > -1) //$NON-NLS-1$ status.setError(XMLCompareMessages.XMLCompareAddIdMapDialog_error_extfullstop); else if (fIdExtensionToName.containsKey(newText) && !fIdExtensionToName.get(newText).equals(fIdMap.getName())) - status.setError(MessageFormat.format("{0} {1}",new String[] {XMLCompareMessages.XMLCompareAddIdMapDialog_error_extExists,(String)fIdExtensionToName.get(newText)})); //$NON-NLS-1$ + status.setError(MessageFormat.format("{0} {1}", XMLCompareMessages.XMLCompareAddIdMapDialog_error_extExists,fIdExtensionToName.get(newText))); //$NON-NLS-1$ } updateStatus(status); } 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 eda121f70..604ad8410 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 @@ -164,7 +164,7 @@ public class XMLStructureCreator implements IStructureCreator { currentParent.childElements.put(raw, new Integer(((Integer) currentParent.childElements.get(raw)).intValue() + 1)); } elementId= raw + new Character(ID_SEPARATOR) + "[" + currentParent.childElements.get(raw) + "]"; //$NON-NLS-2$ //$NON-NLS-1$ - elementName= MessageFormat.format("{0} [{1}]", new String[] { raw, currentParent.childElements.get(raw).toString()}); //$NON-NLS-1$ + elementName= MessageFormat.format("{0} [{1}]", raw, currentParent.childElements.get(raw).toString()); //$NON-NLS-1$ } int start= r.getOffset() + prevlocator.getColumnNumber() - 1; if (start < 0) @@ -334,7 +334,7 @@ public class XMLStructureCreator implements IStructureCreator { body_value= removeWhiteSpace(body_value); } XMLNode bodynode= new XMLNode(TYPE_TEXT, "body_(" + fcurrentParent.bodies + ")", body_value, (fsignature + SIGN_TEXT), fdoc, offset, length); //$NON-NLS-2$ //$NON-NLS-1$ - bodynode.setName(MessageFormat.format("{0} ({1})", new String[] { XMLCompareMessages.XMLStructureCreator_body, Integer.toString(fcurrentParent.bodies)})); //$NON-NLS-1$ + bodynode.setName(MessageFormat.format("{0} ({1})", XMLCompareMessages.XMLStructureCreator_body, Integer.toString(fcurrentParent.bodies))); //$NON-NLS-1$ fcurrentParent.addChild(bodynode); bodynode.setParent(fcurrentParent); if (XMLStructureCreator.DEBUG_MODE) @@ -354,7 +354,7 @@ public class XMLStructureCreator implements IStructureCreator { String popelementname= popid.substring(0, popid.indexOf("<")); //$NON-NLS-1$ pop.setId(popelementname + "<" + body_value); //$NON-NLS-1$ pop.setOrigId(popelementname + "<" + body_value); //$NON-NLS-1$ - pop.setName(MessageFormat.format("{0} [{1}={2}]", new String[] { popelementname, pelementname, body_value})); //$NON-NLS-1$ + pop.setName(MessageFormat.format("{0} [{1}={2}]", popelementname, pelementname, body_value)); //$NON-NLS-1$ pop.setUsesIDMAP(true); } } 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 b91244fbf..af1ae11f5 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 @@ -323,7 +323,7 @@ public class XMLStructureViewer extends StructureDiffViewer { .ID_TYPE_BODY)) .toString())) oldId= oldId.substring(1); - action.setText(MessageFormat.format("{0} {1}", new String[] { XMLCompareMessages.XMLStructureViewer_action_setId_text2, oldId })); //$NON-NLS-1$ + action.setText(MessageFormat.format("{0} {1}", XMLCompareMessages.XMLStructureViewer_action_setId_text2, oldId)); //$NON-NLS-1$ action.setEnabled(true); } } else { -- cgit v1.2.3