Attachment #96993 for bug #224588




/*******************************************************************************
 * Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

		fDiffs = patchReader.getDiffs();
	}
	
	public void countLines() {
		FileDiff[] fileDiffs = getDiffs();
		for (int i = 0; i < fileDiffs.length; i++) {
			int addedLines = 0;
			int removedLines = 0;
			FileDiff fileDiff = fileDiffs[i];
			for (int j = 0; j < fileDiff.getHunkCount(); j++) {
				Hunk hunk = fileDiff.getHunks()[j];
				String[] lines = hunk.getLines();
				for (int k = 0; k < lines.length; k++) {
					char c = lines[k].charAt(0);
					switch (c) {
					case '+':
						addedLines++;
						continue;
					case '-':
						removedLines++;
						continue;
					}
				}
			}
			fileDiff.setAddedLines(addedLines);
			fileDiff.setRemovedLines(removedLines);
		}
	}
	
	//---- applying a patch file

	public void applyAll(IProgressMonitor pm, Shell shell, String title) throws CoreException {

Lines 102-107 Link Here

(-)compare/org/eclipse/compare/internal/patch/PatchMessages.properties (+1 lines)
102	PreviewPatchPage_FuzzUsed=(fuzz factor used: {0})	102	PreviewPatchPage_FuzzUsed=(fuzz factor used: {0})
103	PreviewPatchPage_AllContextIgnored=(fuzz factor used: {0}, all context lines ignored)	103	PreviewPatchPage_AllContextIgnored=(fuzz factor used: {0}, all context lines ignored)
104	PreviewPatchPage2_ShowMatched=Show &matched hunks	104	PreviewPatchPage2_ShowMatched=Show &matched hunks
		105	PreviewPatchPage2_AddedRemovedLines=Patch contains {0} added and {1} removed line(s).
105	PreviewPatchLabelDecorator_ProjectDoesNotExist=(Project does not exist in workspace)	106	PreviewPatchLabelDecorator_ProjectDoesNotExist=(Project does not exist in workspace)
106		107
107	#	108	#

Lines 105-110 Link Here

(-)compare/org/eclipse/compare/internal/patch/PatchMessages.java (+1 lines)
105	public static String PreviewPatchPage2_RetargetAction;	105	public static String PreviewPatchPage2_RetargetAction;
106	public static String PreviewPatchPage2_RetargetTooltip;	106	public static String PreviewPatchPage2_RetargetTooltip;
107	public static String PreviewPatchPage2_ShowMatched;	107	public static String PreviewPatchPage2_ShowMatched;
		108	public static String PreviewPatchPage2_AddedRemovedLines;
108	public static String RetargetPatchElementDialog_0;	109	public static String RetargetPatchElementDialog_0;
109	public static String RetargetPatchElementDialog_1;	110	public static String RetargetPatchElementDialog_1;
110	}	111	}





import java.lang.reflect.InvocationTargetException;
import java.util.Iterator;
import java.util.regex.Pattern;

import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.CompareUI;
import org.eclipse.compare.internal.ComparePreferencePage;
import org.eclipse.compare.internal.CompareUIPlugin;
import org.eclipse.compare.internal.ICompareUIConstants;
import org.eclipse.core.runtime.Assert;

import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;

import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;

	
	private Combo fStripPrefixSegments;
	private Text fFuzzField;
	private Label addedRemovedLines;
	
	private Action fExcludeAction;
	private Action fIncludeAction;

			}});

		c.setLayoutData(new GridData(GridData.FILL_BOTH));
		
		addedRemovedLines = new Label(composite, SWT.NONE);
		addedRemovedLines.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
				| GridData.VERTICAL_ALIGN_BEGINNING));
			
		setControl(composite);
		
		restoreWidgetValues();

			// TODO: We should only do this if the tree needs to be rebuilt
			rebuildTree();
			updateEnablements();
			addedRemovedLines.setText(countLines());
		}
	}
	

	void saveWidgetValues() {
		settings.put(EXPAND_PATCH_OPTIONS, patchOptions.isExpanded());
	}
	
	private String countLines() {
		int added = 0, removed = 0;
		
		IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore();
		String addedLinesRegex = store.getString(ComparePreferencePage.ADDED_LINES_REGEX);
		String removedLinesRegex = store.getString(ComparePreferencePage.REMOVED_LINES_REGEX);
		
		if ((addedLinesRegex == null || "".equals(addedLinesRegex)) //$NON-NLS-1$
				&& (removedLinesRegex == null || "".equals(removedLinesRegex))) { //$NON-NLS-1$
			
			fPatcher.countLines();
			FileDiff[] fileDiffs = fPatcher.getDiffs();
			for (int i = 0; i < fileDiffs.length; i++) {
				added += fileDiffs[i].getAddedLines();
				removed += fileDiffs[i].getRemovedLines();
			}
			
		} else {

			Pattern addedPattern = Pattern.compile(addedLinesRegex);
			Pattern removedPattern = Pattern.compile(removedLinesRegex);

			FileDiff[] fileDiffs = fPatcher.getDiffs();
			for (int i = 0; i < fileDiffs.length; i++) {
				Hunk[] hunks = fileDiffs[i].getHunks();
				for (int j = 0; j < hunks.length; j++) {
					String[] lines = hunks[j].getLines();
					for (int k = 0; k < lines.length; k++) {
						String line = lines[k];
						if (addedPattern.matcher(line).find())
							added++;
						if (removedPattern.matcher(line).find())
							removed++;
					}
				}
			}
		}
		
		return NLS.bind(PatchMessages.PreviewPatchPage2_AddedRemovedLines,
				new String[] { added + "", removed + "" }); //$NON-NLS-1$ //$NON-NLS-2$
	}


}

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/internal/patch/FileDiff.java (-5 / +28 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2006, 2007 IBM Corporation and others.	2	* Copyright (c) 2006, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 10-21 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.compare.internal.patch;	11	package org.eclipse.compare.internal.patch;
12		12
13	import java.util.*;	13	import java.util.ArrayList;
14		14	import java.util.Iterator;
15	import org.eclipse.compare.patch.*;	15	import java.util.List;
		16
		17	import org.eclipse.compare.patch.IFilePatch;
		18	import org.eclipse.compare.patch.IFilePatchResult;
		19	import org.eclipse.compare.patch.PatchConfiguration;
16	import org.eclipse.compare.structuremergeviewer.Differencer;	20	import org.eclipse.compare.structuremergeviewer.Differencer;
17	import org.eclipse.core.resources.IStorage;	21	import org.eclipse.core.resources.IStorage;
18	import org.eclipse.core.runtime.*;	22	import org.eclipse.core.runtime.IPath;
		23	import org.eclipse.core.runtime.IProgressMonitor;
		24	import org.eclipse.core.runtime.Path;
19		25
20	/**	26	/**
21	* A file diff represents a set of hunks that were associated with the	27	* A file diff represents a set of hunks that were associated with the
Lines 28-33 Link Here
28	private List fHunks= new ArrayList();	34	private List fHunks= new ArrayList();
29	private DiffProject fProject; //the project that contains this diff	35	private DiffProject fProject; //the project that contains this diff
30	private String header;	36	private String header;
		37	private int addedLines, removedLines;
31		38
32	/**	39	/**
33	* Create a file diff for the given path and date information.	40	* Create a file diff for the given path and date information.
Lines 222-225 Link Here
222	return newDate;	229	return newDate;
223	}	230	}
224		231
		232	public void setAddedLines(int addedLines) {
		233	this.addedLines = addedLines;
		234	}
		235
		236	public void setRemovedLines(int removedLines) {
		237	this.removedLines = removedLines;
		238	}
		239
		240	public int getAddedLines() {
		241	return addedLines;
		242	}
		243
		244	public int getRemovedLines() {
		245	return removedLines;
		246	}
		247
225	}	248	}




/*******************************************************************************
 * Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 *******************************************************************************/
