Revision: 1209
Author: [email protected]
Date: Thu Aug 26 12:01:53 2010
Log: Changing Guice Javadoc to build with Doclava (beta)
http://code.google.com/p/google-guice/source/detail?r=1209
Deleted:
/trunk/javadoc
Modified:
/trunk/guice.ipr
/trunk/src/com/google/inject/internal/ProviderMethodsModule.java
/trunk/test/com/google/inject/PrivateModuleTest.java
/trunk/test/com/googlecode/guice/GuiceTck.java
=======================================
--- /trunk/guice.ipr Mon Sep 28 21:32:55 2009
+++ /trunk/guice.ipr Thu Aug 26 12:01:53 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project relativePaths="false" version="4">
+<project version="4">
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
<buildFile url="file://$PROJECT_DIR$/build.xml">
@@ -53,6 +53,7 @@
<option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
<option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true"
/>
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true"
/>
+ <option name="LAYOUT_STATIC_IMPORTS_SEPARATELY" value="false" />
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -60,11 +61,9 @@
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
- <package name="" withSubpackages="true" />
+ <package name="" withSubpackages="true" static="false" />
</value>
</option>
- <option name="OPTIMIZE_IMPORTS_ON_THE_FLY" value="true" />
- <option name="ADD_UNAMBIGIOUS_IMPORTS_ON_THE_FLY" value="true" />
<option name="RIGHT_MARGIN" value="100" />
<option name="CALL_PARAMETERS_WRAP" value="1" />
<option name="METHOD_PARAMETERS_WRAP" value="1" />
@@ -101,7 +100,7 @@
<option name="PARAMETER_ANNOTATION_WRAP" value="1" />
<option name="VARIABLE_ANNOTATION_WRAP" value="1" />
<option name="ENUM_CONSTANTS_WRAP" value="1" />
- <ADDITIONAL_INDENT_OPTIONS fileType="">
+ <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
@@ -110,7 +109,7 @@
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="groovy">
+ <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
@@ -119,8 +118,17 @@
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="gsp">
+ <ADDITIONAL_INDENT_OPTIONS fileType="java">
<option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="js">
+ <option name="INDENT_SIZE" value="4" />
<option name="CONTINUATION_INDENT_SIZE" value="8" />
<option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
@@ -128,10 +136,10 @@
<option name="LABEL_INDENT_SIZE" value="0" />
<option name="LABEL_INDENT_ABSOLUTE" value="false" />
</ADDITIONAL_INDENT_OPTIONS>
- <ADDITIONAL_INDENT_OPTIONS fileType="java">
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="4" />
- <option name="TAB_SIZE" value="8" />
+ <ADDITIONAL_INDENT_OPTIONS fileType="jsp">
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
<option name="USE_TAB_CHARACTER" value="false" />
<option name="SMART_TABS" value="false" />
<option name="LABEL_INDENT_SIZE" value="0" />
@@ -161,9 +169,9 @@
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
- <option name="DEPLOY_AFTER_MAKE" value="0" />
<resourceExtensions />
<wildcardResourcePatterns />
+ <annotationProcessing enabled="false" useClasspath="true" />
</component>
<component name="CopyrightManager" default="">
<module2copyright />
@@ -175,11 +183,8 @@
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</component>
<component name="EclipseCompilerSettings">
- <option name="DEBUGGING_INFO" value="true" />
<option name="GENERATE_NO_WARNINGS" value="true" />
<option name="DEPRECATION" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- <option name="MAXIMUM_HEAP_SIZE" value="128" />
</component>
<component name="EclipseEmbeddedCompilerSettings">
<option name="DEBUGGING_INFO" value="true" />
@@ -195,7 +200,7 @@
<component name="ExportToHTMLSettings">
<option name="printScope" value="1" />
<option name="OPEN_IN_BROWSER" value="true" />
- <option name="OUTPUT_DIRECTORY"
value="/Users/jessewilson/Desktop/exportToHtml" />
+ <option name="OUTPUT_DIRECTORY"
value="$PROJECT_DIR$/../../Desktop/exportToHtml" />
</component>
<component name="FacetAutodetectingManager">
<autodetection-disabled>
@@ -208,9 +213,6 @@
</component>
<component name="IdProvider"
IDEtalkID="0FACE31A44579D2420BBAE592490FBFA" />
<component name="InspectionProjectProfileManager">
- <option name="PROJECT_PROFILE" value="Project Default" />
- <option name="USE_PROJECT_PROFILE" value="true" />
- <version value="1.0" />
<profiles>
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
@@ -242,6 +244,7 @@
</option>
<option name="IGNORE_DEPRECATED" value="false" />
<option name="IGNORE_JAVADOC_PERIOD" value="true" />
+ <option name="IGNORE_DUPLICATED_THROWS" value="false" />
<option name="myAdditionalJavadocTags" value="" />
</inspection_tool>
<inspection_tool class="SSBasedInspection" enabled="false"
level="WARNING" enabled_by_default="false">
@@ -351,17 +354,18 @@
</inspection_tool>
</profile>
</profiles>
- <list size="4">
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
+ <list size="5">
<item index="0" class="java.lang.String" itemvalue="SERVER PROBLEM"
/>
<item index="1" class="java.lang.String" itemvalue="INFO" />
- <item index="2" class="java.lang.String" itemvalue="WARNING" />
- <item index="3" class="java.lang.String" itemvalue="ERROR" />
+ <item index="2" class="java.lang.String" itemvalue="TYPO" />
+ <item index="3" class="java.lang.String" itemvalue="WARNING" />
+ <item index="4" class="java.lang.String" itemvalue="ERROR" />
</list>
</component>
<component name="JavacSettings">
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="DEPRECATION" value="true" />
<option name="ADDITIONAL_OPTIONS_STRING" value="-Xlint:all
-Xlint:-serial" />
<option name="MAXIMUM_HEAP_SIZE" value="256" />
</component>
@@ -382,14 +386,6 @@
<option name="LOCALE" />
<option name="OPEN_IN_BROWSER" value="false" />
</component>
- <component name="JikesSettings">
- <option name="JIKES_PATH" value="" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="DEPRECATION" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="IS_EMACS_ERRORS_MODE" value="true" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
- </component>
<component name="LogConsolePreferences">
<option name="FILTER_ERRORS" value="false" />
<option name="FILTER_WARNINGS" value="false" />
@@ -520,7 +516,6 @@
<component name="ProjectDetails">
<option name="projectName" value="guice" />
</component>
- <component name="ProjectFileVersion" converted="true" />
<component name="ProjectKey">
<option name="state"
value="https://google-guice.googlecode.com/svn/trunk/guice.ipr"; />
</component>
@@ -532,6 +527,7 @@
<module fileurl="file://$PROJECT_DIR$/extensions/jmx/jmx.iml"
filepath="$PROJECT_DIR$/extensions/jmx/jmx.iml" />
<module fileurl="file://$PROJECT_DIR$/extensions/jndi/jndi.iml"
filepath="$PROJECT_DIR$/extensions/jndi/jndi.iml" />
<module
fileurl="file://$PROJECT_DIR$/extensions/multibindings/multibindings.iml"
filepath="$PROJECT_DIR$/extensions/multibindings/multibindings.iml" />
+ <module
fileurl="file://$PROJECT_DIR$/extensions/persist/persist.iml"
filepath="$PROJECT_DIR$/extensions/persist/persist.iml" />
<module fileurl="file://$PROJECT_DIR$/servlet/servlet.iml"
filepath="$PROJECT_DIR$/servlet/servlet.iml" />
<module fileurl="file://$PROJECT_DIR$/spring/spring.iml"
filepath="$PROJECT_DIR$/spring/spring.iml" />
<module
fileurl="file://$PROJECT_DIR$/struts2/example/struts2-example.iml"
filepath="$PROJECT_DIR$/struts2/example/struts2-example.iml" />
@@ -539,7 +535,7 @@
<module
fileurl="file://$PROJECT_DIR$/extensions/throwingproviders/throwingproviders.iml"
filepath="$PROJECT_DIR$/extensions/throwingproviders/throwingproviders.iml"
/>
</modules>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5"
assert-keyword="true" jdk-15="true" project-jdk-name="1.5"
project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5"
assert-keyword="true" jdk-15="true" project-jdk-name="1.6"
project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/classes" />
</component>
<component name="ResourceManagerContainer">
@@ -548,13 +544,6 @@
<list size="0" />
</value>
</option>
- </component>
- <component name="RmicSettings">
- <option name="IS_EANABLED" value="false" />
- <option name="DEBUGGING_INFO" value="true" />
- <option name="GENERATE_NO_WARNINGS" value="false" />
- <option name="GENERATE_IIOP_STUBS" value="false" />
- <option name="ADDITIONAL_OPTIONS_STRING" value="" />
</component>
<component name="SvnBranchConfigurationManager">
<option name="myConfigurationMap">
@@ -562,6 +551,25 @@
<entry key="$PROJECT_DIR$">
<value>
<SvnBranchConfiguration>
+ <option name="branchMap">
+ <map>
+ <entry
key="https://google-guice.googlecode.com/svn/branches";>
+ <value>
+ <list />
+ </value>
+ </entry>
+ <entry
key="https://google-guice.googlecode.com/svn/tags";>
+ <value>
+ <list />
+ </value>
+ </entry>
+ <entry
key="https://google-guice.googlecode.com/svn/wiki";>
+ <value>
+ <list />
+ </value>
+ </entry>
+ </map>
+ </option>
<option name="branchUrls">
<list>
<option
value="https://google-guice.googlecode.com/svn/branches"; />
=======================================
--- /trunk/src/com/google/inject/internal/ProviderMethodsModule.java Sat
Jul 3 08:51:31 2010
+++ /trunk/src/com/google/inject/internal/ProviderMethodsModule.java Thu
Aug 26 12:01:53 2010
@@ -138,7 +138,11 @@
@Override public int hashCode() {
return delegate.hashCode();
}
-
+
+ @Override public String toString() {
+ return ProviderMethodsModule.class.getName() + "forModule(" + delegate
+ ")";
+ }
+
/** A provider that returns a logger based on the method name. */
private static final class LogProvider implements Provider<Logger> {
private final String name;
=======================================
--- /trunk/test/com/google/inject/PrivateModuleTest.java Sat Jul 3
08:51:31 2010
+++ /trunk/test/com/google/inject/PrivateModuleTest.java Thu Aug 26
12:01:53 2010
@@ -22,8 +22,11 @@
import com.google.inject.name.Names;
import static com.google.inject.name.Names.named;
import com.google.inject.spi.Dependency;
+import com.google.inject.spi.Element;
+import com.google.inject.spi.Elements;
import com.google.inject.spi.ExposedBinding;
import com.google.inject.spi.PrivateElements;
+import com.google.inject.util.ParallelModule;
import junit.framework.TestCase;
/**
=======================================
--- /trunk/test/com/googlecode/guice/GuiceTck.java Tue Sep 29 01:31:20 2009
+++ /trunk/test/com/googlecode/guice/GuiceTck.java Thu Aug 26 12:01:53 2010
@@ -19,6 +19,12 @@
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Provides;
+import com.google.inject.internal.util.ImmutableSet;
+import com.google.inject.spi.Element;
+import com.google.inject.spi.Elements;
+import com.google.inject.util.ParallelModule;
+import java.util.LinkedHashSet;
+import java.util.Set;
import javax.inject.Named;
import junit.framework.Test;
import org.atinject.tck.Tck;
--
You received this message because you are subscribed to the Google Groups
"google-guice-dev" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/google-guice-dev?hl=en.
