rename o.e.jpt.common.ui.internal.listeners to

o.e.jpt.common.ui.internal.swt.listeners; rename SWTListenerWrapperTools
to SWTListenerTools; convert implementations to package access

36 files changed, 86 insertions, 96 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF b/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
index 78eedf3f52..7bab11e490 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
+++ b/common/plugins/org.eclipse.jpt.common.ui/META-INF/MANIFEST.MF
@@ -46,10 +46,6 @@ Export-Package: org.eclipse.jpt.common.ui,
   x-friends:="org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.ui",
- org.eclipse.jpt.common.ui.internal.listeners;
-  x-friends:="org.eclipse.jpt.jaxb.ui,
-   org.eclipse.jpt.jpa.db.ui,
-   org.eclipse.jpt.jpa.ui",
  org.eclipse.jpt.common.ui.internal.model.value;
   x-friends:="org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db.ui,
@@ -78,6 +74,10 @@ Export-Package: org.eclipse.jpt.common.ui,
   x-friends:="org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db.ui,
    org.eclipse.jpt.jpa.ui",
+ org.eclipse.jpt.common.ui.internal.swt.listeners;
+  x-friends:="org.eclipse.jpt.jaxb.ui,
+   org.eclipse.jpt.jpa.db.ui,
+   org.eclipse.jpt.jpa.ui",
  org.eclipse.jpt.common.ui.internal.swt.widgets;
   x-friends:="org.eclipse.jpt.jaxb.ui,
    org.eclipse.jpt.jpa.db.ui,
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractModelItemLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractModelItemLabelProvider.java
index ea90165499..93de66963e 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractModelItemLabelProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/AbstractModelItemLabelProvider.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.common.ui.internal.jface;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.ui.jface.ItemLabelProvider;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
@@ -101,7 +101,7 @@ public abstract class AbstractModelItemLabelProvider<M extends ItemLabelProvider
 	}
 
 	private PropertyChangeListener buildImageDescriptorListener() {
-		return SWTListenerWrapperTools.wrap(this.buildImageDescriptorListener_(), this.manager.getViewer());
+		return SWTListenerTools.wrap(this.buildImageDescriptorListener_(), this.manager.getViewer());
 	}
 
 	private PropertyChangeListener buildImageDescriptorListener_() {
@@ -137,7 +137,7 @@ public abstract class AbstractModelItemLabelProvider<M extends ItemLabelProvider
 	}
 
 	private PropertyChangeListener buildTextListener() {
-		return SWTListenerWrapperTools.wrap(this.buildTextListener_(), this.manager.getViewer());
+		return SWTListenerTools.wrap(this.buildTextListener_(), this.manager.getViewer());
 	}
 
 	private PropertyChangeListener buildTextListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ModelItemContentProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ModelItemContentProvider.java
index e9a7c31cbd..56c64548fe 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ModelItemContentProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ModelItemContentProvider.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.common.ui.internal.jface;
 
 import java.util.ConcurrentModificationException;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.ui.jface.ItemContentProvider;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -77,7 +77,7 @@ abstract class ModelItemContentProvider<M extends ItemContentProvider.Manager>
 	}
 
 	private CollectionChangeListener buildChildrenListener() {
-		return SWTListenerWrapperTools.wrap(this.buildChildrenListener_(), this.manager.getViewer());
+		return SWTListenerTools.wrap(this.buildChildrenListener_(), this.manager.getViewer());
 	}
 
 	private CollectionChangeListener buildChildrenListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ModelItemExtendedLabelProvider.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ModelItemExtendedLabelProvider.java
index 12ca0263a2..a7868b8e74 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ModelItemExtendedLabelProvider.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/jface/ModelItemExtendedLabelProvider.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.common.ui.internal.jface;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeAdapter;
@@ -64,7 +64,7 @@ public class ModelItemExtendedLabelProvider
 	}
 
 	private PropertyChangeListener buildDescriptionListener() {
-		return SWTListenerWrapperTools.wrap(this.buildDescriptionListener_(), this.manager.getViewer());
+		return SWTListenerTools.wrap(this.buildDescriptionListener_(), this.manager.getViewer());
 	}
 
 	private PropertyChangeListener buildDescriptionListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/AbstractComboModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/AbstractComboModelAdapter.java