package org.eclipse.compare.internal;

import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.IEncodedStreamContentAccessor;
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.compare.structuremergeviewer.Differencer;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jface.preference.RadioGroupFieldEditor;
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.PreferenceLinkArea;
import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
import org.eclipse.ui.texteditor.AbstractTextEditor;

import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.*;
import org.eclipse.swt.widgets.*;

import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.*;
import org.eclipse.jface.util.*;

import org.eclipse.compare.*;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.compare.structuremergeviewer.*;


public class ComparePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
	

	public static final String HIGHLIGHT_TOKEN_CHANGES= PREFIX + "HighlightTokenChanges"; //$NON-NLS-1$
	//public static final String USE_RESOLVE_UI= PREFIX + "UseResolveUI"; //$NON-NLS-1$
	public static final String PATH_FILTER= PREFIX + "PathFilter"; //$NON-NLS-1$
	public static final String ADDED_LINES_REGEX= PREFIX + "AddedLinesRegex"; //$NON-NLS-1$
	public static final String REMOVED_LINES_REGEX= PREFIX + "RemovedLinesRegex"; //$NON-NLS-1$
	
	
	private TextMergeViewer fPreviewViewer;

	private OverlayPreferenceStore fOverlayStore;
	private Map fCheckBoxes= new HashMap();
	private Text fFilters;
	private Text addedLinesRegex;
	private Text removedLinesRegex;
	private SelectionListener fCheckBoxListener;



		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, SHOW_MORE_INFO),
		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, IGNORE_WHITESPACE),
		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, PREF_SAVE_ALL_EDITORS),
		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, ADDED_LINES_REGEX),
		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, REMOVED_LINES_REGEX),
		
		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND),
		new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT),

		store.setDefault(SHOW_MORE_INFO, false);
		store.setDefault(IGNORE_WHITESPACE, false);
		store.setDefault(PREF_SAVE_ALL_EDITORS, false);
		store.setDefault(ADDED_LINES_REGEX, ""); //$NON-NLS-1$
		store.setDefault(REMOVED_LINES_REGEX, ""); //$NON-NLS-1$
		//store.setDefault(USE_SPLINES, false);
		store.setDefault(USE_SINGLE_LINE, true);
		store.setDefault(HIGHLIGHT_TOKEN_CHANGES, true);

	 * @see PreferencePage#performOk()
	 */
	public boolean performOk() {
		fOverlayStore.setValue(ADDED_LINES_REGEX, addedLinesRegex.getText());
		fOverlayStore.setValue(REMOVED_LINES_REGEX, removedLinesRegex.getText());
		
		fOverlayStore.propagate();
		editor.store();
		return true;

		new Label(composite, SWT.NONE);
		
		Label l= new Label(composite, SWT.WRAP);
		l.setText(Utilities.getString("ComparePreferencePage.regex.description")); //$NON-NLS-1$
		
		Composite c2= new Composite(composite, SWT.NONE);
		c2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));

		c2.setLayout(layout);
		
		l= new Label(c2, SWT.NONE);
		l.setText(Utilities.getString("ComparePreferencePage.regexAdded.label")); //$NON-NLS-1$
		addedLinesRegex = new Text(c2, SWT.BORDER);
		addedLinesRegex.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		addedLinesRegex.setText(fOverlayStore.getString(ADDED_LINES_REGEX));
		
		l= new Label(c2, SWT.NONE);
		l.setText(Utilities.getString("ComparePreferencePage.regexRemoved.label")); //$NON-NLS-1$
		removedLinesRegex = new Text(c2, SWT.BORDER);
		removedLinesRegex.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		removedLinesRegex.setText(fOverlayStore.getString(REMOVED_LINES_REGEX));

		// a spacer
		new Label(composite, SWT.NONE);
		
		l= new Label(composite, SWT.WRAP);
		l.setText(Utilities.getString("ComparePreferencePage.filter.description")); //$NON-NLS-1$
		
		Composite c3= new Composite(composite, SWT.NONE);
		c3.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		layout= new GridLayout(2, false);
		layout.marginWidth= 0;
		c3.setLayout(layout);
		
		l= new Label(c3, SWT.NONE);
		l.setText(Utilities.getString("ComparePreferencePage.filter.label")); //$NON-NLS-1$
		
		fFilters= new Text(c3, SWT.BORDER);
		fFilters.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		fFilters.setText(fOverlayStore.getString(PATH_FILTER));
		fFilters.addModifyListener(

		
		if (fFilters != null)
			fFilters.setText(fOverlayStore.getString(PATH_FILTER));
		if (addedLinesRegex != null)
			addedLinesRegex.setText(fOverlayStore.getString(ADDED_LINES_REGEX));
		if (removedLinesRegex != null)
			removedLinesRegex.setText(fOverlayStore.getString(REMOVED_LINES_REGEX));
		
		editor.load();
	}

