Attachment #38098 for bug #135768

View | Details | Raw Unified | Return to bug 135768
Collapse All | Expand All

Lines 18-24 Link Here

(-)compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java (-1 / +1 lines)
18	import java.util.Map;	18	import java.util.Map;
19	import java.util.HashMap;	19	import java.util.HashMap;
20	import java.util.ResourceBundle;	20	import java.util.ResourceBundle;
21	import java.text.MessageFormat;	21	import com.ibm.icu.text.MessageFormat;
22		22
23	import java.io.UnsupportedEncodingException;	23	import java.io.UnsupportedEncodingException;
24	import java.lang.reflect.InvocationTargetException;	24	import java.lang.reflect.InvocationTargetException;

Lines 10-16 Link Here

(-)compare/org/eclipse/compare/rangedifferencer/RangeDifferencer.java (-1 / +2 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare.rangedifferencer;	11	package org.eclipse.compare.rangedifferencer;
12		12
13	import java.util.*;	13	import java.util.ArrayList;
		14	import java.util.List;
14		15
15	import org.eclipse.jface.util.Assert;	16	import org.eclipse.jface.util.Assert;
16		17

Lines 11-17 Link Here

(-)compare/org/eclipse/compare/internal/ComparePreferencePage.java (-1 / +3 lines)
11	package org.eclipse.compare.internal;	11	package org.eclipse.compare.internal;
12		12
13	import java.io.*;	13	import java.io.*;
14	import java.util.*;	14	import java.util.HashMap;
		15	import java.util.Iterator;
		16	import java.util.Map;
15		17
16	import org.eclipse.ui.*;	18	import org.eclipse.ui.*;
17	import org.eclipse.ui.dialogs.PreferenceLinkArea;	19	import org.eclipse.ui.dialogs.PreferenceLinkArea;

Lines 10-16 Link Here

(-)compare/org/eclipse/compare/internal/Messages.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare.internal;	11	package org.eclipse.compare.internal;
12		12
13	import java.text.MessageFormat;	13	import com.ibm.icu.text.MessageFormat;
14		14
15	/**	15	/**
16	* Helper class to format message strings.	16	* Helper class to format message strings.

Lines 10-16 Link Here

(-)compare/org/eclipse/compare/internal/MergeSourceViewer.java (-1 / +3 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare.internal;	11	package org.eclipse.compare.internal;
12		12
13	import java.util.*;	13	import java.util.HashMap;
		14	import java.util.Iterator;
		15	import java.util.ResourceBundle;
14		16
15	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
16	import org.eclipse.swt.custom.StyledText;	18	import org.eclipse.swt.custom.StyledText;

Lines 10-16 Link Here

(-)compare/org/eclipse/compare/internal/CompareFilter.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare.internal;	11	package org.eclipse.compare.internal;
12		12
13	import java.text.MessageFormat;	13	import com.ibm.icu.text.MessageFormat;
14	import java.util.StringTokenizer;	14	import java.util.StringTokenizer;
15		15
16	import org.eclipse.core.resources.*;	16	import org.eclipse.core.resources.*;

Lines 11-17 Link Here

(-)compare/org/eclipse/compare/internal/ResourceCompareInput.java (-1 / +1 lines)
11	package org.eclipse.compare.internal;	11	package org.eclipse.compare.internal;
12		12
13	import java.lang.reflect.InvocationTargetException;	13	import java.lang.reflect.InvocationTargetException;
14	import java.text.MessageFormat;	14	import com.ibm.icu.text.MessageFormat;
15	import java.util.HashSet;	15	import java.util.HashSet;
16	import java.util.Set;	16	import java.util.Set;
17		17

Lines 10-16 Link Here

(-)compare/org/eclipse/compare/internal/DocumentManager.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare.internal;	11	package org.eclipse.compare.internal;
12		12
13	import java.util.*;	13	import java.util.ArrayList;
14		14
15	import org.eclipse.jface.text.IDocument;	15	import org.eclipse.jface.text.IDocument;
16		16

Lines 13-20 Link Here

(-)compare/org/eclipse/compare/internal/CompareUIPlugin.java (-1 / +9 lines)
13	import java.io.*;	13	import java.io.*;
14	import java.lang.reflect.InvocationTargetException;	14	import java.lang.reflect.InvocationTargetException;
15	import java.net.*;	15	import java.net.*;
16	import java.util.*;	16	import java.util.ArrayList;
		17	import java.util.HashMap;
		18	import java.util.HashSet;
		19	import java.util.Hashtable;
		20	import java.util.Iterator;
17	import java.util.List;	21	import java.util.List;
		22	import java.util.Map;
		23	import java.util.ResourceBundle;
		24	import java.util.Set;
		25	import java.util.StringTokenizer;
18		26
19	import org.eclipse.ui.*;	27	import org.eclipse.ui.*;
20	import org.eclipse.ui.model.IWorkbenchAdapter;	28	import org.eclipse.ui.model.IWorkbenchAdapter;

Lines 11-19 Link Here

(-)compare/org/eclipse/compare/internal/Utilities.java (-2 / +7 lines)
11	package org.eclipse.compare.internal;	11	package org.eclipse.compare.internal;
12		12
13	import java.io.*;	13	import java.io.*;
14	import java.text.MessageFormat;	14	import com.ibm.icu.text.MessageFormat;
15	import java.util.*;	15	import java.util.ArrayList;
		16	import java.util.HashMap;
		17	import java.util.Iterator;
16	import java.util.List;	18	import java.util.List;
		19	import java.util.Map;
		20	import java.util.MissingResourceException;
		21	import java.util.ResourceBundle;
17		22
18	import org.eclipse.swt.widgets.*;	23	import org.eclipse.swt.widgets.*;
19		24

Lines 11-18 Link Here

(-)compare/org/eclipse/compare/internal/AddFromHistoryDialog.java (-2 / +7 lines)
11	package org.eclipse.compare.internal;	11	package org.eclipse.compare.internal;
12		12
13	import java.io.*;	13	import java.io.*;
14	import java.text.*;	14	import com.ibm.icu.text.DateFormat;
15	import java.util.*;	15	import com.ibm.icu.text.MessageFormat;
		16	import java.util.ArrayList;
		17	import com.ibm.icu.util.Calendar;
		18	import java.util.Date;
		19	import java.util.Iterator;
		20	import java.util.ResourceBundle;
16		21
17	import org.eclipse.swt.SWT;	22	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.events.*;	23	import org.eclipse.swt.events.*;

Lines 12-18 Link Here

(-)compare/org/eclipse/compare/internal/BinaryCompareViewer.java (-1 / +1 lines)
12		12
13	import java.io.*;	13	import java.io.*;
14	import java.util.ResourceBundle;	14	import java.util.ResourceBundle;
15	import java.text.MessageFormat;	15	import com.ibm.icu.text.MessageFormat;
16		16
17	import org.eclipse.swt.SWT;	17	import org.eclipse.swt.SWT;
18	import org.eclipse.swt.widgets.*;	18	import org.eclipse.swt.widgets.*;

Lines 10-16 Link Here

(-)compare/org/eclipse/compare/structuremergeviewer/DiffNode.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare.structuremergeviewer;	11	package org.eclipse.compare.structuremergeviewer;
12		12
13	import java.text.MessageFormat;	13	import com.ibm.icu.text.MessageFormat;
14		14
15	import org.eclipse.swt.graphics.Image;	15	import org.eclipse.swt.graphics.Image;
16		16

Lines 11-18 Link Here

(-)compare/org/eclipse/compare/structuremergeviewer/Differencer.java (-2 / +8 lines)
11	package org.eclipse.compare.structuremergeviewer;	11	package org.eclipse.compare.structuremergeviewer;
12		12
13	import java.io.*;	13	import java.io.*;
14	import java.util.*;	14	import java.util.ArrayList;
15	import java.text.MessageFormat;	15	import java.util.HashMap;
		16	import java.util.HashSet;
		17	import java.util.Iterator;
		18	import java.util.List;
		19	import java.util.Map;
		20	import java.util.Set;
		21	import com.ibm.icu.text.MessageFormat;
16		22
17	import org.eclipse.jface.util.Assert;	23	import org.eclipse.jface.util.Assert;
18		24

Lines 11-17 Link Here

(-)compare/org/eclipse/compare/internal/patch/LineReader.java (-1 / +2 lines)
11	package org.eclipse.compare.internal.patch;	11	package org.eclipse.compare.internal.patch;
12		12
13	import java.io.*;	13	import java.io.*;
14	import java.util.*;	14	import java.util.ArrayList;
		15	import java.util.List;
15		16
16	import org.eclipse.jface.util.Assert;	17	import org.eclipse.jface.util.Assert;
17		18

Lines 12-19 Link Here

(-)compare/org/eclipse/compare/internal/patch/Patcher.java (-2 / +9 lines)
12	package org.eclipse.compare.internal.patch;	12	package org.eclipse.compare.internal.patch;
13		13
14	import java.io.*;	14	import java.io.*;
15	import java.text.*;	15	import com.ibm.icu.text.DateFormat;
16	import java.util.*;	16	import com.ibm.icu.text.SimpleDateFormat;
		17	import java.text.ParseException;
		18	import java.util.ArrayList;
		19	import java.util.Date;
		20	import java.util.Iterator;
		21	import java.util.List;
		22	import java.util.Locale;
		23	import java.util.StringTokenizer;
17		24
18	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
19	import org.eclipse.swt.widgets.Shell;	26	import org.eclipse.swt.widgets.Shell;

Lines 14-20 Link Here

(-)compare/org/eclipse/compare/internal/patch/PreviewPatchPage.java (-1 / +1 lines)
14	import java.io.ByteArrayInputStream;	14	import java.io.ByteArrayInputStream;
15	import java.io.InputStream;	15	import java.io.InputStream;
16	import java.lang.reflect.InvocationTargetException;	16	import java.lang.reflect.InvocationTargetException;
17	import java.text.MessageFormat;	17	import com.ibm.icu.text.MessageFormat;
18	import java.util.ArrayList;	18	import java.util.ArrayList;
19	import java.util.Iterator;	19	import java.util.Iterator;
20	import java.util.List;	20	import java.util.List;

Lines 10-16 Link Here

(-)compare/org/eclipse/compare/internal/patch/PatchTargetPage.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare.internal.patch;	11	package org.eclipse.compare.internal.patch;
12		12
13	import java.text.MessageFormat;	13	import com.ibm.icu.text.MessageFormat;
14		14
15	import org.eclipse.compare.internal.ICompareContextIds;	15	import org.eclipse.compare.internal.ICompareContextIds;
16	import org.eclipse.compare.internal.Utilities;	16	import org.eclipse.compare.internal.Utilities;

Lines 18-24 Link Here

(-)compare/org/eclipse/compare/internal/patch/InputPatchPage.java (-1 / +1 lines)
18	import java.io.IOException;	18	import java.io.IOException;
19	import java.io.Reader;	19	import java.io.Reader;
20	import java.io.StringReader;	20	import java.io.StringReader;
21	import java.text.MessageFormat;	21	import com.ibm.icu.text.MessageFormat;
22		22
23	import org.eclipse.compare.internal.ICompareContextIds;	23	import org.eclipse.compare.internal.ICompareContextIds;
24	import org.eclipse.compare.internal.Utilities;	24	import org.eclipse.compare.internal.Utilities;

Lines 11-17 Link Here

(-)compare/org/eclipse/compare/ZipFileStructureCreator.java (-1 / +2 lines)
11	package org.eclipse.compare;	11	package org.eclipse.compare;
12		12
13	import java.io.*;	13	import java.io.*;
14	import java.util.*;	14	import java.util.HashMap;
		15	import java.util.Iterator;
15	import java.util.zip.*;	16	import java.util.zip.*;
16		17
17	import org.eclipse.core.runtime.CoreException;	18	import org.eclipse.core.runtime.CoreException;

Lines 10-16 Link Here

(-)compare/org/eclipse/compare/CompareViewerSwitchingPane.java (-1 / +1 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare;	11	package org.eclipse.compare;
12		12
13	import java.text.MessageFormat;	13	import com.ibm.icu.text.MessageFormat;
14		14
15	import org.eclipse.swt.events.*;	15	import org.eclipse.swt.events.*;
16	import org.eclipse.swt.graphics.Image;	16	import org.eclipse.swt.graphics.Image;

Lines 18-26 Link Here

(-)compare/org/eclipse/compare/EditionSelectionDialog.java (-2 / +3 lines)
18	import java.util.ArrayList;	18	import java.util.ArrayList;
19	import java.util.Iterator;	19	import java.util.Iterator;
20	import java.util.HashSet;	20	import java.util.HashSet;
21	import java.util.Calendar;	21	import com.ibm.icu.util.Calendar;
22	import java.util.Comparator;	22	import java.util.Comparator;
23	import java.text.*;	23	import com.ibm.icu.text.DateFormat;
		24	import com.ibm.icu.text.MessageFormat;
24		25
25	import org.eclipse.swt.SWT;	26	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.events.*;	27	import org.eclipse.swt.events.*;

Lines 22-24 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
22	org.eclipse.ui.workbench.texteditor;bundle-version="[3.1.0,4.0.0)",	22	org.eclipse.ui.workbench.texteditor;bundle-version="[3.1.0,4.0.0)",
23	org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"	23	org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)"
24	Eclipse-LazyStart: true	24	Eclipse-LazyStart: true
		25	Import-Package: com.ibm.icu.text

Return to bug 135768