-
Notifications
You must be signed in to change notification settings - Fork 193
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from groovy/master
Merge with groovy/groovy-eclipse:master
- Loading branch information
Showing
83 changed files
with
76,893 additions
and
78,055 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <classpath> | ||
| <classpathentry kind="src" path="src" output="bin"/> | ||
| <classpathentry kind="src" path="src-trace" output="bin-trace"/> | ||
|
|
||
| <classpathentry kind="lib" path="lib/bsf-2.4.0.jar" sourcepath="lib/bsf-2.4.0-sources.jar" exported="true"/> | ||
| <classpathentry kind="lib" path="lib/ivy-2.2.0.jar" sourcepath="lib/ivy-2.2.0-sources.jar" exported="true"/> | ||
| <classpathentry kind="lib" path="lib/groovy-all-2.1.9.jar" sourcepath="lib/groovy-all-2.1.9-sources.jar" exported="true"/> | ||
|
|
||
| <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
| <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> | ||
| <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/> | ||
| <classpathentry kind="src" path="src"/> | ||
| <classpathentry kind="src" output="bin-trace" path="src-trace"/> | ||
| <classpathentry exported="true" kind="lib" path="lib/ivy-2.2.0.jar" sourcepath="lib/ivy-2.2.0-sources.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="lib/bsf-2.4.0.jar"/> | ||
| <classpathentry exported="true" kind="lib" path="lib/groovy-all-2.1.8.jar" sourcepath="lib/groovy-2.1.8-sources.jar"/> | ||
| <classpathentry kind="output" path="bin"/> | ||
| </classpath> |
19 changes: 19 additions & 0 deletions
19
base/org.codehaus.groovy21/.externalToolBuilders/Ant Builder.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?xml version="1.0" standalone="no"?> | ||
|
|
||
| <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType"> | ||
| <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_CLEAN_TARGETS" value="clean," /> | ||
| <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true" /> | ||
| <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false" /> | ||
| <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<resources><item path="/org.codehaus.groovy21" type="4"/></resources>}" /> | ||
| <booleanAttribute key="org.eclipse.debug.core.capture_output" value="false" /> | ||
| <booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="false" /> | ||
| <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false" /> | ||
| <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider" /> | ||
| <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true" /> | ||
| <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="" /> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:<resources><item path="/org.codehaus.groovy21/src/org/codehaus/groovy/antlr/groovy.g" type="1"/></resources>}" /> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${build_project:build.antlr2x}" /> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,clean" /> | ||
| <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true" /> | ||
| <stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${build_project:src/org/codehaus/groovy/antlr}" /> | ||
| </launchConfiguration> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,34 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <projectDescription> | ||
| <name>org.codehaus.groovy21</name> | ||
| <comment></comment> | ||
| <projects> | ||
| </projects> | ||
| <buildSpec> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> | ||
| <triggers>auto,full,incremental,clean,</triggers> | ||
| <arguments> | ||
| <dictionary> | ||
| <key>LaunchConfigHandle</key> | ||
| <value><project>/.externalToolBuilders/Ant Builder.launch</value> | ||
| </dictionary> | ||
| <dictionary> | ||
| <key>incclean</key> | ||
| <value>true</value> | ||
| </dictionary> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.jdt.core.javabuilder</name> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.pde.ManifestBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| <buildCommand> | ||
| <name>org.eclipse.pde.SchemaBuilder</name> | ||
| <arguments> | ||
| </arguments> | ||
| </buildCommand> | ||
| </buildSpec> | ||
| <natures> | ||
| <nature>org.eclipse.jdt.groovy.core.groovyNature</nature> | ||
| <nature>org.eclipse.pde.PluginNature</nature> | ||
| <nature>org.eclipse.jdt.core.javanature</nature> | ||
| <nature>org.eclipse.pde.PluginNature</nature> | ||
| </natures> | ||
| </projectDescription> |
2 changes: 2 additions & 0 deletions
2
base/org.codehaus.groovy21/.settings/org.eclipse.core.runtime.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| eclipse.preferences.version=1 | ||
| line.separator=\n |
102 changes: 90 additions & 12 deletions
102
base/org.codehaus.groovy21/.settings/org.eclipse.jdt.core.prefs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,90 @@ | ||
| #Sat Oct 04 20:16:40 CDT 2008 | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 | ||
| org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
| org.eclipse.jdt.core.compiler.compliance=1.5 | ||
| org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
| org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
| org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
| org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
| org.eclipse.jdt.core.compiler.source=1.5 | ||
| eclipse.preferences.version=1 | ||
| org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled | ||
| org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled | ||
| org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 | ||
| org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve | ||
| org.eclipse.jdt.core.compiler.compliance=1.5 | ||
| org.eclipse.jdt.core.compiler.debug.lineNumber=generate | ||
| org.eclipse.jdt.core.compiler.debug.localVariable=generate | ||
| org.eclipse.jdt.core.compiler.debug.sourceFile=generate | ||
| org.eclipse.jdt.core.compiler.doc.comment.support=disabled | ||
| org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning | ||
| org.eclipse.jdt.core.compiler.problem.assertIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.autoboxing=ignore | ||
| org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning | ||
| org.eclipse.jdt.core.compiler.problem.deadCode=warning | ||
| org.eclipse.jdt.core.compiler.problem.deprecation=ignore | ||
| org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled | ||
| org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled | ||
| org.eclipse.jdt.core.compiler.problem.discouragedReference=warning | ||
| org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore | ||
| org.eclipse.jdt.core.compiler.problem.enumIdentifier=error | ||
| org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore | ||
| org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled | ||
| org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore | ||
| org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning | ||
| org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error | ||
| org.eclipse.jdt.core.compiler.problem.forbiddenReference=error | ||
| org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning | ||
| org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning | ||
| org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning | ||
| org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning | ||
| org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore | ||
| org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning | ||
| org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore | ||
| org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore | ||
| org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled | ||
| org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning | ||
| org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore | ||
| org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled | ||
| org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning | ||
| org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning | ||
| org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning | ||
| org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning | ||
| org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore | ||
| org.eclipse.jdt.core.compiler.problem.nullReference=warning | ||
| org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning | ||
| org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore | ||
| org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning | ||
| org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore | ||
| org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore | ||
| org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore | ||
| org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore | ||
| org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore | ||
| org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore | ||
| org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore | ||
| org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled | ||
| org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning | ||
| org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled | ||
| org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled | ||
| org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore | ||
| org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning | ||
| org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled | ||
| org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning | ||
| org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning | ||
| org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedImport=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedLabel=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore | ||
| org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled | ||
| org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning | ||
| org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning | ||
| org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning | ||
| org.eclipse.jdt.core.compiler.source=1.5 | ||
| org.eclipse.jdt.core.formatter.tabulation.char=space | ||
| org.eclipse.jdt.core.formatter.tabulation.size=4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.