Lines 110-115 Link Here

(-)plugin.properties (+4 lines)
110	ComparePreferencePage.ignoreWhitespace.label= Ignore &white space	110	ComparePreferencePage.ignoreWhitespace.label= Ignore &white space
111	ComparePreferencePage.saveBeforePatching.label= A&utomatically save dirty editors before browsing patches	111	ComparePreferencePage.saveBeforePatching.label= A&utomatically save dirty editors before browsing patches
112		112
		113	ComparePreferencePage.regex.description=Enter regular expressions used to identify an added or removed line in a patch\n(e.g. '^\\+\\s*\\S' for an added line with at least one word character).
		114	ComparePreferencePage.regexAdded.label=Added lines
		115	ComparePreferencePage.regexRemoved.label=Removed lines
		116
113	ComparePreferencePage.filter.description= Enter member names that should be excluded from 'Compare With Each Other'.\nList is comma separated (e.g. '*.class, .project, bin/')	117	ComparePreferencePage.filter.description= Enter member names that should be excluded from 'Compare With Each Other'.\nList is comma separated (e.g. '*.class, .project, bin/')
114	ComparePreferencePage.filter.label= &Filtered Members:	118	ComparePreferencePage.filter.label= &Filtered Members:
115	ComparePreferencePage.filter.invalidsegment.error= Filter is invalid: {0}	119	ComparePreferencePage.filter.invalidsegment.error= Filter is invalid: {0}

