Skip to content

Commit d86c4dc

Browse files
committed
jarName -> identifier
1 parent 8b93431 commit d86c4dc

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

src/main/java/de/jjohannes/gradle/javamodules/AutomaticModuleName.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public class AutomaticModuleName extends ModuleSpec {
44

5-
public AutomaticModuleName(String jarName, String moduleName) {
6-
super(jarName, moduleName);
5+
public AutomaticModuleName(String identifier, String moduleName) {
6+
super(identifier, moduleName);
77
}
88
}

src/main/java/de/jjohannes/gradle/javamodules/ExtraModuleInfoPluginExtension.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,36 @@ public abstract class ExtraModuleInfoPluginExtension {
1919
/**
2020
* Add full module information for a given Jar file.
2121
*/
22-
public void module(String jarName, String moduleName, String moduleVersion) {
23-
module(jarName, moduleName, moduleVersion, null);
22+
public void module(String identifier, String moduleName, String moduleVersion) {
23+
module(identifier, moduleName, moduleVersion, null);
2424
}
2525

2626
/**
2727
* Add full module information, including exported packages and dependencies, for a given Jar file.
2828
*/
29-
public void module(String jarName, String moduleName, String moduleVersion, @Nullable Action<? super ModuleInfo> conf) {
30-
ModuleInfo moduleInfo = new ModuleInfo(jarName, moduleName, moduleVersion);
29+
public void module(String identifier, String moduleName, String moduleVersion, @Nullable Action<? super ModuleInfo> conf) {
30+
ModuleInfo moduleInfo = new ModuleInfo(identifier, moduleName, moduleVersion);
3131
if (conf != null) {
3232
conf.execute(moduleInfo);
3333
}
34-
this.getModuleSpecs().put(jarName, moduleInfo);
34+
this.getModuleSpecs().put(identifier, moduleInfo);
3535
}
3636

3737
/**
3838
* Add only an automatic module name to a given jar file.
3939
*/
40-
public void automaticModule(String jarName, String moduleName) {
41-
automaticModule(jarName, moduleName, null);
40+
public void automaticModule(String identifier, String moduleName) {
41+
automaticModule(identifier, moduleName, null);
4242
}
4343

4444
/**
4545
* Add only an automatic module name to a given jar file.
4646
*/
47-
public void automaticModule(String jarName, String moduleName, @Nullable Action<? super ModuleSpec> conf) {
48-
AutomaticModuleName automaticModuleName = new AutomaticModuleName(jarName, moduleName);
47+
public void automaticModule(String identifier, String moduleName, @Nullable Action<? super ModuleSpec> conf) {
48+
AutomaticModuleName automaticModuleName = new AutomaticModuleName(identifier, moduleName);
4949
if (conf != null) {
5050
conf.execute(automaticModuleName);
5151
}
52-
getModuleSpecs().put(jarName, automaticModuleName);
52+
getModuleSpecs().put(identifier, automaticModuleName);
5353
}
5454
}

src/main/java/de/jjohannes/gradle/javamodules/ModuleInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ public class ModuleInfo extends ModuleSpec {
1616
final Set<String> requiresStatic = new LinkedHashSet<>();
1717
final Set<String> ignoreServiceProviders = new LinkedHashSet<>();
1818

19-
ModuleInfo(String jarName, String moduleName, String moduleVersion) {
20-
super(jarName, moduleName);
19+
ModuleInfo(String identifier, String moduleName, String moduleVersion) {
20+
super(identifier, moduleName);
2121
this.moduleVersion = moduleVersion;
2222
}
2323

src/main/java/de/jjohannes/gradle/javamodules/ModuleSpec.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66

77
abstract public class ModuleSpec implements Serializable {
88

9-
private final String jarName;
9+
private final String identifier;
1010
private final String moduleName;
1111
private final List<String> mergedJars = new ArrayList<>();
1212

13-
public ModuleSpec(String jarName, String moduleName) {
14-
this.jarName = jarName;
13+
public ModuleSpec(String identifier, String moduleName) {
14+
this.identifier = identifier;
1515
this.moduleName = moduleName;
1616
}
1717

18-
public String getJarName() {
19-
return jarName;
18+
public String getIdentifier() {
19+
return identifier;
2020
}
2121

2222
public String getModuleName() {
2323
return moduleName;
2424
}
2525

26-
public void mergeJar(String jar) {
27-
mergedJars.add(jar);
26+
public void mergeJar(String identifier) {
27+
mergedJars.add(identifier);
2828
}
2929

3030
public List<String> getMergedJars() {

0 commit comments

Comments
 (0)