index e0a5d8e5f3..eb5cea5010 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/AbstractComboModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/AbstractComboModelAdapter.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.common.ui.internal.swt;
 import java.util.EventListener;
 import java.util.EventObject;
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.ListenerList;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -173,7 +173,7 @@ public abstract class AbstractComboModelAdapter<E> {
 	// ********** initialization **********
 
 	protected ListChangeListener buildListChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildListChangeListener_());
+		return SWTListenerTools.wrap(this.buildListChangeListener_());
 	}
 
 	protected ListChangeListener buildListChangeListener_() {
@@ -204,7 +204,7 @@ public abstract class AbstractComboModelAdapter<E> {
 	}
 
 	protected PropertyChangeListener buildSelectedItemChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildSelectedItemChangeListener_());
+		return SWTListenerTools.wrap(this.buildSelectedItemChangeListener_());
 	}
 
 	protected PropertyChangeListener buildSelectedItemChangeListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/DateTimeModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/DateTimeModelAdapter.java
index a0ace2ae03..972348f4c0 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/DateTimeModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/DateTimeModelAdapter.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.swt;
 
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
@@ -146,7 +146,7 @@ public class DateTimeModelAdapter {
 	// ********** initialization **********
 
 	protected PropertyChangeListener buildHoursPropertyChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildHoursPropertyChangeListener_(), this.dateTime);
+		return SWTListenerTools.wrap(this.buildHoursPropertyChangeListener_(), this.dateTime);
 	}
 
 	protected PropertyChangeListener buildHoursPropertyChangeListener_() {
@@ -162,7 +162,7 @@ public class DateTimeModelAdapter {
 	}
 	
 	protected PropertyChangeListener buildMinutesPropertyChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildMinutesPropertyChangeListener_(), this.dateTime);
+		return SWTListenerTools.wrap(this.buildMinutesPropertyChangeListener_(), this.dateTime);
 	}
 
 	protected PropertyChangeListener buildMinutesPropertyChangeListener_() {
@@ -178,7 +178,7 @@ public class DateTimeModelAdapter {
 	}
 	
 	protected PropertyChangeListener buildSecondsPropertyChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildSecondsPropertyChangeListener_(), this.dateTime);
+		return SWTListenerTools.wrap(this.buildSecondsPropertyChangeListener_(), this.dateTime);
 	}
 
 	protected PropertyChangeListener buildSecondsPropertyChangeListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/SpinnerModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/SpinnerModelAdapter.java
index 768f8788dc..dd671172f9 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/SpinnerModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/SpinnerModelAdapter.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.swt;
 
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
@@ -115,7 +115,7 @@ public class SpinnerModelAdapter {
 	// ********** initialization **********
 
 	protected PropertyChangeListener buildPropertyChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildPropertyChangeListener_(), this.spinner);
+		return SWTListenerTools.wrap(this.buildPropertyChangeListener_(), this.spinner);
 	}
 
 	protected PropertyChangeListener buildPropertyChangeListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableItemModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableItemModelAdapter.java
index 4aa949e8c9..a3567fa638 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableItemModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableItemModelAdapter.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.common.ui.internal.swt;
 
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.DisposeAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeAdapter;
@@ -117,7 +117,7 @@ public class TableItemModelAdapter {
 
 
 	protected PropertyChangeListener buildPropertyChangeListener(int index) {
-		return SWTListenerWrapperTools.wrap(this.buildPropertyChangeListener_(index), this.tableItem);
+		return SWTListenerTools.wrap(this.buildPropertyChangeListener_(index), this.tableItem);
 	}
 
 	protected PropertyChangeListener buildPropertyChangeListener_(int index) {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableModelAdapter.java
index bf4bb33957..d402a33992 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TableModelAdapter.java
@@ -16,7 +16,7 @@ import java.util.EventListener;
 import java.util.EventObject;
 import java.util.List;
 import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.ListenerList;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -229,7 +229,7 @@ public class TableModelAdapter<E> {
 	// ********** initialization **********
 
 	protected ListChangeListener buildListChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildListChangeListener_(), this.table);
+		return SWTListenerTools.wrap(this.buildListChangeListener_(), this.table);
 	}
 
 	protected ListChangeListener buildListChangeListener_() {
@@ -260,7 +260,7 @@ public class TableModelAdapter<E> {
 	}
 
 	protected CollectionChangeListener buildSelectedItemsChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildSelectedItemsChangeListener_(), this.table);
+		return SWTListenerTools.wrap(this.buildSelectedItemsChangeListener_(), this.table);
 	}
 
 	protected CollectionChangeListener buildSelectedItemsChangeListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TriStateCheckBoxModelAdapter.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TriStateCheckBoxModelAdapter.java