Return to bug 224588

Lines 1-5 Link Here

(-)compare/org/eclipse/compare/internal/patch/Patcher.java (-1 / +27 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2007 IBM Corporation and others.	2	* Copyright (c) 2000, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 179-184 Link Here
179	fDiffs = patchReader.getDiffs();	179	fDiffs = patchReader.getDiffs();
180	}	180	}
181		181
		182	public void countLines() {
		183	FileDiff[] fileDiffs = getDiffs();
		184	for (int i = 0; i < fileDiffs.length; i++) {
		185	int addedLines = 0;
		186	int removedLines = 0;
		187	FileDiff fileDiff = fileDiffs[i];
		188	for (int j = 0; j < fileDiff.getHunkCount(); j++) {
		189	Hunk hunk = fileDiff.getHunks()[j];
		190	String[] lines = hunk.getLines();
		191	for (int k = 0; k < lines.length; k++) {
		192	char c = lines[k].charAt(0);
		193	switch (c) {
		194	case '+':
		195	addedLines++;
		196	continue;
		197	case '-':
		198	removedLines++;
		199	continue;
		200	}
		201	}
		202	}
		203	fileDiff.setAddedLines(addedLines);
		204	fileDiff.setRemovedLines(removedLines);
		205	}
		206	}
		207
182	//---- applying a patch file	208	//---- applying a patch file
183		209
184	public void applyAll(IProgressMonitor pm, Shell shell, String title) throws CoreException {	210	public void applyAll(IProgressMonitor pm, Shell shell, String title) throws CoreException {

Lines 12-20 Link Here

(-)compare/org/eclipse/compare/internal/patch/PreviewPatchPage2.java (-1 / +53 lines)
12		12
13	import java.lang.reflect.InvocationTargetException;	13	import java.lang.reflect.InvocationTargetException;
14	import java.util.Iterator;	14	import java.util.Iterator;
		15	import java.util.regex.Pattern;
15		16
16	import org.eclipse.compare.CompareConfiguration;	17	import org.eclipse.compare.CompareConfiguration;
17	import org.eclipse.compare.CompareUI;	18	import org.eclipse.compare.CompareUI;
		19	import org.eclipse.compare.internal.ComparePreferencePage;
18	import org.eclipse.compare.internal.CompareUIPlugin;	20	import org.eclipse.compare.internal.CompareUIPlugin;
19	import org.eclipse.compare.internal.ICompareUIConstants;	21	import org.eclipse.compare.internal.ICompareUIConstants;
20	import org.eclipse.core.runtime.Assert;	22	import org.eclipse.core.runtime.Assert;
Lines 27-32 Link Here
27	import org.eclipse.jface.dialogs.IDialogConstants;	29	import org.eclipse.jface.dialogs.IDialogConstants;
28	import org.eclipse.jface.dialogs.IDialogSettings;	30	import org.eclipse.jface.dialogs.IDialogSettings;
29	import org.eclipse.jface.operation.IRunnableWithProgress;	31	import org.eclipse.jface.operation.IRunnableWithProgress;
		32	import org.eclipse.jface.preference.IPreferenceStore;
30	import org.eclipse.jface.resource.JFaceResources;	33	import org.eclipse.jface.resource.JFaceResources;
31	import org.eclipse.jface.util.IPropertyChangeListener;	34	import org.eclipse.jface.util.IPropertyChangeListener;
32	import org.eclipse.jface.util.PropertyChangeEvent;	35	import org.eclipse.jface.util.PropertyChangeEvent;
Lines 37-42 Link Here
37	import org.eclipse.jface.viewers.TreeSelection;	40	import org.eclipse.jface.viewers.TreeSelection;
38	import org.eclipse.jface.window.Window;	41	import org.eclipse.jface.window.Window;
39	import org.eclipse.jface.wizard.WizardPage;	42	import org.eclipse.jface.wizard.WizardPage;
		43	import org.eclipse.osgi.util.NLS;
40	import org.eclipse.swt.SWT;	44	import org.eclipse.swt.SWT;
41	import org.eclipse.swt.events.ModifyEvent;	45	import org.eclipse.swt.events.ModifyEvent;
42	import org.eclipse.swt.events.ModifyListener;	46	import org.eclipse.swt.events.ModifyListener;
Lines 73-78 Link Here
73		77
74	private Combo fStripPrefixSegments;	78	private Combo fStripPrefixSegments;
75	private Text fFuzzField;	79	private Text fFuzzField;
		80	private Label addedRemovedLines;
76		81
77	private Action fExcludeAction;	82	private Action fExcludeAction;
78	private Action fIncludeAction;	83	private Action fIncludeAction;
Lines 148-154 Link Here
148	}});	153	}});
149		154
150	c.setLayoutData(new GridData(GridData.FILL_BOTH));	155	c.setLayoutData(new GridData(GridData.FILL_BOTH));
151		156
		157	addedRemovedLines = new Label(composite, SWT.NONE);
		158	addedRemovedLines.setLayoutData(new GridData(GridData.FILL_HORIZONTAL
		159	\| GridData.VERTICAL_ALIGN_BEGINNING));
		160
