#17889: Should not assume type of PropertyChangeEvent values

2 files changed, 13 insertions, 27 deletions

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index f9d371eb5..ffccf4805 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -139,8 +139,13 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
 		fDirtyStateListener= new IPropertyChangeListener() {

 			public void propertyChange(PropertyChangeEvent e) {

 				String propertyName= e.getProperty();

-				if (CompareEditorInput.DIRTY_STATE.equals(propertyName))

-					setDirty(e.getSource(), Utilities.getValue(e, false));					

+				if (CompareEditorInput.DIRTY_STATE.equals(propertyName)) {

+					boolean changed= false;

+					Object newValue= e.getNewValue();

+					if (newValue instanceof Boolean)

+						changed= ((Boolean)newValue).booleanValue();

+					setDirty(e.getSource(), changed);

+				}			

 			}

 		};

 

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index 0a81cc115..2a179b3f7 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -5,29 +5,20 @@
 package org.eclipse.compare.internal;

 

 import java.io.*;

-import java.util.List;

-import java.util.ArrayList;

-import java.util.ResourceBundle;

-import java.util.MissingResourceException;

 import java.text.MessageFormat;

+import java.util.*;

 

 import org.eclipse.swt.widgets.*;

 

-import org.eclipse.jface.util.*;

-import org.eclipse.jface.text.Document;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.viewers.ISelection;

-import org.eclipse.jface.viewers.IStructuredSelection;

 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.resource.ImageDescriptor;

+import org.eclipse.jface.util.*;

+import org.eclipse.jface.viewers.*;

 

-import org.eclipse.core.runtime.IAdaptable;

 import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IAdaptable;

 

-import org.eclipse.ui.IActionBars;

-import org.eclipse.ui.IViewPart;

+import org.eclipse.ui.*;

 

 import org.eclipse.compare.CompareConfiguration;

 

@@ -67,16 +58,6 @@ public class Utilities {
 		return dflt;

 	}

 	

-	/**

-	 * Retrieves the value from a property change event as a boolean.

-	 */

-	public static boolean getValue(PropertyChangeEvent event, boolean dflt) {

-		Object newValue= event.getNewValue();

-		if (newValue instanceof Boolean)

-			return ((Boolean)newValue).booleanValue();

-		return dflt;

-	}

-	

 	public static void firePropertyChange(ListenerList ll, Object source, String property, Object old, Object newValue) {

 		if (ll != null) {

 			PropertyChangeEvent event= null;

@@ -120,7 +101,7 @@ public class Utilities {
 	 */

 	public static IResource[] getResources(ISelection selection) {

 		

-		List tmp= new ArrayList();

+		ArrayList tmp= new ArrayList();

 

 		if (selection instanceof IStructuredSelection) {