Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2007-06-12 15:01:37 -0400
committerkmoore2007-06-12 15:01:37 -0400
commit8e8c21449da68f6995cf8ca0c1bdbb86bff86830 (patch)
tree737a83ee542bda80cbb2c25175915fd4382f6a31
parent72aba5fda5333bcc3f3eb3cc8f929379b24c0b6c (diff)
downloadwebtools.dali-8e8c21449da68f6995cf8ca0c1bdbb86bff86830.tar.gz
webtools.dali-8e8c21449da68f6995cf8ca0c1bdbb86bff86830.tar.xz
webtools.dali-8e8c21449da68f6995cf8ca0c1bdbb86bff86830.zip
192035 - applied patch - orm.xml attribute mapping combo box contains a blank option
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java9
2 files changed, 10 insertions, 1 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java
index e9b3bce03a..fb2a312eef 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java
@@ -221,7 +221,7 @@ public abstract class PersistentAttributeDetailsPage extends BaseJpaDetailsPage
};
}
- IAttributeMappingUiProvider[] uiProvidersFor(IPersistentAttribute persistentAttribute) {
+ protected IAttributeMappingUiProvider[] uiProvidersFor(IPersistentAttribute persistentAttribute) {
IAttributeMappingUiProvider[] providers = new IAttributeMappingUiProvider[attributeMappingUiProviders().size() +1];
providers[0] = this.nullAttributeMappingUiProvider;
for (IAttributeMappingUiProvider uiProvider : defaultAttributeMappingUiProviders()) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java
index 36194e5b66..7940f5503e 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java
@@ -14,12 +14,14 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.jpt.core.internal.IJpaContentNode;
+import org.eclipse.jpt.core.internal.IPersistentAttribute;
import org.eclipse.jpt.core.internal.IPersistentType;
import org.eclipse.jpt.core.internal.content.orm.OrmPackage;
import org.eclipse.jpt.core.internal.content.orm.XmlAttributeMapping;
import org.eclipse.jpt.core.internal.content.orm.XmlPersistentAttribute;
import org.eclipse.jpt.core.internal.content.orm.XmlPersistentType;
import org.eclipse.jpt.ui.internal.details.PersistentAttributeDetailsPage;
+import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider;
import org.eclipse.jpt.ui.internal.widgets.CComboViewer;
import org.eclipse.jpt.utility.internal.iterators.ArrayIterator;
import org.eclipse.swt.SWT;
@@ -161,4 +163,11 @@ public class XmlPersistentAttributeDetailsPage
}
}
}
+
+ @Override
+ //TODO Not really how I would want to implement this, but it is low risk fix for bug 192035 for 1.0RC3
+ protected IAttributeMappingUiProvider[] uiProvidersFor(IPersistentAttribute persistentAttribute) {
+ return attributeMappingUiProviders().toArray(new IAttributeMappingUiProvider[attributeMappingUiProviders().size()]);
+ }
+
} \ No newline at end of file

Back to the top