[jboss-cvs] JBossAS SVN: r85910 - in projects/jboss-reflect/trunk: src/main/java/org/jboss/reflect/plugins and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 16 07:38:42 EDT 2009
Author: stalep
Date: 2009-03-16 07:38:42 -0400 (Mon, 16 Mar 2009)
New Revision: 85910
Modified:
projects/jboss-reflect/trunk/.classpath
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoImpl.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ConstructorInfoImpl.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/FieldInfoImpl.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/MethodInfoImpl.java
projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/ModifierInfo.java
projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/ModifierInfoTestCase.java
Log:
[JBREFLECT-49]
fixed ModifierInfo, every test is passing now.
Modified: projects/jboss-reflect/trunk/.classpath
===================================================================
--- projects/jboss-reflect/trunk/.classpath 2009-03-16 11:38:26 UTC (rev 85909)
+++ projects/jboss-reflect/trunk/.classpath 2009-03-16 11:38:42 UTC (rev 85910)
@@ -12,7 +12,7 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar" sourcepath="M2_REPO/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/0.1.1.GA/jboss-server-manager-0.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.1.GA/jboss-test-1.1.1.GA.jar" sourcepath="/SVN/jboss-test/src/main/java"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
<classpathentry kind="output" path="target/classes"/>
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoImpl.java 2009-03-16 11:38:26 UTC (rev 85909)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ClassInfoImpl.java 2009-03-16 11:38:42 UTC (rev 85910)
@@ -447,17 +447,17 @@
public boolean isStatic()
{
- return modifiers.isStatic();
+ return (modifiers != null && modifiers.isStatic());
}
public boolean isPublic()
{
- return modifiers.isPublic();
+ return (modifiers != null && modifiers.isPublic());
}
public boolean isVolatile()
{
- return modifiers.isVolatile();
+ return (modifiers != null && modifiers.isVolatile());
}
public String getName()
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ConstructorInfoImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ConstructorInfoImpl.java 2009-03-16 11:38:26 UTC (rev 85909)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/ConstructorInfoImpl.java 2009-03-16 11:38:42 UTC (rev 85910)
@@ -164,17 +164,17 @@
public boolean isStatic()
{
- return modifiers.isStatic();
+ return (modifiers != null && modifiers.isStatic());
}
public boolean isPublic()
{
- return modifiers.isPublic();
+ return (modifiers != null && modifiers.isPublic());
}
public boolean isVolatile()
{
- return modifiers.isVolatile();
+ return (modifiers != null && modifiers.isVolatile());
}
public Object newInstance(Object[] args) throws Throwable
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/FieldInfoImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/FieldInfoImpl.java 2009-03-16 11:38:26 UTC (rev 85909)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/FieldInfoImpl.java 2009-03-16 11:38:42 UTC (rev 85910)
@@ -105,17 +105,17 @@
public boolean isStatic()
{
- return modifiers.isStatic();
+ return (modifiers != null && modifiers.isStatic());
}
public boolean isPublic()
{
- return modifiers.isPublic();
+ return (modifiers != null && modifiers.isPublic());
}
public boolean isVolatile()
{
- return modifiers.isVolatile();
+ return (modifiers != null && modifiers.isVolatile());
}
public Object get(Object target) throws Throwable
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/MethodInfoImpl.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/MethodInfoImpl.java 2009-03-16 11:38:26 UTC (rev 85909)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/plugins/MethodInfoImpl.java 2009-03-16 11:38:42 UTC (rev 85910)
@@ -187,17 +187,17 @@
public boolean isStatic()
{
- return modifiers.isStatic();
+ return (modifiers != null && modifiers.isStatic());
}
public boolean isPublic()
{
- return modifiers.isPublic();
+ return (modifiers != null && modifiers.isPublic());
}
public boolean isVolatile()
{
- return modifiers.isVolatile();
+ return (modifiers != null && modifiers.isVolatile());
}
public Object invoke(Object target, Object[] args) throws Throwable
Modified: projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/ModifierInfo.java
===================================================================
--- projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/ModifierInfo.java 2009-03-16 11:38:26 UTC (rev 85909)
+++ projects/jboss-reflect/trunk/src/main/java/org/jboss/reflect/spi/ModifierInfo.java 2009-03-16 11:38:42 UTC (rev 85910)
@@ -197,8 +197,6 @@
;
-
-
private final int modifier;
ModifierInfo(int modifier)
@@ -218,8 +216,7 @@
public boolean isPublic()
{
- return (this.equals(PUBLIC) || this.equals(PUBLIC_ABSTRACT) ||
- this.equals(PUBLIC_CONSTANT) || this.equals(PUBLIC_STATIC));
+ return (this.name().startsWith("PUBLIC"));
}
/**
@@ -229,9 +226,7 @@
*/
public boolean isStatic()
{
- return (this.equals(STATIC) || //this.equals(PACKAGE_STATIC) ||
- this.equals(PRIVATE_STATIC) || this.equals(PROTECTED_STATIC) ||
- this.equals(PUBLIC_STATIC));
+ return (this.name().contains("STATIC"));
}
/**
@@ -241,7 +236,7 @@
*/
public boolean isVolatile()
{
- return (this.equals(VOLATILE));
+ return (this.name().contains("VOLATILE"));
}
public static ModifierInfo getNewModifier(int modifiers)
Modified: projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/ModifierInfoTestCase.java
===================================================================
--- projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/ModifierInfoTestCase.java 2009-03-16 11:38:26 UTC (rev 85909)
+++ projects/jboss-reflect/trunk/src/test/java/org/jboss/test/plugins/javassist/ModifierInfoTestCase.java 2009-03-16 11:38:42 UTC (rev 85910)
@@ -34,5 +34,27 @@
{
assertEquals(Modifier.PRIVATE, ModifierInfo.getNewModifier(Modifier.PRIVATE).getModifiers());
}
+
+ public void testIsPublic()
+ {
+ assertTrue(ModifierInfo.PUBLIC.isPublic());
+ assertTrue(ModifierInfo.PUBLIC_ABSTRACT_ANNOTATION.isPublic());
+ assertTrue(ModifierInfo.PUBLIC_ABSTRACT_INTERFACE.isPublic());
+ assertFalse(ModifierInfo.STATIC.isPublic());
+ assertFalse(ModifierInfo.PRIVATE_CONSTANT_SYNTHETIC.isPublic());
+ assertFalse(ModifierInfo.PRIVATE_CONSTANT_ENUM.isPublic());
+ }
+
+ public void testIsStatic()
+ {
+ assertTrue(ModifierInfo.STATIC.isStatic());
+ assertTrue(ModifierInfo.PUBLIC_STATIC.isStatic());
+ assertTrue(ModifierInfo.PROTECTED_STATIC_TRANSIENT.isStatic());
+ assertFalse(ModifierInfo.PROTECTED_ABSTRACT_INTERFACE_ANNOTATION.isStatic());
+ assertFalse(ModifierInfo.PACKAGE_ABSTRACT.isStatic());
+
+
+
+ }
}
More information about the jboss-cvs-commits
mailing list