You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ivy-commits@incubator.apache.org by ma...@apache.org on 2007/06/27 21:47:51 UTC
svn commit: r551347 -
/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java
Author: maartenc
Date: Wed Jun 27 14:47:51 2007
New Revision: 551347
URL: http://svn.apache.org/viewvc?view=rev&rev=551347
Log:
checkstyle fixes
Modified:
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java
Modified: incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java?view=diff&rev=551347&r1=551346&r2=551347
==============================================================================
--- incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java (original)
+++ incubator/ivy/core/trunk/src/java/org/apache/ivy/core/module/descriptor/Configuration.java Wed Jun 27 14:47:51 2007
@@ -26,10 +26,10 @@
* Represents a module configuration
*/
public class Configuration extends DefaultExtendableItem {
- public static class Visibility {
- public static Visibility PUBLIC = new Visibility("public");
+ public static final class Visibility {
+ public static final Visibility PUBLIC = new Visibility("public");
- public static Visibility PRIVATE = new Visibility("private");
+ public static final Visibility PRIVATE = new Visibility("private");
public static Visibility getVisibility(String name) {
if ("private".equals(name)) {
@@ -56,7 +56,7 @@
private String description;
- private String[] _extends;
+ private String[] extendsFrom;
private Visibility visibility;
@@ -91,11 +91,11 @@
this.visibility = visibility;
this.description = description;
if (ext == null) {
- _extends = new String[0];
+ extendsFrom = new String[0];
} else {
- _extends = new String[ext.length];
+ extendsFrom = new String[ext.length];
for (int i = 0; i < ext.length; i++) {
- _extends[i] = ext[i].trim();
+ extendsFrom[i] = ext[i].trim();
}
}
this.transitive = transitive;
@@ -119,7 +119,7 @@
* @return Returns the extends. May be empty, but never null.
*/
public String[] getExtends() {
- return _extends;
+ return extendsFrom;
}
/**
@@ -167,19 +167,19 @@
Configuration[] configs = md.getConfigurations();
Set newExtends = new LinkedHashSet();
- for (int j = 0; j < _extends.length; j++) {
- if ("*".equals(_extends[j])) {
+ for (int j = 0; j < extendsFrom.length; j++) {
+ if ("*".equals(extendsFrom[j])) {
addOther(configs, null, newExtends);
- } else if ("*(public)".equals(_extends[j])) {
+ } else if ("*(public)".equals(extendsFrom[j])) {
addOther(configs, Visibility.PUBLIC, newExtends);
- } else if ("*(private)".equals(_extends[j])) {
+ } else if ("*(private)".equals(extendsFrom[j])) {
addOther(configs, Visibility.PRIVATE, newExtends);
} else {
- newExtends.add(_extends[j]);
+ newExtends.add(extendsFrom[j]);
}
}
- this._extends = (String[]) newExtends.toArray(new String[newExtends.size()]);
+ this.extendsFrom = (String[]) newExtends.toArray(new String[newExtends.size()]);
}
private void addOther(Configuration[] allConfigs, Visibility visibility, Set configs) {