index 8b816ba6a5..39e7552947 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TriStateCheckBoxModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/TriStateCheckBoxModelAdapter.java
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.common.ui.internal.swt;
 
 import org.eclipse.core.runtime.Assert;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
@@ -97,7 +97,7 @@ public class TriStateCheckBoxModelAdapter {
 	// ********** initialization **********
 
 	protected PropertyChangeListener buildBooleanChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildBooleanChangeListener_(), this.button.getCheckBox());
+		return SWTListenerTools.wrap(this.buildBooleanChangeListener_(), this.button.getCheckBox());
 	}
 
 	protected PropertyChangeListener buildBooleanChangeListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/BooleanButtonModelBinding.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/BooleanButtonModelBinding.java
index ba93c5226f..890a41ca67 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/BooleanButtonModelBinding.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/BooleanButtonModelBinding.java
@@ -9,9 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.swt.bindings;
 
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.DisposeAdapter;
 import org.eclipse.jpt.common.ui.internal.swt.events.SelectionAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeAdapter;
@@ -103,7 +103,7 @@ final class BooleanButtonModelBinding {
 	// ********** initialization **********
 
 	private PropertyChangeListener buildBooleanListener() {
-		return SWTListenerWrapperTools.wrap(new BooleanListener(), this.button);
+		return SWTListenerTools.wrap(new BooleanListener(), this.button);
 	}
 
 	/* CU private */ class BooleanListener
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/BooleanControlStateModelBinding.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/BooleanControlStateModelBinding.java
index 675a86e4cc..def81df8da 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/BooleanControlStateModelBinding.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/BooleanControlStateModelBinding.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.swt.bindings;
 
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.DisposeAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeAdapter;
@@ -94,7 +94,7 @@ abstract class BooleanControlStateModelBinding<C extends Control> {
 	// ********** initialization **********
 
 	private PropertyChangeListener buildBooleanListener() {
-		return SWTListenerWrapperTools.wrap(new BooleanListener());
+		return SWTListenerTools.wrap(new BooleanListener());
 	}
 
 	/* CU private */ class BooleanListener
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/DropDownListBoxSelectionBinding.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/DropDownListBoxSelectionBinding.java
index fc4a77cdce..d071cc8ed7 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/DropDownListBoxSelectionBinding.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/DropDownListBoxSelectionBinding.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.common.ui.internal.swt.bindings;
 
 import java.util.ArrayList;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.SelectionAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeAdapter;
@@ -108,7 +108,7 @@ final class DropDownListBoxSelectionBinding<E>
 	// ********** initialization **********
 
 	private PropertyChangeListener buildSelectedItemListener() {
-		return SWTListenerWrapperTools.wrap(new SelectedItemListener(), this.dropdownListBox.getDisplay());
+		return SWTListenerTools.wrap(new SelectedItemListener(), this.dropdownListBox.getDisplay());
 	}
 
 	/* CU private */ class SelectedItemListener
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/LabelModelBinding.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/LabelModelBinding.java
index 5a913ae7d6..14cb8e3384 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/LabelModelBinding.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/LabelModelBinding.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.swt.bindings;
 
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.DisposeAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
@@ -89,7 +89,7 @@ class LabelModelBinding {
 	}
 
 	private PropertyChangeListener buildImageListener() {
-		return SWTListenerWrapperTools.wrap(new ImageListener(), this.labelAdapter.getWidget());
+		return SWTListenerTools.wrap(new ImageListener(), this.labelAdapter.getWidget());
 	}
 
 	/* CU private */ class ImageListener
@@ -102,7 +102,7 @@ class LabelModelBinding {
 	}
 
 	private PropertyChangeListener buildTextListener() {
-		return SWTListenerWrapperTools.wrap(new TextListener(), this.labelAdapter.getWidget());
+		return SWTListenerTools.wrap(new TextListener(), this.labelAdapter.getWidget());
 	}
 
 	/* CU private */ class TextListener
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/ListBoxSelectionBinding.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/ListBoxSelectionBinding.java
index acbed4ba42..b08aa5a9cf 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/ListBoxSelectionBinding.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/ListBoxSelectionBinding.java
@@ -11,8 +11,8 @@ package org.eclipse.jpt.common.ui.internal.swt.bindings;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.SelectionAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
@@ -132,7 +132,7 @@ final class ListBoxSelectionBinding<E>
 	// ********** initialization **********
 
 	private CollectionChangeListener buildSelectedItemsListener() {
-		return SWTListenerWrapperTools.wrap(new SelectedItemsListener(), this.listBox);
+		return SWTListenerTools.wrap(new SelectedItemsListener(), this.listBox);
 	}
 
 	/* CU private */ class SelectedItemsListener
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/ListWidgetModelBinding.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/ListWidgetModelBinding.java
index db992d4b24..2f2a98b921 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/ListWidgetModelBinding.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/ListWidgetModelBinding.java
@@ -10,8 +10,8 @@
 package org.eclipse.jpt.common.ui.internal.swt.bindings;
 
 import java.util.ArrayList;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.DisposeAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ArrayTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
@@ -121,7 +121,7 @@ final class ListWidgetModelBinding<E> {
 	// ********** initialization **********
 
 	private ListChangeListener buildListListener() {
-		return SWTListenerWrapperTools.wrap(new ListListener(), this.listWidget.getDisplay());
+		return SWTListenerTools.wrap(new ListListener(), this.listWidget.getDisplay());
 	}
 
 	/* CU private */ class ListListener
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/PageBookModelBinding.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/PageBookModelBinding.java
index d9643b0b1d..f622e27244 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/PageBookModelBinding.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/PageBookModelBinding.java
@@ -9,8 +9,8 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.swt.bindings;
 
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.DisposeAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.ui.internal.swt.widgets.ControlTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
@@ -105,7 +105,7 @@ final class PageBookModelBinding<T> {
 	}
 
 	private PropertyChangeListener buildValueListener() {
-		return SWTListenerWrapperTools.wrap(new ValueListener(), this.pageBook);
+		return SWTListenerTools.wrap(new ValueListener(), this.pageBook);
 	}
 
 	/* CU private */ class ValueListener
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/SWTBindingTools.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/SWTBindingTools.java
index d121c5bd10..b94b428fd5 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/SWTBindingTools.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/SWTBindingTools.java
@@ -13,8 +13,8 @@ import java.util.Arrays;
 import org.eclipse.jpt.common.utility.internal.BitTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.internal.model.value.ModifiablePropertyCollectionValueModelAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.NullCollectionValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.NullPropertyValueModel;
-import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.StaticCollectionValueModel;
 import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
@@ -341,7 +341,7 @@ public final class SWTBindingTools {
 	 * to be displayed in the list box.
 	 */
 	public static <E> void bind(ListValueModel<E> listModel, List listBox, Transformer<E, String> transformer) {
-		bind(listModel, new SWTListListWidgetAdapter<E>(listBox), transformer);
+		bind(listModel, new NullCollectionValueModel<E>(), new SWTListListWidgetAdapter<E>(listBox), transformer);
 	}
 
 	/**
@@ -432,16 +432,6 @@ public final class SWTBindingTools {
 	// ********** list "widget" **********
 
 	/**
-	 * Bind the specified model list to the specified list widget.
-	 * The list widget's selection is ignored.
-	 * Use the specified string converter to convert the model items to strings
-	 * to be displayed in the list box.
-	 */
-	private static <E> void bind(ListValueModel<E> listModel, ListWidgetModelBinding.ListWidget<E> listWidget, Transformer<E, String> transformer) {
-		bind(listModel, new SimpleCollectionValueModel<E>(), listWidget, transformer);
-	}
-
-	/**
 	 * Bind the specified model list and selectedions to the specified list widget.
 	 * Use the specified string converter to convert the model items to strings
 	 * to be displayed in the list box.
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/TextFieldModelBinding.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/TextFieldModelBinding.java
index a2119b9363..63edb4629e 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/TextFieldModelBinding.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/bindings/TextFieldModelBinding.java
@@ -9,9 +9,9 @@
  ******************************************************************************/
 package org.eclipse.jpt.common.ui.internal.swt.bindings;
 
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.DisposeAdapter;
 import org.eclipse.jpt.common.ui.internal.swt.events.ModifyAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeAdapter;
@@ -94,7 +94,7 @@ class TextFieldModelBinding {
 	// ********** initialization **********
 
 	private PropertyChangeListener buildTextListener() {
-		return SWTListenerWrapperTools.wrap(new TextListener(), this.textField);
+		return SWTListenerTools.wrap(new TextListener(), this.textField);
 	}
 
 	/* CU private */ class TextListener
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/AbstractSWTListenerWrapper.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/AbstractSWTListenerWrapper.java
index c461d7d2a5..cb2d91fd2d 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/AbstractSWTListenerWrapper.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/AbstractSWTListenerWrapper.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.listeners;
+package org.eclipse.jpt.common.ui.internal.swt.listeners;
 
 import java.util.EventListener;
 import java.util.EventObject;
@@ -19,14 +19,14 @@ import org.eclipse.swt.widgets.Display;
  * UI thread, asynchronously if necessary.
  * @see SWTListenerWrapperDelegate
  */
-public abstract class AbstractSWTListenerWrapper<E extends EventObject, L extends EventListener>
+abstract class AbstractSWTListenerWrapper<E extends EventObject, L extends EventListener>
 	implements SWTListenerWrapperDelegate.Wrapper<E>
 {
 	/* private-*/ protected final L listener;
 	/* private-*/ protected final SWTListenerWrapperDelegate<E> delegate;
 
 
-	protected AbstractSWTListenerWrapper(L listener, Display display, ExceptionHandler exceptionHandler) {
+	AbstractSWTListenerWrapper(L listener, Display display, ExceptionHandler exceptionHandler) {
 		super();
 		if (listener == null) {
 			throw new NullPointerException();
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTCollectionChangeListenerWrapper.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTCollectionChangeListenerWrapper.java
index 2b36997abc..1935383028 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTCollectionChangeListenerWrapper.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTCollectionChangeListenerWrapper.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.listeners;
+package org.eclipse.jpt.common.ui.internal.swt.listeners;
 
 import org.eclipse.jpt.common.utility.ExceptionHandler;
 import org.eclipse.jpt.common.utility.model.event.CollectionAddEvent;
@@ -22,11 +22,11 @@ import org.eclipse.swt.widgets.Display;
  * Wrap another collection change listener and forward events to it on the SWT
  * UI thread, asynchronously if necessary.
  */
-public class SWTCollectionChangeListenerWrapper
+class SWTCollectionChangeListenerWrapper
 	extends AbstractSWTListenerWrapper<CollectionEvent, CollectionChangeListener>
 	implements CollectionChangeListener
 {
-	public SWTCollectionChangeListenerWrapper(CollectionChangeListener listener, Display display, ExceptionHandler exceptionHandler) {
+	SWTCollectionChangeListenerWrapper(CollectionChangeListener listener, Display display, ExceptionHandler exceptionHandler) {
 		super(listener, display, exceptionHandler);
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTListChangeListenerWrapper.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTListChangeListenerWrapper.java
index 89d41891b6..dbca195bdb 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTListChangeListenerWrapper.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTListChangeListenerWrapper.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.listeners;
+package org.eclipse.jpt.common.ui.internal.swt.listeners;
 
 import org.eclipse.jpt.common.utility.ExceptionHandler;
 import org.eclipse.jpt.common.utility.model.event.ListAddEvent;
@@ -24,11 +24,11 @@ import org.eclipse.swt.widgets.Display;
  * Wrap another list change listener and forward events to it on the SWT
  * UI thread, asynchronously if necessary.
  */
-public class SWTListChangeListenerWrapper
+class SWTListChangeListenerWrapper
 	extends AbstractSWTListenerWrapper<ListEvent, ListChangeListener>
 	implements ListChangeListener
 {
-	public SWTListChangeListenerWrapper(ListChangeListener listener, Display display, ExceptionHandler exceptionHandler) {
+	SWTListChangeListenerWrapper(ListChangeListener listener, Display display, ExceptionHandler exceptionHandler) {
 		super(listener, display, exceptionHandler);
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTListenerWrapperTools.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTListenerTools.java
index 17bd094b05..00fa5b2da7 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTListenerWrapperTools.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTListenerTools.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.listeners;
+package org.eclipse.jpt.common.ui.internal.swt.listeners;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jpt.common.ui.internal.plugin.JptCommonUiPlugin;
@@ -20,7 +20,7 @@ import org.eclipse.jpt.common.utility.model.listener.StateChangeListener;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Widget;
 
-public final class SWTListenerWrapperTools {
+public final class SWTListenerTools {
 
 	// ********** property **********
 
@@ -275,7 +275,7 @@ public final class SWTListenerWrapperTools {
 	/**
 	 * Suppress default constructor, ensuring non-instantiability.
 	 */
-	private SWTListenerWrapperTools() {
+	private SWTListenerTools() {
 		super();
 		throw new UnsupportedOperationException();
 	}
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTListenerWrapperDelegate.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTListenerWrapperDelegate.java
index 99288a8902..ae30b12690 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTListenerWrapperDelegate.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTListenerWrapperDelegate.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.listeners;
+package org.eclipse.jpt.common.ui.internal.swt.listeners;
 
 import java.util.EventObject;
 import org.eclipse.jpt.common.ui.internal.swt.widgets.DisplayTools;
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Display;
  * Any events received earlier (on a non-UI thread) will be
  * forwarded, in the order received, before the current event is forwarded.
  */
-public class SWTListenerWrapperDelegate<E extends EventObject> {
+class SWTListenerWrapperDelegate<E extends EventObject> {
 	private final Wrapper<E> wrapper;
 	private final Display display;
 	private final Runnable forwardEventsRunnable = new ForwardEventsRunnable();
@@ -39,7 +39,7 @@ public class SWTListenerWrapperDelegate<E extends EventObject> {
 	private final SynchronizedQueue<E> events = new SynchronizedQueue<E>();
 
 
-	public SWTListenerWrapperDelegate(Wrapper<E> wrapper, Display display, ExceptionHandler exceptionHandler) {
+	SWTListenerWrapperDelegate(Wrapper<E> wrapper, Display display, ExceptionHandler exceptionHandler) {
 		super();
 		if (wrapper == null) {
 			throw new NullPointerException();
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTPropertyChangeListenerWrapper.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTPropertyChangeListenerWrapper.java
index 92e6e4878f..1e0e53b50c 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTPropertyChangeListenerWrapper.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTPropertyChangeListenerWrapper.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.listeners;
+package org.eclipse.jpt.common.ui.internal.swt.listeners;
 
 import org.eclipse.jpt.common.utility.ExceptionHandler;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
@@ -18,11 +18,11 @@ import org.eclipse.swt.widgets.Display;
  * Wrap another property change listener and forward events to it on the SWT
  * UI thread, asynchronously if necessary.
  */
-public class SWTPropertyChangeListenerWrapper
+class SWTPropertyChangeListenerWrapper
 	extends AbstractSWTListenerWrapper<PropertyChangeEvent, PropertyChangeListener>
 	implements PropertyChangeListener
 {
-	public SWTPropertyChangeListenerWrapper(PropertyChangeListener listener, Display display, ExceptionHandler exceptionHandler) {
+	SWTPropertyChangeListenerWrapper(PropertyChangeListener listener, Display display, ExceptionHandler exceptionHandler) {
 		super(listener, display, exceptionHandler);
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTStateChangeListenerWrapper.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTStateChangeListenerWrapper.java
index 066f38d1cf..41b8b3f07b 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/listeners/SWTStateChangeListenerWrapper.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/swt/listeners/SWTStateChangeListenerWrapper.java
@@ -7,7 +7,7 @@
  * Contributors:
  *     Oracle - initial API and implementation
  ******************************************************************************/
-package org.eclipse.jpt.common.ui.internal.listeners;
+package org.eclipse.jpt.common.ui.internal.swt.listeners;
 
 import org.eclipse.jpt.common.utility.ExceptionHandler;
 import org.eclipse.jpt.common.utility.model.event.StateChangeEvent;
@@ -18,11 +18,11 @@ import org.eclipse.swt.widgets.Display;
  * Wrap another state change listener and forward events to it on the SWT
  * UI thread, asynchronously if necessary.
  */
-public class SWTStateChangeListenerWrapper
+class SWTStateChangeListenerWrapper
 	extends AbstractSWTListenerWrapper<StateChangeEvent, StateChangeListener>
 	implements StateChangeListener
 {
-	public SWTStateChangeListenerWrapper(StateChangeListener listener, Display display, ExceptionHandler exceptionHandler) {
+	SWTStateChangeListenerWrapper(StateChangeListener listener, Display display, ExceptionHandler exceptionHandler) {
 		super(listener, display, exceptionHandler);
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemovePane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemovePane.java
index fcad76f89c..c743b4d086 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemovePane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/AddRemovePane.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.common.ui.internal.widgets;
 
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jpt.common.ui.JptCommonUiMessages;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable;
 import org.eclipse.jpt.common.utility.internal.iterable.IterableTools;
@@ -287,7 +287,7 @@ public abstract class AddRemovePane<T extends Model, E extends Object> extends P
 	}
 
 	private ListChangeListener buildListChangeListener() {
-		return SWTListenerWrapperTools.wrap(buildListChangeListener_());
+		return SWTListenerTools.wrap(buildListChangeListener_());
 	}
 
 	private ListChangeListener buildListChangeListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ClassChooserPane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ClassChooserPane.java
index d4e8273eae..479bf8a524 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ClassChooserPane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/ClassChooserPane.java
@@ -30,8 +30,8 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.jpt.common.core.internal.utility.JavaProjectTools;
 import org.eclipse.jpt.common.ui.JptCommonUiMessages;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.plugin.JptCommonUiPlugin;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.ClassNameTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.model.Model;
@@ -198,7 +198,7 @@ public abstract class ClassChooserPane<T extends Model> extends ChooserPane<T>
 	}
 
 	private PropertyChangeListener buildSubjectChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildSubjectChangeListener_());
+		return SWTListenerTools.wrap(this.buildSubjectChangeListener_());
 	}
 
 	private PropertyChangeListener buildSubjectChangeListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/PackageChooserPane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/PackageChooserPane.java
index 6b14c2eb95..57190a7985 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/PackageChooserPane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/PackageChooserPane.java
@@ -20,8 +20,8 @@ import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.common.ui.JptCommonUiMessages;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.plugin.JptCommonUiPlugin;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.model.Model;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
@@ -98,7 +98,7 @@ public abstract class PackageChooserPane<T extends Model> extends ChooserPane<T>
 	}
 
 	private PropertyChangeListener buildSubjectChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildSubjectChangeListener_());
+		return SWTListenerTools.wrap(this.buildSubjectChangeListener_());
 	}
 
 	private PropertyChangeListener buildSubjectChangeListener_() {
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
index 7f254d658a..93616257cc 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
@@ -19,7 +19,6 @@ import org.eclipse.jface.viewers.ComboViewer;
 import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.WorkbenchTools;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.plugin.JptCommonUiPlugin;
 import org.eclipse.jpt.common.ui.internal.swt.ComboModelAdapter;
 import org.eclipse.jpt.common.ui.internal.swt.DateTimeModelAdapter;
@@ -27,6 +26,7 @@ import org.eclipse.jpt.common.ui.internal.swt.SpinnerModelAdapter;
 import org.eclipse.jpt.common.ui.internal.swt.TriStateCheckBoxModelAdapter;
 import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools;
 import org.eclipse.jpt.common.ui.internal.swt.events.DisposeAdapter;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.model.value.CompositeBooleanPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.NullCheckPropertyValueModelWrapper;
 import org.eclipse.jpt.common.utility.internal.model.value.PredicatePropertyValueModel;
@@ -375,7 +375,7 @@ public abstract class Pane<T extends Model> {
 	}
 
 	private PropertyChangeListener buildSubjectChangeListener() {
-		return SWTListenerWrapperTools.wrap(this.buildSubjectChangeListener_());
+		return SWTListenerTools.wrap(this.buildSubjectChangeListener_());
 	}
 
 	private PropertyChangeListener buildSubjectChangeListener_() {
@@ -431,7 +431,7 @@ public abstract class Pane<T extends Model> {
 	}
 
 	private PropertyChangeListener buildAspectChangeListener() {
-		return SWTListenerWrapperTools.wrap(buildAspectChangeListener_());
+		return SWTListenerTools.wrap(buildAspectChangeListener_());
 	}
 
 	private PropertyChangeListener buildAspectChangeListener_() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java
index c09a2a7e8d..a2c60d059b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.caching;
 import java.util.ArrayList;
 import java.util.Collection;
 import org.eclipse.jpt.common.ui.JptCommonUiMessages;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
@@ -115,7 +115,7 @@ public class EclipseLinkEntityCachingPropertyComposite
 		}
 
 		private PropertyChangeListener buildDefaultCachingTypePropertyChangeListener() {
-			return SWTListenerWrapperTools.wrap(buildDefaultCachingTypePropertyChangeListener_());
+			return SWTListenerTools.wrap(buildDefaultCachingTypePropertyChangeListener_());
 		}
 
 		private PropertyChangeListener buildDefaultCachingTypePropertyChangeListener_() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/db/DatabaseObjectCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/db/DatabaseObjectCombo.java
index e6baccf4f9..c29cae39e3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/db/DatabaseObjectCombo.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/db/DatabaseObjectCombo.java
@@ -9,7 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details.db;
 
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.ui.internal.widgets.ComboPane;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -101,7 +101,7 @@ public abstract class DatabaseObjectCombo<T extends JpaModel>
 	}
 	
 	protected PropertyChangeListener buildConnectionProfileListener() {
-		return SWTListenerWrapperTools.wrap(this.buildConnectionProfileListener_());
+		return SWTListenerTools.wrap(this.buildConnectionProfileListener_());
 	}
 	
 	protected PropertyChangeListener buildConnectionProfileListener_() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java
index ad503b04d6..5d2ed146df 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpql/JpaJpqlContentProposalProvider.java
@@ -59,7 +59,7 @@ import org.eclipse.jface.text.source.AnnotationModel;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.SourceViewer;
 import org.eclipse.jpt.common.ui.internal.WorkbenchTools;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.utility.internal.StringTools;
 import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent;
 import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener;
@@ -371,7 +371,7 @@ public final class JpaJpqlContentProposalProvider extends JpqlCompletionProposal
 	}
 
 	private PropertyChangeListener buildTextListener() {
-		return SWTListenerWrapperTools.wrap(new PropertyChangeListener() {
+		return SWTListenerTools.wrap(new PropertyChangeListener() {
 			public void propertyChanged(PropertyChangeEvent event) {
 				String text = (String) event.getNewValue();
 				if (text == null) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/listeners/SWTConnectionListenerWrapper.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/listeners/SWTConnectionListenerWrapper.java
index 336a675e81..79116e4950 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/listeners/SWTConnectionListenerWrapper.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/listeners/SWTConnectionListenerWrapper.java
@@ -28,7 +28,7 @@ import org.eclipse.jpt.jpa.db.Table;
  * <strong>NB:</strong> <em>All</em> the events are handled asynchronously
  * so they arrive in the same order in which they are fired. This is different
  * from our typical model listeners, which may handle an event synchronously
- * (see {@link org.eclipse.jpt.common.ui.internal.listeners.AbstractSWTListenerWrapper});
+ * (see {@link org.eclipse.jpt.common.ui.internal.swt.listeners.AbstractSWTListenerWrapper});
  * but that is OK, as no connection changes are initiated by the UI, they
  * are all triggered by a user "refresh".
  */
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
index 4e87d57f70..929021d2eb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java
@@ -26,9 +26,9 @@ import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jpt.common.core.internal.utility.ICUStringCollator;
 import org.eclipse.jpt.common.ui.internal.WorkbenchTools;
-import org.eclipse.jpt.common.ui.internal.listeners.SWTListenerWrapperTools;
 import org.eclipse.jpt.common.ui.internal.properties.JptProjectPropertiesPage;
 import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools;
+import org.eclipse.jpt.common.ui.internal.swt.listeners.SWTListenerTools;
 import org.eclipse.jpt.common.ui.internal.swt.widgets.ControlTools;
 import org.eclipse.jpt.common.utility.internal.BitTools;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
@@ -715,7 +715,7 @@ public class JpaProjectPropertiesPage
 	private static final Transformer<String, String> SIMPLE_STRING_TRANSFORMER = TransformerTools.passThruTransformer(JptJpaUiMessages.JPA_FACET_WIZARD_PAGE_NONE);
 
 	private PropertyChangeListener buildDisconnectedModelListener() {
-		return SWTListenerWrapperTools.wrap(new DisconnectedModelListener());
+		return SWTListenerTools.wrap(new DisconnectedModelListener());
 	}
 
 	/* CU private */ class DisconnectedModelListener
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/selection/SetJpaSelectionJob.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/selection/SetJpaSelectionJob.java
index fbdf10068a..6450de59ad 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/selection/SetJpaSelectionJob.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/selection/SetJpaSelectionJob.java
@@ -38,7 +38,7 @@ import org.eclipse.jpt.jpa.ui.JptJpaUiMessages;
  * executes in a job that locks the corresponding project. This <em>update</em> will
  * modify other parts of the model, resulting in events that will modify the UI.
  * These UI modifications must be dispatched to the UI thread (via something like
- * {@link org.eclipse.jpt.common.ui.internal.listeners.SWTPropertyChangeListenerWrapper
+ * {@link org.eclipse.jpt.common.ui.internal.swt.listeners.SWTPropertyChangeListenerWrapper
  * SWTPropertyChangeListenerWrapper}).
  * <p>
  * As a result, the setting of the JPA selection (which, itself, also modifies