Author: tchemit Date: 2008-12-28 16:03:04 +0000 (Sun, 28 Dec 2008) New Revision: 1098 Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompiledObject.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataSource.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/introspection/JAXXIntrospector.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/introspection/JAXXPropertyDescriptor.java lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTextComponentHandler.java lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/ClassDescriptorTest.java Log: generify ClassDescriptor Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompiledObject.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompiledObject.java 2008-12-28 15:44:40 UTC (rev 1097) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/CompiledObject.java 2008-12-28 16:03:04 UTC (rev 1098) @@ -295,9 +295,9 @@ String methodName = JAXXCompiler.capitalize(property); try { - MethodDescriptor methodDescriptor = overrideType.getMethodDescriptor("get" + methodName, new ClassDescriptor[0]); + MethodDescriptor methodDescriptor = overrideType.getMethodDescriptor("get" + methodName); if (methodDescriptor != null) { - if (overrideType.getMethodDescriptor("set" + methodName, new ClassDescriptor[]{methodDescriptor.getReturnType()}) != null) { + if (overrideType.getMethodDescriptor("set" + methodName, methodDescriptor.getReturnType()) != null) { // handle cases where object is overridden to be a different class result = javaCode; } @@ -424,8 +424,8 @@ ClassDescriptor descriptor = ClassDescriptorLoader.getClassDescriptor(getObjectClass().getName()); String listenerClassName = addMethod.getParameterTypes()[0].getName(); ClassDescriptor listenerDescriptor = ClassDescriptorLoader.getClassDescriptor(listenerClassName); - MethodDescriptor addMethodDescriptor = descriptor.getMethodDescriptor(addMethod.getName(), new ClassDescriptor[]{listenerDescriptor}); - MethodDescriptor listenerMethodDescriptor = listenerDescriptor.getMethodDescriptor(listenerMethod.getName(), new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(listenerMethod.getParameterTypes()[0].getName())}); + MethodDescriptor addMethodDescriptor = descriptor.getMethodDescriptor(addMethod.getName(), listenerDescriptor); + MethodDescriptor listenerMethodDescriptor = listenerDescriptor.getMethodDescriptor(listenerMethod.getName(), ClassDescriptorLoader.getClassDescriptor(listenerMethod.getParameterTypes()[0].getName())); addEventHandler(eventId, addMethodDescriptor, listenerMethodDescriptor, code, compiler); } catch (Exception e) { Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataSource.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataSource.java 2008-12-28 15:44:40 UTC (rev 1097) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/compiler/DataSource.java 2008-12-28 16:03:04 UTC (rev 1098) @@ -310,7 +310,7 @@ } String methodName = lastNode.substring(dotPos + 1).trim(); try { - MethodDescriptor method = contextClass.getMethodDescriptor(methodName, new ClassDescriptor[0]); + MethodDescriptor method = contextClass.getMethodDescriptor(methodName); trackMemberIfPossible(objectCode, contextClass, method.getName(), true, listenerId); return method.getReturnType(); } Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/introspection/JAXXIntrospector.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/introspection/JAXXIntrospector.java 2008-12-28 15:44:40 UTC (rev 1097) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/introspection/JAXXIntrospector.java 2008-12-28 16:03:04 UTC (rev 1098) @@ -69,8 +69,8 @@ try { ClassDescriptor typeDescriptor = ClassDescriptorLoader.getClassDescriptor(type.getName(), type.getClassLoader()); JAXXPropertyDescriptor propertyDescriptor = new JAXXPropertyDescriptor(classDescriptor, explicitProperty.getName(), - readMethod != null ? classDescriptor.getMethodDescriptor(readMethod.getName(), new ClassDescriptor[0]) : null, - writeMethod != null ? classDescriptor.getMethodDescriptor(writeMethod.getName(), new ClassDescriptor[]{typeDescriptor}) : null); + readMethod != null ? classDescriptor.getMethodDescriptor(readMethod.getName()) : null, + writeMethod != null ? classDescriptor.getMethodDescriptor(writeMethod.getName(), typeDescriptor) : null); propertyDescriptor.setBound(explicitProperty.isBound()); Enumeration<String> attributeNames = explicitProperty.attributeNames(); while (attributeNames.hasMoreElements()) { @@ -92,7 +92,7 @@ // does the same) boolean propertyChangeSource; try { - classDescriptor.getMethodDescriptor("addPropertyChangeListener", new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(PropertyChangeListener.class)}); + classDescriptor.getMethodDescriptor("addPropertyChangeListener", ClassDescriptorLoader.getClassDescriptor(PropertyChangeListener.class)); propertyChangeSource = true; } catch (NoSuchMethodException e) { Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/introspection/JAXXPropertyDescriptor.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/introspection/JAXXPropertyDescriptor.java 2008-12-28 15:44:40 UTC (rev 1097) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/introspection/JAXXPropertyDescriptor.java 2008-12-28 16:03:04 UTC (rev 1098) @@ -39,11 +39,11 @@ public MethodDescriptor getReadMethodDescriptor() { if (readMethod == null) { try { - readMethod = getClassDescriptor().getMethodDescriptor("get" + capitalize(getName()), new ClassDescriptor[0]); + readMethod = getClassDescriptor().getMethodDescriptor("get" + capitalize(getName())); } catch (NoSuchMethodException e) { try { - readMethod = getClassDescriptor().getMethodDescriptor("is" + capitalize(getName()), new ClassDescriptor[0]); + readMethod = getClassDescriptor().getMethodDescriptor("is" + capitalize(getName())); } catch (NoSuchMethodException e2) { } @@ -59,7 +59,7 @@ String methodName = "set" + capitalize(getName()); MethodDescriptor read = getReadMethodDescriptor(); if (read != null) { - writeMethod = getClassDescriptor().getMethodDescriptor(methodName, new ClassDescriptor[]{read.getReturnType()}); + writeMethod = getClassDescriptor().getMethodDescriptor(methodName, read.getReturnType()); } else { throw new CompilerException("Internal error: requesting 'set' method for property of unknown type: '" + getName() + "' (in " + getClassDescriptor() + ")"); } Modified: lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTextComponentHandler.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTextComponentHandler.java 2008-12-28 15:44:40 UTC (rev 1097) +++ lutinjaxx/trunk/jaxx-core/src/main/java/jaxx/tags/swing/JTextComponentHandler.java 2008-12-28 16:03:04 UTC (rev 1098) @@ -29,7 +29,7 @@ protected void setDefaults(CompiledObject object, Element tag, JAXXCompiler compiler) throws CompilerException { super.setDefaults(object, tag, compiler); try { - object.getObjectClass().getMethodDescriptor("setColumns", new ClassDescriptor[]{ClassDescriptorLoader.getClassDescriptor(int.class)}); + object.getObjectClass().getMethodDescriptor("setColumns", ClassDescriptorLoader.getClassDescriptor(int.class)); setAttribute(object, "columns", String.valueOf(DEFAULT_COLUMNS), false, compiler); } catch (NoSuchMethodException e) { Modified: lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/ClassDescriptorTest.java =================================================================== --- lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/ClassDescriptorTest.java 2008-12-28 15:44:40 UTC (rev 1097) +++ lutinjaxx/trunk/jaxx-core/src/test/java/jaxx/junit/ClassDescriptorTest.java 2008-12-28 16:03:04 UTC (rev 1098) @@ -11,7 +11,7 @@ @Test public void testGetClassDescriptor() throws Exception { - ClassDescriptor object = ClassDescriptorLoader.getClassDescriptor("jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode"); + ClassDescriptorLoader.getClassDescriptor("jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode"); } @@ -19,11 +19,11 @@ @Test public void testBuiltInClassName() throws ClassNotFoundException, NoSuchMethodException { ClassDescriptor object = ClassDescriptorLoader.getClassDescriptor("java.lang.Object"); - MethodDescriptor toString = object.getMethodDescriptor("toString", new ClassDescriptor[0]); + MethodDescriptor toString = object.getMethodDescriptor("toString"); assertEquals(toString.getName(), "toString"); assertEquals(toString.getParameterTypes().length, 0); - MethodDescriptor equals = object.getMethodDescriptor("equals", new ClassDescriptor[]{object}); + MethodDescriptor equals = object.getMethodDescriptor("equals", object); assertEquals(equals.getName(), "equals"); assertEquals(equals.getParameterTypes().length, 1); assertEquals(equals.getParameterTypes()[0], object); @@ -39,7 +39,7 @@ @Test public void testUserClassName() throws ClassNotFoundException, NoSuchMethodException { ClassDescriptor me = ClassDescriptorLoader.getClassDescriptor("jaxx.junit.ClassDescriptorTest", getClass().getClassLoader()); - MethodDescriptor testUserClassName = me.getMethodDescriptor("testUserClassName", new ClassDescriptor[0]); + MethodDescriptor testUserClassName = me.getMethodDescriptor("testUserClassName"); assertEquals(testUserClassName.getName(), "testUserClassName"); assertEquals(testUserClassName.getParameterTypes().length, 0); }