Attachment #128439 for bug #268209

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




        return null;
    }

    private String getJavaTypeForProperty(SDOProperty property) {
        if (property.isMany() || ((SDOType)property.getType()).isXsdList()) {
            return "java.util.List";
        } else {
            SDOType propertyType = property.getType();
            Class instanceClass = propertyType.getInstanceClass();
            if (ClassConstants.ABYTE.equals(instanceClass)) {
                return "Byte[]";
            } else if (ClassConstants.APBYTE.equals(instanceClass)) {
                return "byte[]";
            }
            return propertyType.getInstanceClassName();
        }
    }





        if ((javaClass == null) && (javaClassName != null)) {
            try {
                SDOClassLoader loader = ((SDOXMLHelper)aHelperContext.getXMLHelper()).getLoader();
                javaClass = loader.getParent().loadClass(javaClassName);
                    //Class interfaceClass = loader.loadClass(getInstanceClassName(), this);
                    javaImplClass = loader.loadClass(getImplClassName(), this);
                    getXmlDescriptor().setJavaClass(javaImplClass);
                }
                javaClass = loader.loadClass(javaClassName, this);
            } catch (ClassNotFoundException e) {
                throw SDOException.classNotFound(e, getURI(), getName());
            } catch (SecurityException e) {
                throw SDOException.classNotFound(e, getURI(), getName());
            }

        javaClass = aClass;
        if (javaClass != null) {
            javaClassName = javaClass.getName();

            /*    if(isDataType()) {
                 setInstanceProperty(SDOConstants.JAVA_CLASS_PROPERTY, javaClassName);
                }
                */
        }
        if (getXmlDescriptor() != null) {
            getXmlDescriptor().setJavaClass(aClass);
        }
    }

    /**

        getXmlDescriptor().setJavaClassName(getImplClassName());
        // load classes by classloader by getting the current instance class
        getInstanceClass();
        getImplClass();

        // See SDOResolvable enhancement
        String schemaContext = getName();

Lines 34-40 Link Here

(-)src/org/eclipse/persistence/sdo/types/SDOChangeSummaryType.java (-5 / +3 lines)
34		34
35	public SDOChangeSummaryType(SDOTypeHelper sdoTypeHelper) {	35	public SDOChangeSummaryType(SDOTypeHelper sdoTypeHelper) {
36	super(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY, sdoTypeHelper);	36	super(SDOConstants.SDO_URL, SDOConstants.CHANGESUMMARY, sdoTypeHelper);
37		37
		38	setInstanceClass(ChangeSummary.class);
		39
38	xmlDescriptor.setJavaClass(SDOChangeSummary.class);	40	xmlDescriptor.setJavaClass(SDOChangeSummary.class);
39	xmlDescriptor.setSequencedObject(false);	41	xmlDescriptor.setSequencedObject(false);
40		42
Lines 81-90 Link Here
81	return EMPTY_LIST;	83	return EMPTY_LIST;
82	}	84	}
83		85
84	public Class getInstanceClass() {
85	return ChangeSummary.class;
86	}
87
88	public List getInstanceProperties() {	86	public List getInstanceProperties() {
89	return EMPTY_LIST;	87	return EMPTY_LIST;
90	}	88	}

Return to bug 268209

Lines 655-671 Link Here

(-)src/org/eclipse/persistence/sdo/helper/SDOClassGenerator.java (-5 / +6 lines)
655	return null;	655	return null;
656	}	656	}
657		657
658	private String getJavaTypeForProperty(Property property) {	658	private String getJavaTypeForProperty(SDOProperty property) {
659	if (property.isMany() \|\| ((SDOType)property.getType()).isXsdList()) {	659	if (property.isMany() \|\| ((SDOType)property.getType()).isXsdList()) {
660	return "java.util.List";	660	return "java.util.List";
661	} else {	661	} else {
662	Class instanceClass = property.getType().getInstanceClass();	662	SDOType propertyType = property.getType();
663	if (instanceClass.equals(ClassConstants.ABYTE)) {	663	Class instanceClass = propertyType.getInstanceClass();
		664	if (ClassConstants.ABYTE.equals(instanceClass)) {
664	return "Byte[]";	665	return "Byte[]";
665	} else if (instanceClass.equals(ClassConstants.APBYTE)) {	666	} else if (ClassConstants.APBYTE.equals(instanceClass)) {
666	return "byte[]";	667	return "byte[]";
667	}	668	}
668	return instanceClass.getName();	669	return propertyType.getInstanceClassName();
669	}	670	}
670	}	671	}
671		672

Lines 146-159 Link Here

(-)src/org/eclipse/persistence/sdo/SDOType.java (-15 / +2 lines)
146	if ((javaClass == null) && (javaClassName != null)) {	146	if ((javaClass == null) && (javaClassName != null)) {
147	try {	147	try {
148	SDOClassLoader loader = ((SDOXMLHelper)aHelperContext.getXMLHelper()).getLoader();	148	SDOClassLoader loader = ((SDOXMLHelper)aHelperContext.getXMLHelper()).getLoader();
149	if (!isDataType() && (javaImplClass == null)) {	149	javaClass = loader.getParent().loadClass(javaClassName);
150	//Class interfaceClass = loader.loadClass(getInstanceClassName(), this);
151	javaImplClass = loader.loadClass(getImplClassName(), this);
152	getXmlDescriptor().setJavaClass(javaImplClass);
153	}
154	javaClass = loader.loadClass(javaClassName, this);
155	} catch (ClassNotFoundException e) {	150	} catch (ClassNotFoundException e) {
156	throw SDOException.classNotFound(e, getURI(), getName());
157	} catch (SecurityException e) {	151	} catch (SecurityException e) {
158	throw SDOException.classNotFound(e, getURI(), getName());	152	throw SDOException.classNotFound(e, getURI(), getName());
159	}	153	}
Lines 417-431 Link Here
417	javaClass = aClass;	411	javaClass = aClass;
418	if (javaClass != null) {	412	if (javaClass != null) {
419	javaClassName = javaClass.getName();	413	javaClassName = javaClass.getName();
420
421	/* if(isDataType()) {
422	setInstanceProperty(SDOConstants.JAVA_CLASS_PROPERTY, javaClassName);
423	}
424	*/
425	}	414	}
426	if (getXmlDescriptor() != null) {
427	getXmlDescriptor().setJavaClass(aClass);
428	}
429	}	415	}
430		416
431	/**	417	/**
Lines 768-773 Link Here
768	getXmlDescriptor().setJavaClassName(getImplClassName());	754	getXmlDescriptor().setJavaClassName(getImplClassName());
769	// load classes by classloader by getting the current instance class	755	// load classes by classloader by getting the current instance class
770	getInstanceClass();	756	getInstanceClass();
		757	getImplClass();
771		758
772	// See SDOResolvable enhancement	759	// See SDOResolvable enhancement
773	String schemaContext = getName();	760	String schemaContext = getName();