From 6861c95c872f3fbb682c03acc120125cf8608c18 Mon Sep 17 00:00:00 2001
From: bvosburgh
Date: Sat, 19 Dec 2009 06:03:32 +0000
Subject: [258541] JPA 2.0 default delimited identifiers - model

---
 .../internal/details/EclipseLinkBasicMappingComposite.java   |  2 +-
 .../ui/internal/details/EclipseLinkCachingComposite.java     |  2 +-
 .../ui/internal/details/EclipseLinkConvertComposite.java     |  2 +-
 .../details/EclipseLinkEmbeddableAdvancedComposite.java      |  2 +-
 .../internal/details/EclipseLinkEntityAdvancedComposite.java |  2 +-
 .../ui/internal/details/EclipseLinkIdMappingComposite.java   |  2 +-
 .../EclipseLinkMappedSuperclassAdvancedComposite.java        |  2 +-
 .../details/EclipseLinkOneToManyJoiningStrategyPane.java     |  2 +-
 .../internal/details/EclipseLinkVersionMappingComposite.java |  2 +-
 .../details/java/AbstractJavaEclipseLinkEntityComposite.java |  4 ++--
 .../AbstractJavaEclipseLinkMappedSuperclassComposite.java    |  4 ++--
 .../details/java/JavaEclipseLinkEmbeddableComposite.java     |  2 +-
 .../orm/AbstractEclipseLinkEntityMappingsDetailsPage.java    |  2 +-
 .../details/orm/AbstractOrmEclipseLinkEntityComposite.java   |  4 ++--
 .../orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java |  4 ++--
 .../details/orm/OrmEclipseLinkEmbeddableComposite.java       |  2 +-
 .../connection/JdbcConnectionPropertiesComposite.java        | 12 ++++++------
 .../general/EclipseLinkPersistenceUnitGeneralComposite.java  |  4 ++--
 .../details/java/JavaEclipseLinkEmbeddable1_1Composite.java  |  2 +-
 .../v2_0/details/EclipseLinkCaching2_0Composite.java         |  2 +-
 20 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui')

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java
index 654be5c52f..9f3a50588e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java
@@ -129,7 +129,7 @@ public class EclipseLinkBasicMappingComposite extends FormPane<BasicMapping>
 	
 	protected void initializeTypePane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			JptUiDetailsMessages.TypeSection_type
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
index 8a229e5fb0..07aca9d9c8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
@@ -88,7 +88,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 		panes.add(new EclipseLinkCacheSizeComposite(this, subPane));
 		
 		// Advanced sub-pane
