Skip to content
This repository has been archived by the owner on Apr 13, 2023. It is now read-only.

Commit

Permalink
tabs to spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@gavinking
gavinking committed Apr 24, 2018
1 parent 80584e0 commit 28eaaca
Show file tree
Hide file tree
Showing 468 changed files with 4,127 additions and 4,127 deletions.
6 changes: 3 additions & 3 deletions cli/src/org/eclipse/ceylon/common/tools/AbstractTestTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ public abstract class AbstractTestTool extends RepoUsingTool {
private final Integer jsBinaryMinor;

public AbstractTestTool(ResourceBundle bundle, ModuleQuery.Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) {
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) {
super(bundle);
this.type = type;
this.jvmBinaryMajor = jvmBinaryMajor;
Expand Down Expand Up @@ -254,7 +254,7 @@ private String findTestVersionInDependecies(String moduleAndVersion) {
private String findTestVersionInDependecies(ModuleDependencyInfo module, Queue<ModuleDependencyInfo> queue) {
Collection<ModuleVersionDetails> moduleDetailsCollection = getModuleVersions(
module.getNamespace(), module.getName(), module.getVersion(), false,
type, jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
type, jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
Iterator<ModuleVersionDetails> moduleDetailsIterator = moduleDetailsCollection.iterator();
if( moduleDetailsIterator.hasNext() ) {
ModuleVersionDetails moduleDetails = moduleDetailsIterator.next();
Expand Down
46 changes: 23 additions & 23 deletions cli/src/org/eclipse/ceylon/common/tools/RepoUsingTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ protected synchronized RepositoryManager getOfflineRepositoryManager() {
}

protected ModuleVersionQuery getModuleVersionQuery(String namespace, String name, String version, ModuleQuery.Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) {
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) {
ModuleVersionQuery query = new ModuleVersionQuery(namespace, name, version, type);
if (jvmBinaryMajor != null) {
query.setJvmBinaryMajor(jvmBinaryMajor);
Expand All @@ -305,30 +305,30 @@ protected ModuleVersionQuery getModuleVersionQuery(String namespace, String name

protected Collection<ModuleVersionDetails> getModuleVersions(String namespace, String name, String version, boolean exactVersionMatch,
ModuleQuery.Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) {
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) {
return getModuleVersions(getRepositoryManager(), namespace, name, version, exactVersionMatch, type,
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
}

protected Collection<ModuleVersionDetails> getModuleVersions(RepositoryManager repoMgr, String namespace, String name, String version,
boolean exactVersionMatch, ModuleQuery.Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) {
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) {
ModuleVersionQuery query = getModuleVersionQuery(namespace, name, version, type,
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
query.setExactVersionMatch(exactVersionMatch);
ModuleVersionResult result = repoMgr.completeVersions(query);
NavigableMap<String, ModuleVersionDetails> versionMap = result.getVersions();
return versionMap.values();
}

protected String checkModuleVersionsOrShowSuggestions(String name, String version,
ModuleQuery.Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) throws IOException {
ModuleQuery.Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) throws IOException {
return checkModuleVersionsOrShowSuggestions(name, version, type,
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor, COMPILE_NEVER);
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor, COMPILE_NEVER);
}

protected static final String COMPILE_NEVER = "never";
Expand Down Expand Up @@ -357,10 +357,10 @@ private boolean validCompileFlags(String compileFlags) {
}

protected String checkModuleVersionsOrShowSuggestions(String name, String version,
ModuleQuery.Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor,
String compileFlags) throws IOException {
ModuleQuery.Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor,
String compileFlags) throws IOException {
RepositoryManager repoMgr = getRepositoryManager();
if (compileFlags == null || compileFlags.isEmpty() || !compilationPossible()) {
compileFlags = COMPILE_NEVER;
Expand Down Expand Up @@ -396,7 +396,7 @@ protected String checkModuleVersionsOrShowSuggestions(String name, String versio
// try that first
if (version == null && !ModuleUtil.isDefaultModule(name) && versions == null) {
versions = findCompiledVersions(getOfflineRepositoryManager(), name, type,
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
if (versions != null && versions.size() == 1) {
ModuleVersionDetails compiledVersion = versions.iterator().next();
if (compiledVersion != null && compiledVersion.getVersion() != null) {
Expand Down Expand Up @@ -439,7 +439,7 @@ protected String checkModuleVersionsOrShowSuggestions(String name, String versio
if (versions == null) {
// First see which versions we have available locally
versions = getModuleVersions(getOfflineRepositoryManager(), null, name, version, false, type,
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
if (versions.isEmpty() && !offline) {
// No local versions and we're not offline, so let's try again online
versions = getModuleVersions(repoMgr, null, name, version, false, type,
Expand Down Expand Up @@ -485,7 +485,7 @@ protected String checkModuleVersionsOrShowSuggestions(String name, String versio
// Maybe the user specified the wrong version?
// Let's see if we can find any locally and suggest them
versions = getModuleVersions(getOfflineRepositoryManager(), null, name, null, false, type,
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
if (versions.isEmpty() && !offline) {
// No local versions and we're not offline, so let's try again online
versions = getModuleVersions(repoMgr, null, name, null, false, type,
Expand Down Expand Up @@ -570,9 +570,9 @@ private boolean inexactSingleMatch(Collection<ModuleVersionDetails> versions, St

private Collection<ModuleVersionDetails> findCompiledVersions(RepositoryManager repoMgr,
String name,
Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) throws IOException {
Type type,
Integer jvmBinaryMajor, Integer jvmBinaryMinor,
Integer jsBinaryMajor, Integer jsBinaryMinor) throws IOException {
String outRepo = DefaultToolOptions.getCompilerOutputRepo();
if(outRepo != null){
File outDir = new File(outRepo);
Expand All @@ -598,7 +598,7 @@ private Collection<ModuleVersionDetails> findCompiledVersions(RepositoryManager
}
if(rep != null && rep.isSearchable()){
ModuleVersionQuery query = getModuleVersionQuery(null, name, null, type,
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
jvmBinaryMajor, jvmBinaryMinor, jsBinaryMajor, jsBinaryMinor);
ModuleVersionResult result = new ModuleVersionResult(query.getName());
rep.completeVersions(query, result);
NavigableMap<String, ModuleVersionDetails> outRepoVersions = result.getVersions();
Expand Down
4 changes: 2 additions & 2 deletions cli/src/org/eclipse/ceylon/common/tools/config/CeylonConfigTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ public void run() throws Exception {
}

@Description("Sets the password for `<alias>` in the keystore. " +
"The program will issue a password prompt if `<password>` is omitted.")
"The program will issue a password prompt if `<password>` is omitted.")
public class SetPassword implements Tool {

private String alias;
Expand Down Expand Up @@ -384,7 +384,7 @@ public void run() throws Exception {
}

@Description("Unsets the password for `<alias>` in the keystore, " +
"removing the alias and its corresponding password.")
"removing the alias and its corresponding password.")
public class UnsetPassword implements Tool {

private String alias;
Expand Down
2 changes: 1 addition & 1 deletion cli/src/org/eclipse/ceylon/common/tools/help/DocBookVisitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void start(Doc doc) {
// ResourceBundle bundle = CeylonHelpToolMessages.RESOURCE_BUNDLE;
if (!omitDoctype) {
docbook.doctype(
"refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\"\n"+
"refentry PUBLIC \"-//OASIS//DTD DocBook XML V4.1.2//EN\"\n"+
"\"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd\"").text("\n");
}

Expand Down
22 changes: 11 additions & 11 deletions cli/test/src/org/eclipse/ceylon/common/tool/example/TestExampleTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
*/
@Summary("An example tool which demonstrates how to write a Tool.")
@Description("A tool must implement the `Plugin` interface, and it has annotated " +
"setters for each option/argument it recieves from the command line arguments." +
"The name of the tool is derived from the name of the class, which must " +
"begin with `Ceylon` and end with `Tool`")
"setters for each option/argument it recieves from the command line arguments." +
"The name of the tool is derived from the name of the class, which must " +
"begin with `Ceylon` and end with `Tool`")
public class TestExampleTool implements Tool {

private boolean longName;
Expand Down Expand Up @@ -82,20 +82,20 @@ public TestExampleTool() {
}
@Option(longName="long-name", shortName='F')
@Description("An example of a plain option. " +
"Options are setters annotated with `@Option`. " +
"If no name is given then a name is derived from the name of the setter. " +
"If no `@Option.shortName` is given the option has no short name. " +
"The type of a pure option must be boolean (it will be called " +
"with a true argument if the option is present on the command line)")
"Options are setters annotated with `@Option`. " +
"If no name is given then a name is derived from the name of the setter. " +
"If no `@Option.shortName` is given the option has no short name. " +
"The type of a pure option must be boolean (it will be called " +
"with a true argument if the option is present on the command line)")
public void setLongName(boolean foo) {
this.longName = foo;
}

@OptionArgument(shortName='b')
@Description("An example of a single-valued option argument. " +
"Single-valued option arguments are setters annotated with `@OptionArgument` " +
"which take a 'simple' argument." +
"The type of an option argument is implied by the type of the setter parameter." +
"Single-valued option arguments are setters annotated with `@OptionArgument` " +
"which take a 'simple' argument." +
"The type of an option argument is implied by the type of the setter parameter." +
"If no name is given then a name is derived from the name of the setter. " +
"If no `@Option.shortName` is given the option has no short name. " +
"An error will be generated when parsing the command line if the " +
Expand Down
6 changes: 3 additions & 3 deletions cmr-aether/src/org/eclipse/ceylon/cmr/resolver/aether/AetherException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

@SuppressWarnings("serial")
public class AetherException extends Exception {
AetherException(RepositoryException cause){
super(cause);
}
AetherException(RepositoryException cause){
super(cause);
}
}
8 changes: 4 additions & 4 deletions cmr-aether/src/org/eclipse/ceylon/cmr/resolver/aether/AetherResolver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

public interface AetherResolver {

public DependencyDescriptor getDependencies(String groupId, String artifactId, String version, boolean fetchSingleArtifact)
throws AetherException;
public DependencyDescriptor getDependencies(String groupId, String artifactId, String version, boolean fetchSingleArtifact)
throws AetherException;

public DependencyDescriptor getDependencies(String groupId, String artifactId, String version,
String classifier, String extension, boolean fetchSingleArtifact)
throws AetherException;
String classifier, String extension, boolean fetchSingleArtifact)
throws AetherException;

public List<String> resolveVersionRange(String groupId, String artifactId, String versionRange) throws AetherException;

Expand Down
Loading

0 comments on commit 28eaaca

Please sign in to comment.