152	setControl(composite);	161	setControl(composite);
153		162
154	restoreWidgetValues();	163	restoreWidgetValues();
Lines 332-337 Link Here
332	// TODO: We should only do this if the tree needs to be rebuilt	341	// TODO: We should only do this if the tree needs to be rebuilt
333	rebuildTree();	342	rebuildTree();
334	updateEnablements();	343	updateEnablements();
		344	addedRemovedLines.setText(countLines());
335	}	345	}
336	}	346	}
337		347
Lines 670-675 Link Here
670	void saveWidgetValues() {	680	void saveWidgetValues() {
671	settings.put(EXPAND_PATCH_OPTIONS, patchOptions.isExpanded());	681	settings.put(EXPAND_PATCH_OPTIONS, patchOptions.isExpanded());
672	}	682	}
		683
		684	private String countLines() {
		685	int added = 0, removed = 0;
		686
		687	IPreferenceStore store = CompareUIPlugin.getDefault().getPreferenceStore();
		688	String addedLinesRegex = store.getString(ComparePreferencePage.ADDED_LINES_REGEX);
		689	String removedLinesRegex = store.getString(ComparePreferencePage.REMOVED_LINES_REGEX);
		690
		691	if ((addedLinesRegex == null \|\| "".equals(addedLinesRegex)) //$NON-NLS-1$
		692	&& (removedLinesRegex == null \|\| "".equals(removedLinesRegex))) { //$NON-NLS-1$
		693
		694	fPatcher.countLines();
		695	FileDiff[] fileDiffs = fPatcher.getDiffs();
		696	for (int i = 0; i < fileDiffs.length; i++) {
		697	added += fileDiffs[i].getAddedLines();
		698	removed += fileDiffs[i].getRemovedLines();
		699	}
		700
		701	} else {
		702
		703	Pattern addedPattern = Pattern.compile(addedLinesRegex);
		704	Pattern removedPattern = Pattern.compile(removedLinesRegex);
		705
		706	FileDiff[] fileDiffs = fPatcher.getDiffs();
		707	for (int i = 0; i < fileDiffs.length; i++) {
		708	Hunk[] hunks = fileDiffs[i].getHunks();
		709	for (int j = 0; j < hunks.length; j++) {
		710	String[] lines = hunks[j].getLines();
		711	for (int k = 0; k < lines.length; k++) {
		712	String line = lines[k];
		713	if (addedPattern.matcher(line).find())
		714	added++;
		715	if (removedPattern.matcher(line).find())
		716	removed++;
		717	}
		718	}
		719	}
		720	}
		721
		722	return NLS.bind(PatchMessages.PreviewPatchPage2_AddedRemovedLines,
		723	new String[] { added + "", removed + "" }); //$NON-NLS-1$ //$NON-NLS-2$
		724	}
673		725
674		726
675	}	727	}