Browse Source

Coding standard

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272451 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 23 years ago
parent
commit
52b40a80a3
4 changed files with 23 additions and 22 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/ProjectHelper.java
  2. +2
    -2
      src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java
  3. +5
    -4
      src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java
  4. +15
    -15
      src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java

+ 1
- 1
src/main/org/apache/tools/ant/ProjectHelper.java View File

@@ -490,7 +490,7 @@ public class ProjectHelper {
fragments.addElement(value.substring(pos + 1, pos + 2));
prev = pos + 2;
*/
if(value.charAt(pos + 1) == '$') {
if (value.charAt(pos + 1) == '$') {
//backwards compatibility two $ map to one mode
fragments.addElement("$");
prev = pos + 2;


+ 2
- 2
src/main/org/apache/tools/ant/taskdefs/cvslib/ChangeLogTask.java View File

@@ -302,7 +302,7 @@ public class ChangeLogTask extends Task {
final CVSEntry[] entrySet = parser.getEntrySetAsArray();
final CVSEntry[] filteredEntrySet = filterEntrySet(entrySet);

replaceAuthorIdWithName(userList,filteredEntrySet);
replaceAuthorIdWithName(userList, filteredEntrySet);

writeChangeLog(filteredEntrySet);

@@ -393,7 +393,7 @@ public class ChangeLogTask extends Task {
*/
private void replaceAuthorIdWithName(final Properties userList,
final CVSEntry[] entrySet) {
for (int i = 0; i < entrySet.length; i++ ) {
for (int i = 0; i < entrySet.length; i++) {

final CVSEntry entry = entrySet[ i ];
if (userList.containsKey(entry.getAuthor())) {


+ 5
- 4
src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJImportServlet.java View File

@@ -94,9 +94,10 @@ public class VAJImportServlet extends VAJToolsServlet {
getBooleanParam(CLASSES_PARAM, false),
getBooleanParam(RESOURCES_PARAM, true),
getBooleanParam(SOURCES_PARAM, true),
false // no default excludes, because they
// are already added on client side
// getBooleanParam(DEFAULT_EXCLUDES_PARAM, true)
);
false);
// no default excludes, because they
// are already added on client side
// getBooleanParam(DEFAULT_EXCLUDES_PARAM, true)
}
}

+ 15
- 15
src/main/org/apache/tools/ant/taskdefs/optional/net/SetProxy.java View File

@@ -96,7 +96,7 @@ public class SetProxy extends Task {
/**
* list of non proxy hosts
*/
private String nonProxyHosts=null;
private String nonProxyHosts = null;

/**
* set a proxy host. the port should be defined too
@@ -155,14 +155,14 @@ public class SetProxy extends Task {
*/

public void applyWebProxySettings() {
boolean settingsChanged=false;
boolean enablingProxy=false;
boolean settingsChanged = false;
boolean enablingProxy = false;
Properties sysprops = System.getProperties();
if(proxyHost!=null) {
settingsChanged=true;
if (proxyHost.length()!=0) {
if (proxyHost != null) {
settingsChanged = true;
if (proxyHost.length() != 0) {
traceSettingInfo();
enablingProxy=true;
enablingProxy = true;
sysprops.put("http.proxyHost", proxyHost);
String portString = Integer.toString(proxyPort);
sysprops.put("http.proxyPort", portString);
@@ -170,12 +170,12 @@ public class SetProxy extends Task {
sysprops.put("https.proxyPort", portString);
sysprops.put("ftp.proxyHost", proxyHost);
sysprops.put("ftp.proxyPort", portString);
if(nonProxyHosts!=null) {
if (nonProxyHosts != null) {
sysprops.put("http.nonProxyHosts", nonProxyHosts);
sysprops.put("ftp.nonProxyHosts", nonProxyHosts);
}
} else {
log("resetting http proxy",Project.MSG_VERBOSE);
log("resetting http proxy", Project.MSG_VERBOSE);
sysprops.remove("http.proxyPort");
sysprops.remove("https.proxyHost");
sysprops.remove("https.proxyPort");
@@ -186,13 +186,13 @@ public class SetProxy extends Task {

//socks
if (socksProxyHost != null) {
settingsChanged=true;
if(socksProxyHost.length()!=0) {
enablingProxy=true;
settingsChanged = true;
if (socksProxyHost.length() != 0) {
enablingProxy = true;
sysprops.put("socksProxyHost", socksProxyHost);
sysprops.put("socksProxyPort", Integer.toString(socksProxyPort));
} else {
log("resetting socks proxy",Project.MSG_VERBOSE);
log("resetting socks proxy", Project.MSG_VERBOSE);
sysprops.remove("socksProxyHost");
sysprops.remove("socksProxyPort");
}
@@ -200,7 +200,7 @@ public class SetProxy extends Task {

//for Java1.1 we need to tell the system that the settings are new
if(settingsChanged && project.getJavaVersion() == Project.JAVA_1_1) {
if (settingsChanged && project.getJavaVersion() == Project.JAVA_1_1) {
legacyResetProxySettingsCall(enablingProxy);
}
}
@@ -210,7 +210,7 @@ public class SetProxy extends Task {
*/
private void traceSettingInfo() {
log("Setting proxy to "
+ (proxyHost!=null?proxyHost:"''")
+ (proxyHost != null ? proxyHost : "''")
+ ":" + proxyPort,
Project.MSG_VERBOSE);
}


Loading…
Cancel
Save