290021 - [JPA 2.0] Shared-Cache-Mode element support

3 files changed, 108 insertions, 4 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Jpt2_0UiMessages.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Jpt2_0UiMessages.java
index a8f0a80e37..4206a508c5 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Jpt2_0UiMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Jpt2_0UiMessages.java
@@ -48,6 +48,14 @@ public class Jpt2_0UiMessages
 	public static String TransactionTypeComposite_jta;
 	public static String TransactionTypeComposite_resource_local;
 	
+	public static String SharedCacheModeComposite_sharedCacheModeLabel;
+
+	public static String SharedCacheModeComposite_all;
+	public static String SharedCacheModeComposite_none;
+	public static String SharedCacheModeComposite_enable_selective;
+	public static String SharedCacheModeComposite_disable_selective;
+	public static String SharedCacheModeComposite_unspecified;
+	
 	public static String ValidationModeComposite_validationModeLabel;
 	
 	public static String ValidationModeComposite_auto;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/persistence/options/SharedCacheModeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/persistence/options/SharedCacheModeComposite.java
new file mode 100644
index 0000000000..60c29f01dc
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/persistence/options/SharedCacheModeComposite.java
@@ -0,0 +1,94 @@
+/*******************************************************************************
+* Copyright (c) 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.
+* 
+* Contributors:
+*     Oracle - initial API and implementation
+*******************************************************************************/
+package org.eclipse.jpt.ui.internal.jpa2.persistence.options;
+
+import java.util.Collection;
+
+import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
+import org.eclipse.jpt.core.jpa2.context.persistence.options.SharedCacheMode;
+import org.eclipse.jpt.ui.internal.jpa2.Jpt2_0UiMessages;
+import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
+import org.eclipse.jpt.utility.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ *  SharedCacheModeComposite
+ */
+public class SharedCacheModeComposite extends FormPane<PersistenceUnit2_0>
+{
+	/**
+	 * Creates a new <code>SharedCacheModeComposite</code>.
+	 * 
+	 * @param parentController
+	 *            The parent container of this one
+	 * @param parent
+	 *            The parent container
+	 */
+	public SharedCacheModeComposite(
+					FormPane<?> parentPane,
+			        PropertyValueModel<? extends PersistenceUnit2_0> subjectHolder,
+			        Composite parent) {
+
+	super(parentPane, subjectHolder, parent);
+	}
+
+	@Override
+	protected void initializeLayout(Composite parent) {
+		
+		this.addLabeledComposite(
+			parent,
+			Jpt2_0UiMessages.SharedCacheModeComposite_sharedCacheModeLabel,
+			this.addSharedCacheModeCombo(parent),
+			null			// TODO
+		);
+	}
+	
+	private EnumFormComboViewer<PersistenceUnit2_0, SharedCacheMode> addSharedCacheModeCombo(Composite parent) {
+		
+		return new EnumFormComboViewer<PersistenceUnit2_0, SharedCacheMode>(this, this.getSubjectHolder(), parent) {
+			@Override
+			protected void addPropertyNames(Collection<String> propertyNames) {
+				super.addPropertyNames(propertyNames);
+				propertyNames.add(PersistenceUnit2_0.SPECIFIED_SHARED_CACHE_MODE_PROPERTY);
+			}
+			
+			@Override
+			protected SharedCacheMode[] getChoices() {
+				return SharedCacheMode.values();
+			}
+			
+			@Override
+			protected boolean sortChoices() {
+				return false;
+			}
+			
+			@Override
+			protected SharedCacheMode getDefaultValue() {
+				return this.getSubject().getDefaultSharedCacheMode();
+			}
+
+			@Override
+			protected String displayString(SharedCacheMode value) {
+				return this.buildDisplayString(Jpt2_0UiMessages.class, SharedCacheModeComposite.this, value);
+			}
+
+			@Override
+			protected SharedCacheMode getValue() {
+				return this.getSubject().getSpecifiedSharedCacheMode();
+			}
+
+			@Override
+			protected void setValue(SharedCacheMode value) {
+				this.getSubject().setSpecifiedSharedCacheMode(value);
+			}
+		};
+	}
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java
index 6f8fcb5e9f..10740dedb9 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java
@@ -14,7 +14,6 @@ import org.eclipse.jpt.core.jpa2.context.persistence.options.JpaOptions2_0;
 import org.eclipse.jpt.ui.internal.jpa2.Jpt2_0UiMessages;
 import org.eclipse.jpt.ui.internal.widgets.FormPane;
 import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
 import org.eclipse.swt.widgets.Composite;
@@ -42,6 +41,9 @@ public class ValidationConfigurationComposite extends FormPane<JpaOptions2_0>
 	@Override
 	protected void initializeLayout(Composite parent) {
 
+		// SharedCacheMode
+		new SharedCacheModeComposite(this, this.buildPersistenceUnit2_0Holder(), parent);
+
 		// ValidationMode
 		new ValidationModeComposite(this, this.buildPersistenceUnit2_0Holder(), parent);
 		
@@ -68,10 +70,10 @@ public class ValidationConfigurationComposite extends FormPane<JpaOptions2_0>
 	}
 	
 	private PropertyValueModel<PersistenceUnit2_0> buildPersistenceUnit2_0Holder() {
-		return new TransformationPropertyValueModel<JpaOptions2_0, PersistenceUnit2_0>(this.getSubjectHolder()) {
+		return new PropertyAspectAdapter<JpaOptions2_0, PersistenceUnit2_0>(this.getSubjectHolder()) {
 			@Override
-			protected PersistenceUnit2_0 transform_(JpaOptions2_0 value) {
-				return (PersistenceUnit2_0) value.getPersistenceUnit();
+			protected PersistenceUnit2_0 buildValue_() {
+				return (PersistenceUnit2_0) this.subject.getPersistenceUnit();
 			}
 		};
 	}