-		Composite advancedSection = addCollapsableSubSection(
+		Composite advancedSection = addCollapsibleSubSection(
 			subPane,
 			EclipseLinkUiDetailsMessages.EclipseLinkCachingComposite_advanced,
 			new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java
index 92a5baab86..a2c46b3290 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkConvertComposite.java
@@ -94,7 +94,7 @@ public class EclipseLinkConvertComposite extends FormPane<EclipseLinkConvert>
 		);
 		SWTUtil.attachDefaultValueHandler(combo);
 		
-		Composite subSection = addCollapsableSubSection(
+		Composite subSection = addCollapsibleSubSection(
 			container, 
 			EclipseLinkUiDetailsMessages.EclipseLinkConvertComposite_defineConverterSection, 
 			new SimplePropertyValueModel<Boolean>(Boolean.FALSE));
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkEmbeddableAdvancedComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkEmbeddableAdvancedComposite.java
index 4e8adf5d5f..2b3e30d5aa 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkEmbeddableAdvancedComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkEmbeddableAdvancedComposite.java
@@ -29,7 +29,7 @@ public class EclipseLinkEmbeddableAdvancedComposite extends FormPane<Embeddable>
 	
 	@Override
 	protected void initializeLayout(Composite container) {
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_advanced
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkEntityAdvancedComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkEntityAdvancedComposite.java
index f7f706860d..24ab2bbeea 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkEntityAdvancedComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkEntityAdvancedComposite.java
@@ -30,7 +30,7 @@ public class EclipseLinkEntityAdvancedComposite extends FormPane<Entity> {
 	
 	@Override
 	protected void initializeLayout(Composite container) {
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_advanced
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java
index 88bf668b5c..d73c072411 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java
@@ -103,7 +103,7 @@ public class EclipseLinkIdMappingComposite extends AbstractIdMappingComposite<Id
 	@Override
 	protected void initializeTypePane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			addSubPane(container, 5),
 			JptUiDetailsMessages.TypeSection_type
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkMappedSuperclassAdvancedComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkMappedSuperclassAdvancedComposite.java
index e2c7fd7a04..659fa06ed8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkMappedSuperclassAdvancedComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkMappedSuperclassAdvancedComposite.java
@@ -30,7 +30,7 @@ public class EclipseLinkMappedSuperclassAdvancedComposite extends FormPane<Mappe
 	
 	@Override
 	protected void initializeLayout(Composite container) {
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_advanced
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkOneToManyJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkOneToManyJoiningStrategyPane.java
index d62959e1ca..22e39099de 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkOneToManyJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkOneToManyJoiningStrategyPane.java
@@ -34,7 +34,7 @@ public class EclipseLinkOneToManyJoiningStrategyPane
 	
 	@Override
 	protected void initializeLayout(Composite container) {
-		Composite composite = addCollapsableSection(
+		Composite composite = addCollapsibleSection(
 				container,
 				JptUiDetailsMessages.Joining_title,
 				new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
index 127ac2065b..b9027d4289 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java
@@ -108,7 +108,7 @@ public class EclipseLinkVersionMappingComposite extends FormPane<VersionMapping>
 	
 	protected void initializeTypePane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			JptUiDetailsMessages.TypeSection_type
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java
index 66038743f8..a023f02496 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkEntityComposite.java
@@ -64,7 +64,7 @@ public abstract class AbstractJavaEclipseLinkEntityComposite<T extends JavaEntit
 
 	protected void initializeCachingPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			addSubPane(container, 5),
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_caching
 		);
@@ -90,7 +90,7 @@ public abstract class AbstractJavaEclipseLinkEntityComposite<T extends JavaEntit
 
 	protected void initializeConvertersPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_converters
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java
index f81196c7f2..40b27d6f87 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java
@@ -63,7 +63,7 @@ public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite extends F
 	
 	protected void initializeCachingPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			addSubPane(container, 5),
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_caching
 		);
@@ -86,7 +86,7 @@ public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite extends F
 	}
 	
 	protected void initializeConvertersPane(Composite container) {
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_converters
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java
index 9b0a699644..3a36c50b46 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/java/JavaEclipseLinkEmbeddableComposite.java
@@ -56,7 +56,7 @@ public class JavaEclipseLinkEmbeddableComposite extends FormPane<JavaEmbeddable>
 
 	protected void initializeConvertersPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			addSubPane(container, 5),
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_converters
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPage.java
index 9a0693af6d..63e81a69b0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractEclipseLinkEntityMappingsDetailsPage.java
@@ -140,7 +140,7 @@ public abstract class AbstractEclipseLinkEntityMappingsDetailsPage extends Abstr
 		this.buildOrmQueriesComposite(container);
 		
 		// Converters section
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			EclipseLinkUiDetailsMessages.EclipseLinkConvertersComposite_Label
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java
index 5667eb9682..5b7d3fab45 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkEntityComposite.java
@@ -45,7 +45,7 @@ public abstract class AbstractOrmEclipseLinkEntityComposite extends AbstractOrmE
 	}
 	
 	protected void initializeCachingPane(Composite container) {
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			addSubPane(container, 5),
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_caching);
 		addCachingComposite(container, buildCachingHolder());
@@ -67,7 +67,7 @@ public abstract class AbstractOrmEclipseLinkEntityComposite extends AbstractOrmE
 
 	protected void initializeConvertersPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			EclipseLinkUiDetailsMessages.EclipseLinkConvertersComposite_Label
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java
index e6ecc555ea..b79c44afc0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/AbstractOrmEclipseLinkMappedSuperclassComposite.java
@@ -65,7 +65,7 @@ public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite<T extends
 	}
 	
 	protected void initializeCachingPane(Composite container) {
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			addSubPane(container, 5),
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_caching
 		);
@@ -90,7 +90,7 @@ public abstract class AbstractOrmEclipseLinkMappedSuperclassComposite<T extends
 
 	protected void initializeConvertersPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			EclipseLinkUiDetailsMessages.EclipseLinkConvertersComposite_Label
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java
index 66128c063e..ca327bcd5e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/details/orm/OrmEclipseLinkEmbeddableComposite.java
@@ -78,7 +78,7 @@ public class OrmEclipseLinkEmbeddableComposite<T extends OrmEclipseLinkEmbeddabl
 
 	protected void initializeConvertersPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			addSubPane(container, 5),
 			EclipseLinkUiDetailsMessages.EclipseLinkConvertersComposite_Label
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcConnectionPropertiesComposite.java
index feb5e35c9e..e37d306021 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcConnectionPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/connection/JdbcConnectionPropertiesComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2008 Oracle. All rights reserved.
+* Copyright (c) 2008, 2009 Oracle. 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 http://www.eclipse.org/legal/epl-v10.html.
@@ -10,7 +10,7 @@
 package org.eclipse.jpt.eclipselink.ui.internal.persistence.connection;
 
 import java.util.Comparator;
-import java.util.Iterator;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -241,8 +241,8 @@ public class JdbcConnectionPropertiesComposite<T extends Connection>
 
 			try {
 				// Add the connection names to the dialog
-				for (Iterator<String> stream = this.connectionProfileNames(); stream.hasNext(); ) {
-					provider.add(stream.next(), itemsFilter);
+				for (String name : this.getConnectionProfileNames()) {
+					provider.add(name, itemsFilter);
 				}
 			}
 			finally {
@@ -250,8 +250,8 @@ public class JdbcConnectionPropertiesComposite<T extends Connection>
 			}
 		}
 
-		private Iterator<String> connectionProfileNames() {
-			return JdbcConnectionPropertiesComposite.this.getConnectionProfileFactory().connectionProfileNames();
+		private Iterable<String> getConnectionProfileNames() {
+			return JdbcConnectionPropertiesComposite.this.getConnectionProfileFactory().getConnectionProfileNames();
 		}
 
 		/*
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralComposite.java
index cb91ca3665..b8d7a08df5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitGeneralComposite.java
@@ -41,7 +41,7 @@ public class EclipseLinkPersistenceUnitGeneralComposite
 	
 	protected void initializeJPAMappingDescriptorsPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			JptUiPersistenceMessages.PersistenceUnitGeneralComposite_jpaMappingDescriptors,
 			JptUiPersistenceMessages.PersistenceUnitGeneralComposite_jpaMappingDescriptors_description
@@ -55,7 +55,7 @@ public class EclipseLinkPersistenceUnitGeneralComposite
 	
 	protected void initializeJarFilesPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			container,
 			JptUiPersistenceMessages.PersistenceUnitGeneralComposite_jarFiles
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkEmbeddable1_1Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkEmbeddable1_1Composite.java
index e3b8f21b2d..2494860a76 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkEmbeddable1_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v1_1/details/java/JavaEclipseLinkEmbeddable1_1Composite.java
@@ -75,7 +75,7 @@ public class JavaEclipseLinkEmbeddable1_1Composite extends FormPane<JavaEmbeddab
 
 	protected void initializeConvertersPane(Composite container) {
 
-		container = addCollapsableSection(
+		container = addCollapsibleSection(
 			addSubPane(container, 5),
 			EclipseLinkUiDetailsMessages.EclipseLinkTypeMappingComposite_converters
 		);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/EclipseLinkCaching2_0Composite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/EclipseLinkCaching2_0Composite.java
index 7aab5afd40..bdebb1d28b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/EclipseLinkCaching2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/v2_0/details/EclipseLinkCaching2_0Composite.java
@@ -99,7 +99,7 @@ public abstract class EclipseLinkCaching2_0Composite<T extends EclipseLinkCachin
 		panes.add(new EclipseLinkCacheSizeComposite(this, subPane));
 		
 		// Advanced sub-pane
-		Composite advancedSection = addCollapsableSubSection(
+		Composite advancedSection = addCollapsibleSubSection(
 			subPane,
 			EclipseLinkUiDetailsMessages.EclipseLinkCachingComposite_advanced,
 			new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
-- 
cgit v1.2.3