Bug 562072 - Remove dependency on icu from o.e.ant.ui
Change-Id: I0b0aace57832906f54c35f59ece7e089377116f9
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java b/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java
index 9a00251..d0a6fb5 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor Content Assist Dev/TaskXMLFileMerger.java
@@ -19,7 +19,7 @@
import java.io.IOException;
import java.net.URL;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import java.util.Vector;
import javax.xml.parsers.DocumentBuilder;
@@ -35,29 +35,26 @@
import org.xml.sax.SAXException;
/**
- * This class can be used to merge the tasks.xml and XDOCtasks.xml.
- * These files can be found in the Ant Editor Content Assist Dev folder.
- * Move the files to the Ant Editor folder to use this class.
+ * This class can be used to merge the tasks.xml and XDOCtasks.xml. These files can be found in the Ant Editor Content Assist Dev folder. Move the
+ * files to the Ant Editor folder to use this class.
*
- * The xml automatically generated from the proposed xdoclet in the Apache Ant's
- * project currently has no information on required attributes. In the future the task writers
- * hopefully will include this information in the source code comments. Our
- * template currently inserts an attribute required="NOTDEFINED" and this class
- * replaces that field if its defined in the xml file we have generated from the
- * information based on the html files in the Apache Ant's manual directory.
+ * The xml automatically generated from the proposed xdoclet in the Apache Ant's project currently has no information on required attributes. In the
+ * future the task writers hopefully will include this information in the source code comments. Our template currently inserts an attribute
+ * required="NOTDEFINED" and this class replaces that field if its defined in the xml file we have generated from the information based on the html
+ * files in the Apache Ant's manual directory.
*/
public class TaskXMLFileMerger {
- //Definitions for the HTML Generated XML File
+ // Definitions for the HTML Generated XML File
public static String HTML_TASKS_DESCRIPTION_XML_FILE_NAME = "/tasks.xml"; //$NON-NLS-1$
public static String HTML_XML_TAG_TASKS = "TASKS"; //$NON-NLS-1$
public static String HTML_XML_TAG_TASK = "TASK"; //$NON-NLS-1$
public static String HTML_XML_TAG_ATTRIBUTE = "ATTRIBUTE"; //$NON-NLS-1$
- //public static String HTML_XML_TAG_DESCRIPTION = "DESCRIPTION";
+ // public static String HTML_XML_TAG_DESCRIPTION = "DESCRIPTION";
public static String HTML_XML_ATTRIBUTE_NAME = "NAME"; //$NON-NLS-1$
public static String HTML_XML_ATTRIBUTE_REQUIRED = "REQUIRED"; //$NON-NLS-1$
- //Definitions for the XDoclet Genereated XML File
+ // Definitions for the XDoclet Genereated XML File
public static String XDOC_TASKS_DESCRIPTION_XML_FILE_NAME = "/XDOCtasks.xml"; //$NON-NLS-1$
public static String XDOC_XML_TAG_TASKS = "tasks"; //$NON-NLS-1$
public static String XDOC_XML_TAG_TASK = "task"; //$NON-NLS-1$
@@ -68,7 +65,6 @@
public static String XDOC_XML_TAG_ELEMENTS = "elements"; //$NON-NLS-1$
public static String XDOC_XML_TAG_ELEMENT = "element"; //$NON-NLS-1$
public static String XDOC_XML_TAG_REQUIRED = "required"; //$NON-NLS-1$
-
protected NodeList taskNodes_HTML = null;
protected NodeList taskNodes_XDOC = null;
@@ -81,213 +77,184 @@
initialize();
}
-
/**
* Parses the task description xml files and stores the information.
*/
private void initialize() {
-
+
Document tmpDocument = null;
-
- //Get All the Tasks in the HTML XML Generated file and store in the taskNodes_HTML
+
+ // Get All the Tasks in the HTML XML Generated file and store in the taskNodes_HTML
tmpDocument = parseFile(HTML_TASKS_DESCRIPTION_XML_FILE_NAME);
taskNodes_HTML = tmpDocument.getFirstChild().getChildNodes();
-
- //Do the same for the XDOC XML Generated file
+
+ // Do the same for the XDOC XML Generated file
tmpDocument = parseFile(XDOC_TASKS_DESCRIPTION_XML_FILE_NAME);
taskNodes_XDOC = tmpDocument.getFirstChild().getChildNodes();
xdocXMLDocument = tmpDocument;
-/*
- Document tempDocument = parseFile(aFileName);
- Node tempRootNode = tempDocument.getDocumentElement();
- NodeList tempChildNodes = tempRootNode.getChildNodes();
- for(int i=0; i<tempChildNodes.getLength(); i++) {
- Node tempNode = tempChildNodes.item(i);
- if(tempNode.getNodeType() == Node.ELEMENT_NODE) {
- String tempTagName = tempNode.getNodeName();
- if(tempTagName.equals(anXML_TAG_TASK)) {
- NamedNodeMap tempAttributes = tempNode.getAttributes();
- Node tempAttributeNode = tempAttributes.getNamedItem(anXML_ATTRIBUTE_NAME);
- if(tempAttributeNode != null) {
- String tempTaskName = tempAttributeNode.getNodeValue();
- if(tempTaskName != null) {
- aHashMap.put(tempTaskName, tempNode);
- }
- }
- }
- }
- }
-*/
+ /*
+ * Document tempDocument = parseFile(aFileName); Node tempRootNode = tempDocument.getDocumentElement(); NodeList tempChildNodes =
+ * tempRootNode.getChildNodes(); for(int i=0; i<tempChildNodes.getLength(); i++) { Node tempNode = tempChildNodes.item(i);
+ * if(tempNode.getNodeType() == Node.ELEMENT_NODE) { String tempTagName = tempNode.getNodeName(); if(tempTagName.equals(anXML_TAG_TASK)) {
+ * NamedNodeMap tempAttributes = tempNode.getAttributes(); Node tempAttributeNode = tempAttributes.getNamedItem(anXML_ATTRIBUTE_NAME);
+ * if(tempAttributeNode != null) { String tempTaskName = tempAttributeNode.getNodeValue(); if(tempTaskName != null) {
+ * aHashMap.put(tempTaskName, tempNode); } } } } }
+ */
}
-
/**
- * This is the function that does all the work. Calling this
- * will cause all Required fields in all Attributes in the
- * XMLDoc file to be replaced with the value in the corresponding
- * Attributes Required field in the HTML Xml file.
+ * This is the function that does all the work. Calling this will cause all Required fields in all Attributes in the XMLDoc file to be replaced
+ * with the value in the corresponding Attributes Required field in the HTML Xml file.
*/
public void runReplaceAttributeRequiredProcess() {
-
- //Iterate over all the tasks. If task is found in sourceList,
- //then iterate over all the attributes, try to find out if the
- //the attribute is required.
- for(int i = 0; i < taskNodes_XDOC.getLength(); ++i ) {
+
+ // Iterate over all the tasks. If task is found in sourceList,
+ // then iterate over all the attributes, try to find out if the
+ // the attribute is required.
+ for (int i = 0; i < taskNodes_XDOC.getLength(); ++i) {
Node tmpTargetNode = taskNodes_XDOC.item(i);
-
- if(tmpTargetNode.getNodeType() == Node.ELEMENT_NODE ) {
+
+ if (tmpTargetNode.getNodeType() == Node.ELEMENT_NODE) {
replaceAttributeRequiredInTaskNode(tmpTargetNode);
}
}
}
-
+
private void replaceAttributeRequiredInTaskNode(Node aTargetTaskNode) {
-
+
String tmpTaskName = aTargetTaskNode.getAttributes().getNamedItem(XDOC_XML_TAG_NAME).getNodeValue();
-
- if(tmpTaskName != null ) {
+
+ if (tmpTaskName != null) {
Node tmpSourceNode = getTaskInHTMLGeneratedTaskListNamed(tmpTaskName);
-
- if(tmpSourceNode != null) {
- replaceAttributeRequiredInXMLTaskNodeWithAttributeRequiredInHTMLNode(aTargetTaskNode,
- tmpSourceNode);
+
+ if (tmpSourceNode != null) {
+ replaceAttributeRequiredInXMLTaskNodeWithAttributeRequiredInHTMLNode(aTargetTaskNode, tmpSourceNode);
+ } else {
+ System.out.println(MessageFormat.format("Did not find Task \"{0}\" in HTML XML file.", new String[] { tmpTaskName })); //$NON-NLS-1$
}
- else {
- System.out.println(MessageFormat.format("Did not find Task \"{0}\" in HTML XML file.", new String[]{tmpTaskName})); //$NON-NLS-1$
- }
- }
- else {
- System.out.println(MessageFormat.format("Did not find TaskName in TargetTaskNode: {0}", new String[]{aTargetTaskNode.toString()})); //$NON-NLS-1$
+ } else {
+ System.out.println(MessageFormat.format("Did not find TaskName in TargetTaskNode: {0}", new String[] { aTargetTaskNode.toString() })); //$NON-NLS-1$
}
}
-
+
private Node getTaskInHTMLGeneratedTaskListNamed(String aTaskName) {
-
- for(int i = 0; i<taskNodes_HTML.getLength(); ++i ) {
-
+
+ for (int i = 0; i < taskNodes_HTML.getLength(); ++i) {
+
Node tmpTaskNode = taskNodes_HTML.item(i);
- if(tmpTaskNode.getNodeType() == Node.ELEMENT_NODE ) {
+ if (tmpTaskNode.getNodeType() == Node.ELEMENT_NODE) {
String tmpTagName = tmpTaskNode.getNodeName();
- if(tmpTagName.equals(HTML_XML_TAG_TASK)) {
+ if (tmpTagName.equals(HTML_XML_TAG_TASK)) {
NamedNodeMap tmpMap = tmpTaskNode.getAttributes();
Node tmpNameNode = tmpMap.getNamedItem(HTML_XML_ATTRIBUTE_NAME);
- if( aTaskName.equals(tmpNameNode.getNodeValue()) ) {
+ if (aTaskName.equals(tmpNameNode.getNodeValue())) {
return tmpTaskNode;
}
}
}
}
- //Not found
+ // Not found
return null;
}
-
- private void replaceAttributeRequiredInXMLTaskNodeWithAttributeRequiredInHTMLNode(Node aTargetTaskNode,
- Node aSourceTaskNode) {
-
- Node tmpStructureNode = getChildNodeNamedWithTypeFromNode( XDOC_XML_TAG_STRUCTURE,
- Node.ELEMENT_NODE,
- aTargetTaskNode );
-
- if(tmpStructureNode != null ) {
- Node tmpTargetAttributesNode = getChildNodeNamedWithTypeFromNode(XDOC_XML_TAG_ATTRIBUTES,
- Node.ELEMENT_NODE,
- tmpStructureNode);
- if(tmpTargetAttributesNode != null ) {
- Vector tmpTargetAttributesVector = getAttributeNodesFromXMLAttributesNode(tmpTargetAttributesNode);
- Vector tmpSourceAttributesVector = getAttributeNodesFromHTMLTaskNode(aSourceTaskNode);
-
- //Iterate over all the attributes in the targetTaskNode
- for(int i=0; i < tmpTargetAttributesVector.size(); ++i) {
- Node tmpAttributeNode = (Node)tmpTargetAttributesVector.get(i);
- replaceAttributeRequiredInAttributeNodeWithValueFoundInNodeVector(tmpAttributeNode, tmpSourceAttributesVector);
- }
+
+ private void replaceAttributeRequiredInXMLTaskNodeWithAttributeRequiredInHTMLNode(Node aTargetTaskNode, Node aSourceTaskNode) {
+
+ Node tmpStructureNode = getChildNodeNamedWithTypeFromNode(XDOC_XML_TAG_STRUCTURE, Node.ELEMENT_NODE, aTargetTaskNode);
+
+ if (tmpStructureNode != null) {
+ Node tmpTargetAttributesNode = getChildNodeNamedWithTypeFromNode(XDOC_XML_TAG_ATTRIBUTES, Node.ELEMENT_NODE, tmpStructureNode);
+ if (tmpTargetAttributesNode != null) {
+ Vector tmpTargetAttributesVector = getAttributeNodesFromXMLAttributesNode(tmpTargetAttributesNode);
+ Vector tmpSourceAttributesVector = getAttributeNodesFromHTMLTaskNode(aSourceTaskNode);
+
+ // Iterate over all the attributes in the targetTaskNode
+ for (int i = 0; i < tmpTargetAttributesVector.size(); ++i) {
+ Node tmpAttributeNode = (Node) tmpTargetAttributesVector.get(i);
+ replaceAttributeRequiredInAttributeNodeWithValueFoundInNodeVector(tmpAttributeNode, tmpSourceAttributesVector);
}
}
+ }
}
-
+
private void replaceAttributeRequiredInAttributeNodeWithValueFoundInNodeVector(Node aTargetAttributeNode, Vector aSourceAttributeVector) {
-
+
NamedNodeMap tmpTargetNamedNodeMap = aTargetAttributeNode.getAttributes();
String tmpTargetAttributeName = tmpTargetNamedNodeMap.getNamedItem(XDOC_XML_TAG_NAME).getNodeValue();
-
+
String tmpSourceAttributeName = null;
String tmpSourceRequiredValue = null;
-
- for(int i=0; i < aSourceAttributeVector.size(); ++i) {
- Node tmpSourceAttributeNode = (Node)aSourceAttributeVector.get(i);
+
+ for (int i = 0; i < aSourceAttributeVector.size(); ++i) {
+ Node tmpSourceAttributeNode = (Node) aSourceAttributeVector.get(i);
NamedNodeMap tmpSourceAttributeNamedNodeMap = tmpSourceAttributeNode.getAttributes();
tmpSourceAttributeName = tmpSourceAttributeNamedNodeMap.getNamedItem(HTML_XML_ATTRIBUTE_NAME).getNodeValue();
- //If the Attribute Name is the same we replace the REQUIRED Value
- if(tmpTargetAttributeName.equals(tmpSourceAttributeName) ){
- tmpSourceRequiredValue = tmpSourceAttributeNamedNodeMap.getNamedItem(HTML_XML_ATTRIBUTE_REQUIRED).getNodeValue();
- //Set the Vaule to the on we just got.
+ // If the Attribute Name is the same we replace the REQUIRED Value
+ if (tmpTargetAttributeName.equals(tmpSourceAttributeName)) {
+ tmpSourceRequiredValue = tmpSourceAttributeNamedNodeMap.getNamedItem(HTML_XML_ATTRIBUTE_REQUIRED).getNodeValue();
+ // Set the Vaule to the on we just got.
tmpTargetNamedNodeMap.getNamedItem(XDOC_XML_TAG_REQUIRED).setNodeValue(tmpSourceRequiredValue);
}
}
}
-
- private Vector getAttributeNodesFromXMLAttributesNode(Node anXMLAttributesNode){
-
- Vector allAttributes = new Vector();
+
+ private Vector getAttributeNodesFromXMLAttributesNode(Node anXMLAttributesNode) {
+
+ Vector allAttributes = new Vector();
NodeList tmpList = anXMLAttributesNode.getChildNodes();
-
- for(int i = 0; i<tmpList.getLength(); ++i) {
+
+ for (int i = 0; i < tmpList.getLength(); ++i) {
Node tmpNode = tmpList.item(i);
- if(tmpNode.getNodeType() == Node.ELEMENT_NODE
- && XDOC_XML_TAG_ATTRIBUTE.equals(tmpNode.getNodeName()) ) {
+ if (tmpNode.getNodeType() == Node.ELEMENT_NODE && XDOC_XML_TAG_ATTRIBUTE.equals(tmpNode.getNodeName())) {
allAttributes.add(tmpNode);
}
}
return allAttributes;
}
-
+
private Vector getAttributeNodesFromHTMLTaskNode(Node anHTTP_XML_TaskNode) {
-
+
Vector tmpVector = new Vector();
NodeList tmpList = anHTTP_XML_TaskNode.getChildNodes();
-
- for(int i = 0; i < tmpList.getLength(); ++i) {
+
+ for (int i = 0; i < tmpList.getLength(); ++i) {
Node tmpNode = tmpList.item(i);
- if(tmpNode.getNodeType() == Node.ELEMENT_NODE
- && HTML_XML_TAG_ATTRIBUTE.equals(tmpNode.getNodeName()) ) {
- tmpVector.add(tmpNode);
- }
+ if (tmpNode.getNodeType() == Node.ELEMENT_NODE && HTML_XML_TAG_ATTRIBUTE.equals(tmpNode.getNodeName())) {
+ tmpVector.add(tmpNode);
+ }
}
-
+
return tmpVector;
}
-
+
/**
- * Returns the ChildNode of the node defined by the Arguments. The
- * first child found matching the criterias is returned.
+ * Returns the ChildNode of the node defined by the Arguments. The first child found matching the criterias is returned.
*
- * @param aNodeName The Name of the Node to return.
- * @param aType The Type of the node @see Node
- * @param aParentNode The Node to get the child from
+ * @param aNodeName
+ * The Name of the Node to return.
+ * @param aType
+ * The Type of the node @see Node
+ * @param aParentNode
+ * The Node to get the child from
*
- * @return The First Child Node found matching the criterias,
- * or null if none is found.
- */
- private Node getChildNodeNamedWithTypeFromNode(String aName, short aNodeType, Node aNode ) {
-
+ * @return The First Child Node found matching the criterias, or null if none is found.
+ */
+ private Node getChildNodeNamedWithTypeFromNode(String aName, short aNodeType, Node aNode) {
+
NodeList tmpNodeList = aNode.getChildNodes();
- for(int i=0; i<tmpNodeList.getLength(); ++i ) {
+ for (int i = 0; i < tmpNodeList.getLength(); ++i) {
Node tmpNode = tmpNodeList.item(i);
- if( (tmpNode.getNodeType() == aNodeType) && aName.equals(tmpNode.getNodeName()) ) {
+ if ((tmpNode.getNodeType() == aNodeType) && aName.equals(tmpNode.getNodeName())) {
return tmpNode;
}
}
- //Not found
+ // Not found
return null;
- }
-
-
+ }
+
/**
- * Returns the (DOM) document as a result of parsing the file with the
- * specified file name.
+ * Returns the (DOM) document as a result of parsing the file with the specified file name.
* <P>
- * The file will be loaded as resource, thus must begin with '/' and must
- * be relative to the classpath.
+ * The file will be loaded as resource, thus must begin with '/' and must be relative to the classpath.
*/
private Document parseFile(String aFileName) {
Document tempDocument = null;
@@ -302,7 +269,8 @@
URL tempURL = getClass().getResource(aFileName);
InputSource tempInputSource = new InputSource(tempURL.toExternalForm());
tempDocument = tempDocBuilder.parse(tempInputSource);
- } catch (ParserConfigurationException e) {
+ }
+ catch (ParserConfigurationException e) {
AntUIPlugin.log(e);
}
catch (IOException ioException) {
@@ -314,24 +282,27 @@
return tempDocument;
}
-
+
/**
* This function writes the XMLDocument to the specified file.
- * @param aFileName The filename to which the XMLDocument should be written.
+ *
+ * @param aFileName
+ * The filename to which the XMLDocument should be written.
*/
public void writeXMLDocumentToFile(String aFileName) {
-
-// try {
-// XmlDocument xmlDocument = (XmlDocument)xdocXMLDocument;
-// xmlDocument.write(new FileWriter(aFileName), "UTF-8"); //$NON-NLS-1$
-// }
-// catch(IOException ioe) {
-// System.out.println(MessageFormat.format(AntEditorToolsMessages.getString("TaskXMLFileMerger.Could_not_print"), new String[]{ioe.toString()})); //$NON-NLS-1$
-// }
+
+ // try {
+ // XmlDocument xmlDocument = (XmlDocument)xdocXMLDocument;
+ // xmlDocument.write(new FileWriter(aFileName), "UTF-8"); //$NON-NLS-1$
+ // }
+ // catch(IOException ioe) {
+ // System.out.println(MessageFormat.format(AntEditorToolsMessages.getString("TaskXMLFileMerger.Could_not_print"), new
+ // String[]{ioe.toString()})); //$NON-NLS-1$
+ // }
}
-
+
public static void main(String[] args) {
-
+
TaskXMLFileMerger tmpTaskXMLFileMerger = new TaskXMLFileMerger();
tmpTaskXMLFileMerger.runReplaceAttributeRequiredProcess();
tmpTaskXMLFileMerger.writeXMLDocumentToFile("src\\anttasks_1.5b.xml"); //$NON-NLS-1$
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java
index 13d15f5..040ac5a 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/NfmParser.java
@@ -13,7 +13,7 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.dtd.schema;
-import com.ibm.icu.text.MessageFormat;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java
index 56caa16..12c532a 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/schema/SchemaFactory.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.dtd.schema;
+import java.text.MessageFormat;
import java.util.HashSet;
import java.util.LinkedList;
@@ -22,8 +23,6 @@
import org.xml.sax.SAXException;
import org.xml.sax.ext.DeclHandler;
-import com.ibm.icu.text.MessageFormat;
-
/**
* SchemaFactory is a SAX DeclHandler that converts DTD ELEMENT and ATTLIST declarations to schema form on the fly. The only two methods available to
* external users of SchemaFactory are its constructor and <code>getSchema()</code>. The latter returns the schema built by this process and should
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java
index ce11d86..92dca39 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/dtd/util/SortedMap.java
@@ -13,11 +13,10 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.dtd.util;
+import java.text.MessageFormat;
import java.util.Comparator;
import java.util.Iterator;
-import com.ibm.icu.text.MessageFormat;
-
/**
* @author Bob Foster
*/
diff --git a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java
index 94b0522..17c2fbb 100644
--- a/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java
+++ b/ant/org.eclipse.ant.ui/Ant Editor/org/eclipse/ant/internal/ui/editor/AntEditorCompletionProcessor.java
@@ -26,6 +26,7 @@
import java.io.InputStreamReader;
import java.io.Reader;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -113,8 +114,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import com.ibm.icu.text.MessageFormat;
-
/**
* The completion processor for the Ant Editor.
*/
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUtil.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUtil.java
index 39e2076..b0b1b98 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUtil.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/AntUtil.java
@@ -16,6 +16,7 @@
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Hashtable;
@@ -81,8 +82,6 @@
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
-import com.ibm.icu.text.MessageFormat;
-
/**
* General utility class dealing with Ant build files
*/
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntBuildfileExportPage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntBuildfileExportPage.java
index 64d7fc3..5d9dcdb 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntBuildfileExportPage.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/AntBuildfileExportPage.java
@@ -17,6 +17,7 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -57,8 +58,6 @@
import org.eclipse.ui.model.WorkbenchContentProvider;
import org.eclipse.ui.model.WorkbenchLabelProvider;
-import com.ibm.icu.text.MessageFormat;
-
public class AntBuildfileExportPage extends WizardPage {
private CheckboxTableViewer fTableViewer;
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/JavacTableLabelProvider.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/JavacTableLabelProvider.java
index 810ee8a..a840df5 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/JavacTableLabelProvider.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/JavacTableLabelProvider.java
@@ -13,12 +13,12 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.datatransfer;
+import java.text.MessageFormat;
+
import org.eclipse.ant.internal.ui.model.AntElementNode;
import org.eclipse.ant.internal.ui.model.AntModelLabelProvider;
import org.eclipse.jface.viewers.StyledString;
-import com.ibm.icu.text.MessageFormat;
-
/**
* Ant javac task label provider for a table
*/
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java
index 0cc7e1b..f88bb8b 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/datatransfer/ProjectCreator.java
@@ -14,6 +14,7 @@
package org.eclipse.ant.internal.ui.datatransfer;
import java.io.File;
+import java.text.MessageFormat;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Javac;
@@ -38,8 +39,6 @@
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.launching.JavaRuntime;
-import com.ibm.icu.text.MessageFormat;
-
public class ProjectCreator {
public IJavaProject createJavaProjectFromJavacNode(String projectName, Javac javacTask, IProgressMonitor monitor) throws CoreException {
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/debug/model/AntDebugModelPresentation.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/debug/model/AntDebugModelPresentation.java
index cc23f0b..92ae1f4 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/debug/model/AntDebugModelPresentation.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/debug/model/AntDebugModelPresentation.java
@@ -15,6 +15,7 @@
package org.eclipse.ant.internal.ui.debug.model;
import java.io.File;
+import java.text.MessageFormat;
import org.eclipse.ant.internal.core.IAntCoreConstants;
import org.eclipse.ant.internal.launching.debug.model.AntLineBreakpoint;
@@ -43,8 +44,6 @@
import org.eclipse.ui.ide.FileStoreEditorInput;
import org.eclipse.ui.part.FileEditorInput;
-import com.ibm.icu.text.MessageFormat;
-
/**
* Renders Ant debug elements
*/
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcut.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcut.java
index fab64c3..f41af13 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcut.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntLaunchShortcut.java
@@ -14,6 +14,7 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.launchConfigurations;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -61,8 +62,6 @@
import org.eclipse.ui.editors.text.ILocationProvider;
import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
-import com.ibm.icu.text.MessageFormat;
-
/**
* This class provides the Run/Debug As -> Ant Build launch shortcut.
*
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetsTab.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetsTab.java
index 6d9adb7..2b18184 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetsTab.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntTargetsTab.java
@@ -16,6 +16,7 @@
import java.io.File;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -71,8 +72,6 @@
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.PlatformUI;
-import com.ibm.icu.text.MessageFormat;
-
/**
* Launch configuration tab which allows the user to choose the targets from an Ant buildfile that will be executed when the configuration is
* launched.
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java
index 931130c..3762f9e 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/launchConfigurations/AntWorkingDirectoryBlock.java
@@ -14,6 +14,8 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.launchConfigurations;
+import java.text.MessageFormat;
+
import org.eclipse.ant.internal.ui.AntUIPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -21,8 +23,6 @@
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.ui.externaltools.internal.launchConfigurations.ExternalToolsUtil;
-import com.ibm.icu.text.MessageFormat;
-
public class AntWorkingDirectoryBlock extends JavaWorkingDirectoryBlock {
private String fDefaultWorkingDirPath;
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntElementNode.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntElementNode.java
index 9cd517c..397a1eb 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntElementNode.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntElementNode.java
@@ -25,6 +25,7 @@
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -44,8 +45,6 @@
import org.eclipse.jface.text.IRegion;
import org.eclipse.swt.graphics.Image;
-import com.ibm.icu.text.MessageFormat;
-
/**
* General representation of an Ant buildfile element.
*
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModel.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModel.java
index 3627873..18ca6dc 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModel.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModel.java
@@ -20,6 +20,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.net.URLClassLoader;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -84,8 +85,6 @@
import org.xml.sax.Attributes;
import org.xml.sax.SAXParseException;
-import com.ibm.icu.text.MessageFormat;
-
public class AntModel implements IAntModel {
private static ClassLoader fgClassLoader;
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModelCore.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModelCore.java
index eddfe2e..803d0f8 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModelCore.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/model/AntModelCore.java
@@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.model;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -29,8 +30,6 @@
import org.eclipse.debug.core.IBreakpointsListener;
import org.eclipse.debug.core.model.IBreakpoint;
-import com.ibm.icu.text.MessageFormat;
-
public class AntModelCore implements IBreakpointsListener {
private static AntModelCore inst;
@@ -82,7 +81,8 @@
IMarker marker = breakpoint.getMarker();
if (marker.exists()) {
int lineNumber = marker.getAttribute(IMarker.LINE_NUMBER, 0);
- marker.setAttribute(IMarker.MESSAGE, MessageFormat.format(DebugModelMessages.AntLineBreakpoint_0, new Object[] { Integer.toString(lineNumber) }));
+ marker.setAttribute(IMarker.MESSAGE, MessageFormat.format(DebugModelMessages.AntLineBreakpoint_0, new Object[] {
+ Integer.toString(lineNumber) }));
}
}
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AbstractAntEditorPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AbstractAntEditorPreferencePage.java
index c19fdbd..9c32179 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AbstractAntEditorPreferencePage.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AbstractAntEditorPreferencePage.java
@@ -16,6 +16,7 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -41,8 +42,6 @@
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.PlatformUI;
-import com.ibm.icu.text.MessageFormat;
-
public abstract class AbstractAntEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
private OverlayPreferenceStore fOverlayStore;
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddCustomDialog.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddCustomDialog.java
index 3c4d90e..021c9ea 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddCustomDialog.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AddCustomDialog.java
@@ -18,6 +18,7 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
+import java.text.MessageFormat;
import java.util.Iterator;
import java.util.List;
import java.util.StringTokenizer;
@@ -64,8 +65,6 @@
import org.eclipse.ui.wizards.datatransfer.IImportStructureProvider;
import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-import com.ibm.icu.text.MessageFormat;
-
public class AddCustomDialog extends StatusDialog {
private ZipFileStructureProvider providerCache;
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java
index bb86501..c08f641 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPreferencePage.java
@@ -14,6 +14,8 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.preferences;
+import java.text.MessageFormat;
+
import org.eclipse.ant.internal.launching.AntLaunching;
import org.eclipse.ant.internal.launching.IAntLaunchingPreferenceConstants;
import org.eclipse.ant.internal.ui.AntUIPlugin;
@@ -47,8 +49,6 @@
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.PlatformUI;
-import com.ibm.icu.text.MessageFormat;
-
public class AntPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
/**
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesBlock.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesBlock.java
index d7f851d..fcb1d61 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesBlock.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/AntPropertiesBlock.java
@@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.preferences;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -54,8 +55,6 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
-import com.ibm.icu.text.MessageFormat;
-
public class AntPropertiesBlock {
/**
@@ -495,7 +494,8 @@
propertyName, property.getPluginLabel() }));
return false;
}
- boolean overWrite = MessageDialog.openQuestion(propertyTableViewer.getControl().getShell(), AntPreferencesMessages.AntPropertiesBlock_15, MessageFormat.format(AntPreferencesMessages.AntPropertiesBlock_16, new Object[] { name }));
+ boolean overWrite = MessageDialog.openQuestion(propertyTableViewer.getControl().getShell(), AntPreferencesMessages.AntPropertiesBlock_15, MessageFormat.format(AntPreferencesMessages.AntPropertiesBlock_16, new Object[] {
+ name }));
if (!overWrite) {
return false;
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/refactoring/LaunchConfigurationBuildfileChange.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/refactoring/LaunchConfigurationBuildfileChange.java
index 7687fad..93ac554 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/refactoring/LaunchConfigurationBuildfileChange.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/refactoring/LaunchConfigurationBuildfileChange.java
@@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.refactoring;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -45,8 +46,6 @@
import org.eclipse.ltk.core.refactoring.CompositeChange;
import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import com.ibm.icu.text.MessageFormat;
-
public class LaunchConfigurationBuildfileChange extends Change {
private ILaunchConfiguration fLaunchConfiguration;
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntOpenWithMenu.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntOpenWithMenu.java
index e68d0fb..bc53632 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntOpenWithMenu.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/AntOpenWithMenu.java
@@ -13,6 +13,7 @@
*******************************************************************************/
package org.eclipse.ant.internal.ui.views.actions;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Hashtable;
@@ -39,8 +40,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.ide.IDE;
-import com.ibm.icu.text.MessageFormat;
-
/**
*
* Code mostly a copy of the OpenWithMenu which cannot be effectively sub-classed
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java
index b9c382f..ca8ff2a 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/RefreshBuildFilesAction.java
@@ -14,6 +14,7 @@
package org.eclipse.ant.internal.ui.views.actions;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
@@ -30,8 +31,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.IUpdate;
-import com.ibm.icu.text.MessageFormat;
-
/**
* Action which refreshes the selected buildfiles in the Ant view
*/
@@ -75,7 +74,8 @@
AntProjectNodeProxy project;
while (iter.hasNext()) {
project = (AntProjectNodeProxy) iter.next();
- monitor.subTask(MessageFormat.format(AntViewActionMessages.RefreshBuildFilesAction_Refreshing__0__4, new Object[] { project.getBuildFileName() }));
+ monitor.subTask(MessageFormat.format(AntViewActionMessages.RefreshBuildFilesAction_Refreshing__0__4, new Object[] {
+ project.getBuildFileName() }));
project.parseBuildFile(true);
monitor.worked(1);
}
diff --git a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java
index 681c64d..0521dea 100644
--- a/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java
+++ b/ant/org.eclipse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/views/actions/SearchForBuildFilesAction.java
@@ -14,6 +14,7 @@
package org.eclipse.ant.internal.ui.views.actions;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
import org.eclipse.ant.internal.ui.AntUIImages;
import org.eclipse.ant.internal.ui.IAntUIConstants;
@@ -29,8 +30,6 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PlatformUI;
-import com.ibm.icu.text.MessageFormat;
-
/**
* This action opens a dialog to search for build files and adds the resulting projects to the ant view.
*/
@@ -61,7 +60,8 @@
monitor.beginTask(AntViewActionMessages.SearchForBuildFilesAction_Processing_search_results_3, files.length);
for (int i = 0; i < files.length && !monitor.isCanceled(); i++) {
String buildFileName = files[i].getFullPath().toString();
- monitor.subTask(MessageFormat.format(AntViewActionMessages.SearchForBuildFilesAction_Adding__0__4, new Object[] { buildFileName }));
+ monitor.subTask(MessageFormat.format(AntViewActionMessages.SearchForBuildFilesAction_Adding__0__4, new Object[] {
+ buildFileName }));
if (alreadyAdded(buildFileName)) {
// Don't parse projects that have already been added.
continue;
diff --git a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
index 630df82..846bda1 100644
--- a/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
+++ b/ant/org.eclipse.ant.ui/META-INF/MANIFEST.MF
@@ -54,6 +54,5 @@
org.eclipse.ant.launching;bundle-version="[1.0.0,2.0.0)",
org.eclipse.core.externaltools;bundle-version="[1.0.0,2.0.0)"
Bundle-ActivationPolicy: lazy
-Import-Package: com.ibm.icu.text
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.ant.ui
