Weld SVN: r4687 - api/trunk/cdi/src/main/java/javax/enterprise/inject.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-04 16:58:32 -0500 (Wed, 04 Nov 2009)
New Revision: 4687
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
Log:
add missing bullet point
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-04 21:57:56 UTC (rev 4686)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/package-info.java 2009-11-04 21:58:32 UTC (rev 4687)
@@ -355,6 +355,7 @@
* <p>A bean is available for injection in a certain module if:</p>
*
* <ul>
+ * <li>the bean is not an interceptor or decorator,</li>
* <li>the bean is enabled,</li>
* <li>the bean is either not an alternative, or the module is a bean deployment
* archive and the bean is a selected alternative of the bean deployment
16 years, 5 months
Weld SVN: r4686 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: gavin.king(a)jboss.com
Date: 2009-11-04 16:57:56 -0500 (Wed, 04 Nov 2009)
New Revision: 4686
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
Log:
minor
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-11-04 20:16:16 UTC (rev 4685)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-11-04 21:57:56 UTC (rev 4686)
@@ -210,7 +210,7 @@
/**
* Return an ordered list of enabled {@linkplain Interceptor interceptors} for a set
- * of interceptor bindings.
+ * of interceptor bindings and the type of interception.
*
* @param type the type of the interception
* @param interceptorBindings the interceptor bindings
16 years, 5 months
Weld SVN: r4685 - in core/tags/glassfish-integration/1.0.0-build2: bom and 8 other directories.
by weld-commits＠lists.jboss.org
Author: rogerk
Date: 2009-11-04 15:16:16 -0500 (Wed, 04 Nov 2009)
New Revision: 4685
Modified:
core/tags/glassfish-integration/1.0.0-build2/bom/pom.xml
core/tags/glassfish-integration/1.0.0-build2/embedded-tck-runner/pom.xml
core/tags/glassfish-integration/1.0.0-build2/impl/pom.xml
core/tags/glassfish-integration/1.0.0-build2/inject-tck-runner/pom.xml
core/tags/glassfish-integration/1.0.0-build2/jboss-tck-runner/pom.xml
core/tags/glassfish-integration/1.0.0-build2/osgi-bundle/pom.xml
core/tags/glassfish-integration/1.0.0-build2/parent/pom.xml
core/tags/glassfish-integration/1.0.0-build2/pom.xml
core/tags/glassfish-integration/1.0.0-build2/porting-package/pom.xml
core/tags/glassfish-integration/1.0.0-build2/tests/pom.xml
Log:
build2 pom version updates
Modified: core/tags/glassfish-integration/1.0.0-build2/bom/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/bom/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/bom/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -3,7 +3,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -74,7 +74,7 @@
<weld.api.version>1.0-CR4</weld.api.version>
<google.collections.version>1.0-rc3</google.collections.version>
<javassist.version>3.11.0.GA</javassist.version>
- <cdi.tck.version>1.0.0-CR6</cdi.tck.version>
+ <cdi.tck.version>1.0.0-SNAPSHOT</cdi.tck.version>
<atinject.tck.version>1.0.0-PFD-3</atinject.tck.version>
<jboss.interceptor.version>1.0.0-CR5</jboss.interceptor.version>
<slf4j.version>1.5.9.RC1</slf4j.version>
@@ -175,9 +175,9 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk/bom</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk/bom</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld/core/bom</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/glassfish-integration/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/glassfish-integration/...</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/glassfish-integration/...</url>
</scm>
</project>
Modified: core/tags/glassfish-integration/1.0.0-build2/embedded-tck-runner/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/embedded-tck-runner/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/embedded-tck-runner/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.weld</groupId>
Modified: core/tags/glassfish-integration/1.0.0-build2/impl/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/impl/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/impl/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -3,7 +3,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/tags/glassfish-integration/1.0.0-build2/inject-tck-runner/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/inject-tck-runner/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/inject-tck-runner/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -3,7 +3,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/tags/glassfish-integration/1.0.0-build2/jboss-tck-runner/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/jboss-tck-runner/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/jboss-tck-runner/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/tags/glassfish-integration/1.0.0-build2/osgi-bundle/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/osgi-bundle/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/osgi-bundle/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -16,7 +16,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/tags/glassfish-integration/1.0.0-build2/parent/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/parent/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/parent/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -8,7 +8,7 @@
<parent>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-bom</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<relativePath>../bom</relativePath>
</parent>
@@ -77,7 +77,7 @@
<log4j.version>1.2.14</log4j.version>
<!-- Testing deps -->
<testng.version>5.10</testng.version>
- <jboss.test.harness.version>1.1.0-CR3</jboss.test.harness.version>
+ <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version>
<apache.httpclient.version>3.1</apache.httpclient.version>
<junit.version>4.7</junit.version>
<htmlunit.version>2.4</htmlunit.version>
Modified: core/tags/glassfish-integration/1.0.0-build2/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -4,7 +4,7 @@
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<parent>
<groupId>org.jboss.weld</groupId>
@@ -19,9 +19,9 @@
<!-- SCM and distribution management -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/Weld</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/glassfish-integration/...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/glassfish-integration/...</developerConnection>
+ <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/glassfish-integration/...</url>
</scm>
<profiles>
@@ -34,10 +34,10 @@
<module>bom</module>
<module>parent</module>
<module>impl</module>
- <module>tests</module>
- <module>porting-package</module>
- <module>inject-tck-runner</module>
- <module>jboss-tck-runner</module>
+<!-- <module>tests</module> -->
+<!-- <module>porting-package</module> -->
+<!-- <module>inject-tck-runner</module> -->
+<!-- <module>jboss-tck-runner</module> -->
<module>osgi-bundle</module>
</modules>
</profile>
Modified: core/tags/glassfish-integration/1.0.0-build2/porting-package/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/porting-package/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/porting-package/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -2,7 +2,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: core/tags/glassfish-integration/1.0.0-build2/tests/pom.xml
===================================================================
--- core/tags/glassfish-integration/1.0.0-build2/tests/pom.xml 2009-11-04 19:56:25 UTC (rev 4684)
+++ core/tags/glassfish-integration/1.0.0-build2/tests/pom.xml 2009-11-04 20:16:16 UTC (rev 4685)
@@ -3,7 +3,7 @@
<parent>
<artifactId>weld-core-parent</artifactId>
<groupId>org.jboss.weld</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-build2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
16 years, 5 months
Weld SVN: r4684 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:56:25 -0500 (Wed, 04 Nov 2009)
New Revision: 4684
Modified:
doc/trunk/reference/en-US/environments.xml
Log:
formatting
Modified: doc/trunk/reference/en-US/environments.xml
===================================================================
--- doc/trunk/reference/en-US/environments.xml 2009-11-04 19:52:20 UTC (rev 4683)
+++ doc/trunk/reference/en-US/environments.xml 2009-11-04 19:56:25 UTC (rev 4684)
@@ -225,17 +225,17 @@
<section>
<title>Java SE</title>
- <para>In addition to improved integration of the Enterprise Java stack,
- the "Contexts and Dependency Injection for the Java EE platform" specification
- also defines a state of the art typesafe, stateful dependency injection
- framework, which can prove useful in a wide range of application types.
- To help developers take advantage of this, Weld provides a simple means
- for being executed in the Java Standard Edition environment independently
- of any Java EE APIs.
+ <para>
+ In addition to improved integration of the Enterprise Java stack, the "Contexts and Dependency Injection for
+ the Java EE platform" specification also defines a state of the art typesafe, stateful dependency injection
+ framework, which can prove useful in a wide range of application types. To help developers take advantage of
+ this, Weld provides a simple means for being executed in the Java Standard Edition (SE) environment
+ independently of any Java EE APIs.
</para>
- <para>When executing in the SE environment the following features of Weld
- are available:</para>
+ <para>
+ When executing in the SE environment the following features of Weld are available:
+ </para>
<itemizedlist>
<listitem>
@@ -271,57 +271,59 @@
</itemizedlist>
<section id="weld-se">
- <title>CDI SE Module</title>
+ <title>CDI SE Module</title>
- <para>Weld provides an extension which will boot a CDI
- bean manager in Java SE, automatically registering all simple beans found on
- the classpath. Application developers need not write any bootstrapping code.
- The entry point for application code is a simple bean which observes the special <literal>ContainerInitialized</literal>
- event provided by this extension. The command line parameters can be
- injected using either of the following:
- </para>
- <programlisting role="JAVA"><![CDATA[@Inject @Parameters List<String> params;
+ <para>
+ Weld provides an extension which will boot a CDI bean manager in Java SE, automatically registering all
+ simple beans found on the classpath. Application developers need not write any bootstrapping code. The entry
+ point for application code is a simple bean which observes the special
+ <literal>ContainerInitialized</literal> event provided by this extension. The command line parameters can be
+ injected using either of the following:
+ </para>
+ <programlisting role="JAVA"><![CDATA[@Inject @Parameters List<String> params;
@Inject @Parameters String[] paramsArray; // useful for compatability with existing classes]]></programlisting>
- <para>
- Here's an example of a simple CDI SE application:
- </para>
+ <para>
+ Here's an example of a simple CDI SE application:
+ </para>
- <programlisting role="JAVA"><![CDATA[@ApplicationScoped
+ <programlisting role="JAVA"><![CDATA[@ApplicationScoped
public class HelloWorld
{
- @Inject @Parameters List<String> parameters;
+ @Inject @Parameters List<String> parameters;
public void printHello(@Observes ContainerInitialized event) {
System.out.println("Hello " + parameters.get(0));
}
}]]></programlisting>
- <para>CDI SE applications can be bootstrapped by running the StartMain
- class like so:</para>
- <programlisting role="JAVA"><![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]></programlisting>
+ <para>
+ CDI SE applications can be bootstrapped by running the StartMain class like so:
+ </para>
- <para>
- If you need to do any custom initialization of the CDI bean manager, for example registering custom
- contexts or initializing resources for your beans you can do so in response to the
- <literal>AfterBeanDiscovery</literal> or <literal>AfterDeploymentValidation</literal> events. The following
- example registers a custom context:
- </para>
+ <programlisting role="JAVA"><![CDATA[java org.jboss.weld.environments.se.StartMain <args>]]></programlisting>
+
+ <para>
+ If you need to do any custom initialization of the CDI bean manager, for example registering custom contexts
+ or initializing resources for your beans you can do so in response to the
+ <literal>AfterBeanDiscovery</literal> or <literal>AfterDeploymentValidation</literal> events. The following
+ example registers a custom context:
+ </para>
- <programlisting role="JAVA"><![CDATA[public class PerformSetup {
+ <programlisting role="JAVA"><![CDATA[public class PerformSetup {
public void setup(@Observes AfterBeanDiscovery event) {
event.addContext( ThreadContext.INSTANCE );
}
}]]></programlisting>
- <note>
- <para>
- The command line parameters do not become available for injection until the
- <literal>ContainerInitialized</literal> event is fired. If you need access to the parameters during
- initialization you can do so via the <literal>public static String[] getParameters()</literal> method in
- <literal>StartMain</literal>.
- </para>
- </note>
+ <note>
+ <para>
+ The command line parameters do not become available for injection until the
+ <literal>ContainerInitialized</literal> event is fired. If you need access to the parameters during
+ initialization you can do so via the <literal>public static String[] getParameters()</literal> method in
+ <literal>StartMain</literal>.
+ </para>
+ </note>
</section>
16 years, 5 months
Weld SVN: r4683 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:52:20 -0500 (Wed, 04 Nov 2009)
New Revision: 4683
Modified:
doc/trunk/reference/en-US/injection.xml
Log:
add literal tags
Modified: doc/trunk/reference/en-US/injection.xml
===================================================================
--- doc/trunk/reference/en-US/injection.xml 2009-11-04 19:51:49 UTC (rev 4682)
+++ doc/trunk/reference/en-US/injection.xml 2009-11-04 19:52:20 UTC (rev 4683)
@@ -85,8 +85,8 @@
<itemizedlist>
<listitem>
<para>
- First, the container calls the bean constructor (the default constructor or the one annotated @Inject), to
- obtain an instance of the bean.
+ First, the container calls the bean constructor (the default constructor or the one annotated
+ <literal>@Inject</literal>), to obtain an instance of the bean.
</para>
</listitem>
<listitem>
16 years, 5 months
Weld SVN: r4682 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:51:49 -0500 (Wed, 04 Nov 2009)
New Revision: 4682
Modified:
doc/trunk/reference/en-US/injection.xml
Log:
rephrase
Modified: doc/trunk/reference/en-US/injection.xml
===================================================================
--- doc/trunk/reference/en-US/injection.xml 2009-11-04 19:50:49 UTC (rev 4681)
+++ doc/trunk/reference/en-US/injection.xml 2009-11-04 19:51:49 UTC (rev 4682)
@@ -109,7 +109,7 @@
<tip>
<para>
- One major advantage of using constructor injection is that the bean can be made immutable.
+ One major advantage of constructor injection is that it allows the bean to be immutable.
</para>
</tip>
16 years, 5 months
Weld SVN: r4681 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:50:49 -0500 (Wed, 04 Nov 2009)
New Revision: 4681
Modified:
doc/trunk/reference/en-US/injection.xml
Log:
grammar
Modified: doc/trunk/reference/en-US/injection.xml
===================================================================
--- doc/trunk/reference/en-US/injection.xml 2009-11-04 19:48:10 UTC (rev 4680)
+++ doc/trunk/reference/en-US/injection.xml 2009-11-04 19:50:49 UTC (rev 4681)
@@ -4,10 +4,10 @@
<title>Dependency injection and programmatic lookup</title>
<para>
- One of the most significant features of CDI, certainly the most recognized, is dependency injection. But not just
- dependency injection; type-safe dependency injection. In this chapter, you'll learn how CDI is able to leverage
- the Java type system and annotations to build a dependency injection strategy that is both strongly typed and
- keeps the implementation hidden from the client.
+ One of the most significant features of CDI, certainly the most recognized, is dependency injection; but not just
+ dependency injection, <emphasis>type-safe</emphasis> dependency injection. In this chapter, you'll learn how CDI
+ is able to leverage the Java type system and annotations to build a dependency injection strategy that is both
+ strongly typed and keeps the implementation hidden from the client.
</para>
<section>
16 years, 5 months
Weld SVN: r4680 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:48:10 -0500 (Wed, 04 Nov 2009)
New Revision: 4680
Modified:
doc/trunk/reference/en-US/intro.xml
Log:
typo
Modified: doc/trunk/reference/en-US/intro.xml
===================================================================
--- doc/trunk/reference/en-US/intro.xml 2009-11-04 19:45:53 UTC (rev 4679)
+++ doc/trunk/reference/en-US/intro.xml 2009-11-04 19:48:10 UTC (rev 4680)
@@ -220,9 +220,9 @@
<title>The anatomy of a bean</title>
<para>
- A bean is usually an application class that contains business logic. It may be called directly from Java code,
- or it may be invoked via Unified EL. A bean may access transactional resources. Dependencies between beans are
- managed automatically by the container. Most beans are <emphasis>stateful</emphasis> and
+ A bean is usually an application class that contains business logic. It may be called directly from Java code,
+ or it may be invoked via the Unified EL. A bean may access transactional resources. Dependencies between beans
+ are managed automatically by the container. Most beans are <emphasis>stateful</emphasis> and
<emphasis>contextual</emphasis>. The lifecycle of a bean is always managed by the container.
</para>
16 years, 5 months
Weld SVN: r4679 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:45:53 -0500 (Wed, 04 Nov 2009)
New Revision: 4679
Modified:
doc/trunk/reference/en-US/intro.xml
Log:
remove comma
Modified: doc/trunk/reference/en-US/intro.xml
===================================================================
--- doc/trunk/reference/en-US/intro.xml 2009-11-04 19:42:52 UTC (rev 4678)
+++ doc/trunk/reference/en-US/intro.xml 2009-11-04 19:45:53 UTC (rev 4679)
@@ -62,7 +62,7 @@
<title>Your first bean (or is it?)</title>
<para>
- Suppose that we have two existing Java classes, that we've been using for years in various applications. The
+ Suppose that we have two existing Java classes that we've been using for years in various applications. The
first class parses a string into a list of sentences:
</para>
16 years, 5 months
Weld SVN: r4678 - doc/trunk/reference/en-US.
by weld-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-11-04 14:42:52 -0500 (Wed, 04 Nov 2009)
New Revision: 4678
Modified:
doc/trunk/reference/en-US/gettingstarted.xml
Log:
fix indentation
Modified: doc/trunk/reference/en-US/gettingstarted.xml
===================================================================
--- doc/trunk/reference/en-US/gettingstarted.xml 2009-11-04 19:40:43 UTC (rev 4677)
+++ doc/trunk/reference/en-US/gettingstarted.xml 2009-11-04 19:42:52 UTC (rev 4678)
@@ -1288,6 +1288,7 @@
<programlisting role="JAVA"><![CDATA[@ApplicationScoped
public class Game implements Serializable
{
+
public static final int MAX_NUM_GUESSES = 10;
private Integer number;
@@ -1309,7 +1310,7 @@
{
}
- ...
+ ...
public boolean isValidNumberRange()
{
@@ -1390,7 +1391,6 @@
current game including:
</para>
-
<itemizedlist>
<listitem>
<para>
@@ -1561,41 +1561,40 @@
mainLabel = new javax.swing.JLabel();
messageLabel = new javax.swing.JLabel();
guessText = new javax.swing.JTextField();
- ...
+ ...
mainLabel.setText(msgGenerator.getChallengeMessage());
mainMsgPanel.add(mainLabel);
messageLabel.setText(msgGenerator.getResultMessage());
mainMsgPanel.add(messageLabel);
- ...
+ ...
}
- private void guessButtonActionPerformed( java.awt.event.ActionEvent evt )
- {
+ private void guessButtonActionPerformed( java.awt.event.ActionEvent evt )
+ {
int guess = Integer.parseInt(guessText.getText());
game.setGuess( guess );
game.check();
refreshUI();
+ }
- }
-
private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)
{
game.reset();
refreshUI();
}
- private void refreshUI() {
- mainLabel.setText( msgGenerator.getChallengeMessage() );
- messageLabel.setText( msgGenerator.getResultMessage() );
- guessText.setText( "" );
- guessesLeftBar.setValue( game.getRemainingGuesses() );
+ private void refreshUI() {
+ mainLabel.setText( msgGenerator.getChallengeMessage() );
+ messageLabel.setText( msgGenerator.getResultMessage() );
+ guessText.setText( "" );
+ guessesLeftBar.setValue( game.getRemainingGuesses() );
guessText.requestFocus();
}
// swing components
private javax.swing.JPanel borderPanel;
- ...
+ ...
private javax.swing.JButton replayBtn;
}]]></programlisting>
16 years, 5 months