Attachment 128439 Details for Bug 268209 – Fix

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix

org.eclipse.persistence.sdo.diff (text/plain), 4.07 KB, created by Blaise Doughan

on 2009-03-11 15:48:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Blaise Doughan

Created: 2009-03-11 15:48:40 EDT

Size: 4.07 KB

patch

obsolete

>Index: src/org/eclipse/persistence/sdo/helper/SDOClassGenerator.java
>===================================================================
>--- src/org/eclipse/persistence/sdo/helper/SDOClassGenerator.java	(revision 3635)
>+++ src/org/eclipse/persistence/sdo/helper/SDOClassGenerator.java	(working copy)
>@@ -655,17 +655,18 @@
>         return null;
>     }
> 
>-    private String getJavaTypeForProperty(Property property) {
>+    private String getJavaTypeForProperty(SDOProperty property) {
>         if (property.isMany() || ((SDOType)property.getType()).isXsdList()) {
>             return "java.util.List";
>         } else {
>-            Class instanceClass = property.getType().getInstanceClass();
>-            if (instanceClass.equals(ClassConstants.ABYTE)) {
>+            SDOType propertyType = property.getType();
>+            Class instanceClass = propertyType.getInstanceClass();
>+            if (ClassConstants.ABYTE.equals(instanceClass)) {
>                 return "Byte[]";
>-            } else if (instanceClass.equals(ClassConstants.APBYTE)) {
>+            } else if (ClassConstants.APBYTE.equals(instanceClass)) {
>                 return "byte[]";
>             }
>-            return instanceClass.getName();
>+            return propertyType.getInstanceClassName();
>         }
>     }
> 
>Index: src/org/eclipse/persistence/sdo/SDOType.java
>===================================================================
>--- src/org/eclipse/persistence/sdo/SDOType.java	(revision 3636)
>+++ src/org/eclipse/persistence/sdo/SDOType.java	(working copy)
>@@ -146,14 +146,8 @@
>         if ((javaClass == null) && (javaClassName != null)) {
>             try {
>                 SDOClassLoader loader = ((SDOXMLHelper)aHelperContext.getXMLHelper()).getLoader();
>-                if (!isDataType() && (javaImplClass == null)) {
>-                    //Class interfaceClass = loader.loadClass(getInstanceClassName(), this);
>-                    javaImplClass = loader.loadClass(getImplClassName(), this);
>-                    getXmlDescriptor().setJavaClass(javaImplClass);
>-                }
>-                javaClass = loader.loadClass(javaClassName, this);
>+                javaClass = loader.getParent().loadClass(javaClassName);
>             } catch (ClassNotFoundException e) {
>-                throw SDOException.classNotFound(e, getURI(), getName());
>             } catch (SecurityException e) {
>                 throw SDOException.classNotFound(e, getURI(), getName());
>             }
>@@ -417,15 +411,7 @@
>         javaClass = aClass;
>         if (javaClass != null) {
>             javaClassName = javaClass.getName();
>-
>-            /*    if(isDataType()) {
>-                 setInstanceProperty(SDOConstants.JAVA_CLASS_PROPERTY, javaClassName);
>-                }
>-                */
>         }
>-        if (getXmlDescriptor() != null) {
>-            getXmlDescriptor().setJavaClass(aClass);
>-        }
>     }
> 
>     /**
>@@ -768,6 +754,7 @@
>         getXmlDescriptor().setJavaClassName(getImplClassName());
>         // load classes by classloader by getting the current instance class
>         getInstanceClass();
>+        getImplClass();
> 
>         // See SDOResolvable enhancement
>         String schemaContext = getName();
>Index: src/org/eclipse/persistence/sdo/types/SDOChangeSummaryType.java
>===================================================================
>--- src/org/eclipse/persistence/sdo/types/SDOChangeSummaryType.java	(revision 3635)
>+++ src/org/eclipse/persistence/sdo/types/SDOChangeSummaryType.java	(working copy)
>@@ -34,7 +34,9 @@
>     
>     public SDOChangeSummaryType(SDOTypeHelper sdoTypeHelper) {
>         super(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY, sdoTypeHelper);
>-        
>+
>+        setInstanceClass(ChangeSummary.class);
>+
>         xmlDescriptor.setJavaClass(SDOChangeSummary.class);
>         xmlDescriptor.setSequencedObject(false);
>         
>@@ -81,10 +83,6 @@
>         return EMPTY_LIST;
>     }
> 
>-    public Class getInstanceClass() {
>-        return ChangeSummary.class;
>-    }
>-
>     public List getInstanceProperties() {
>         return EMPTY_LIST;
>     }

Actions: View | Diff

Attachments on bug 268209: 128437 | 128439 | 128544