[jboss-cvs] JBossAS SVN: r70570 - in projects/microcontainer/trunk/guice-int: src/main/org/jboss/guice/plugins and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 8 06:04:15 EST 2008
Author: adrian at jboss.org
Date: 2008-03-08 06:04:15 -0500 (Sat, 08 Mar 2008)
New Revision: 70570
Modified:
projects/microcontainer/trunk/guice-int/.classpath
projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/InstanceBinder.java
projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/KernelInstanceBinder.java
projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/spi/GuiceIntegration.java
Log:
Fix the eclipse build and sourcecode tidyup
Modified: projects/microcontainer/trunk/guice-int/.classpath
===================================================================
--- projects/microcontainer/trunk/guice-int/.classpath 2008-03-08 02:06:46 UTC (rev 70569)
+++ projects/microcontainer/trunk/guice-int/.classpath 2008-03-08 11:04:15 UTC (rev 70570)
@@ -3,32 +3,6 @@
<classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/jboss-kernel"/>
<classpathentry kind="var" path="M2_REPO/com/google/code/guice/guice/1.0/guice-1.0.jar" sourcepath="M2_REPO/com/google/code/guice/guice/1.0/guice-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-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="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar" sourcepath="M2_REPO/javax/activation/activation/1.1/activation-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-kernel"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
</classpath>
Modified: projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/InstanceBinder.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/InstanceBinder.java 2008-03-08 02:06:46 UTC (rev 70569)
+++ projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/InstanceBinder.java 2008-03-08 11:04:15 UTC (rev 70570)
@@ -39,7 +39,7 @@
SourceProviders.skip(InstanceBinder.class);
}
- private Map<Class, Object> bindings;
+ private Map<Class<?>, Object> bindings;
public InstanceBinder(Binder binder)
{
@@ -51,7 +51,7 @@
{
if (bindings != null && bindings.isEmpty() == false)
{
- for(Map.Entry<Class, Object> entry : bindings.entrySet())
+ for(Map.Entry<Class<?>, Object> entry : bindings.entrySet())
{
Object value = entry.getValue();
if (value == null)
@@ -71,7 +71,7 @@
// todo - unbind all
}
- public void setBindings(Map<Class, Object> bindings)
+ public void setBindings(Map<Class<?>, Object> bindings)
{
this.bindings = bindings;
}
Modified: projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/KernelInstanceBinder.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/KernelInstanceBinder.java 2008-03-08 02:06:46 UTC (rev 70569)
+++ projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/plugins/KernelInstanceBinder.java 2008-03-08 11:04:15 UTC (rev 70570)
@@ -77,7 +77,7 @@
)
}
)
- public void setBindings(Map<Class, Object> bindings)
+ public void setBindings(Map<Class<?>, Object> bindings)
{
super.setBindings(bindings);
}
Modified: projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/spi/GuiceIntegration.java
===================================================================
--- projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/spi/GuiceIntegration.java 2008-03-08 02:06:46 UTC (rev 70569)
+++ projects/microcontainer/trunk/guice-int/src/main/org/jboss/guice/spi/GuiceIntegration.java 2008-03-08 11:04:15 UTC (rev 70570)
@@ -85,6 +85,7 @@
* bind(DataSource.class).toProvider(fromMicrocontainer(DataSource.class, "dataSource"));
* </pre>
*
+ * @param <T> the class type
* @param type the class type
* @param name the bean name
* @return Provider instance
More information about the jboss-cvs-commits
mailing list