From 6119a0222dee4953d51311489d8863daa62d9b14 Mon Sep 17 00:00:00 2001 From: Adam Young Date: Thu, 10 Nov 2011 22:12:52 -0500 Subject: call statics statically https://bugzilla.redhat.com/show_bug.cgi?id=728303 Updated with changes from code review Leaving in the warning in GenericASN1Extension, ans that is an indication of a real problem, which will get addressed in a separate patch. --- pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java | 4 ++-- pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java | 4 ++-- pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java | 4 ++-- pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java | 4 ++-- pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java | 4 ++-- pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java | 4 ++-- pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java | 4 ++-- pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java | 2 +- pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) (limited to 'pki/base/silent/src') diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java index 0a1c16660..337bf9275 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureCA.java @@ -244,7 +244,7 @@ public class ConfigureCA { if (temp != null) { int index = temp.indexOf(";"); - hc.j_session_id = temp.substring(0, index); + HTTPClient.j_session_id = temp.substring(0, index); st = true; } @@ -1561,7 +1561,7 @@ public class ConfigureCA { // and then match the arguments String[] unmatched = null; - unmatched = parser.matchAllArgs(args, 0, parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs(args, 0, ArgParser.EXIT_ON_UNMATCHED); if (unmatched != null) { System.out.println("ERROR: Argument Mismatch"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java index 29e3cf19c..c79ec4edd 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureDRM.java @@ -217,7 +217,7 @@ public class ConfigureDRM if (temp!=null) { int index = temp.indexOf(";"); - hc.j_session_id = temp.substring(0,index); + HTTPClient.j_session_id = temp.substring(0,index); st = true; } @@ -1272,7 +1272,7 @@ public class ConfigureDRM // and then match the arguments String [] unmatched = null; - unmatched = parser.matchAllArgs (args,0,parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs (args,0,ArgParser.EXIT_ON_UNMATCHED); if (unmatched!=null) { System.out.println("ERROR: Argument Mismatch"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java index 55f008181..f237b0c70 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureOCSP.java @@ -193,7 +193,7 @@ public class ConfigureOCSP if (temp!=null) { int index = temp.indexOf(";"); - hc.j_session_id = temp.substring(0,index); + HTTPClient.j_session_id = temp.substring(0,index); st = true; } @@ -1136,7 +1136,7 @@ public class ConfigureOCSP // and then match the arguments String [] unmatched = null; - unmatched = parser.matchAllArgs (args,0,parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs (args,0,ArgParser.EXIT_ON_UNMATCHED); if (unmatched!=null) { System.out.println("ERROR: Argument Mismatch"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java index 6bb7cd2c9..fc28e8b42 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureRA.java @@ -148,7 +148,7 @@ public class ConfigureRA if(temp!=null) { int index = temp.indexOf(";"); - hc.j_session_id = temp.substring(0,index); + HTTPClient.j_session_id = temp.substring(0,index); st = true; } @@ -882,7 +882,7 @@ public class ConfigureRA // and then match the arguments String [] unmatched = null; - unmatched = parser.matchAllArgs (args,0,parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs (args,0,ArgParser.EXIT_ON_UNMATCHED); if(unmatched!=null) { diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java index d492d5fcb..93d115fce 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java @@ -199,7 +199,7 @@ public class ConfigureSubCA if (temp!=null) { int index = temp.indexOf(";"); - hc.j_session_id = temp.substring(0,index); + HTTPClient.j_session_id = temp.substring(0,index); st = true; } @@ -1191,7 +1191,7 @@ public class ConfigureSubCA // and then match the arguments String [] unmatched = null; - unmatched = parser.matchAllArgs (args,0,parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs (args,0,ArgParser.EXIT_ON_UNMATCHED); if (unmatched!=null) { System.out.println("ERROR: Argument Mismatch"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java index b681b84c7..d89fb5dd0 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTKS.java @@ -176,7 +176,7 @@ public class ConfigureTKS if (temp!=null) { int index = temp.indexOf(";"); - hc.j_session_id = temp.substring(0,index); + HTTPClient.j_session_id = temp.substring(0,index); st = true; } @@ -1087,7 +1087,7 @@ public class ConfigureTKS // and then match the arguments String [] unmatched = null; - unmatched = parser.matchAllArgs (args,0,parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs (args,0,ArgParser.EXIT_ON_UNMATCHED); if (unmatched!=null) { System.out.println("ERROR: Argument Mismatch"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java index fde32131c..5273fda73 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java +++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureTPS.java @@ -182,7 +182,7 @@ public class ConfigureTPS if(temp!=null) { int index = temp.indexOf(";"); - hc.j_session_id = temp.substring(0,index); + HTTPClient.j_session_id = temp.substring(0,index); st = true; } @@ -1085,7 +1085,7 @@ public class ConfigureTPS // and then match the arguments String [] unmatched = null; - unmatched = parser.matchAllArgs (args,0,parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs (args,0,ArgParser.EXIT_ON_UNMATCHED); if(unmatched!=null) { diff --git a/pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java b/pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java index 479e13e6e..593de3838 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java +++ b/pki/base/silent/src/com/netscape/pkisilent/common/CMSTask.java @@ -165,7 +165,7 @@ public class CMSTask { // and then match the arguments String[] unmatched = null; - unmatched = parser.matchAllArgs(args, 0, parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs(args, 0, ArgParser.EXIT_ON_UNMATCHED); if (unmatched != null) { System.out.println("ERROR: Argument Mismatch"); diff --git a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java index 9c840fcdc..066fb0b4d 100644 --- a/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java +++ b/pki/base/silent/src/com/netscape/pkisilent/http/HTTPClient.java @@ -130,10 +130,10 @@ public class HTTPClient implements SSLCertificateApprovalCallback { try { - socket.enableSSL3Default(true); + SSLSocket.enableSSL3Default(true); socket.enableSSL3(true); socket.enableSSL2(false); - socket.enableSSL2Default(false); + SSLSocket.enableSSL2Default(false); socket.enableV2CompatibleHello(false); } catch(Exception e) @@ -1296,7 +1296,7 @@ public class HTTPClient implements SSLCertificateApprovalCallback // and then match the arguments String [] unmatched = null; - unmatched = parser.matchAllArgs (args,0,parser.EXIT_ON_UNMATCHED); + unmatched = parser.matchAllArgs (args,0,ArgParser.EXIT_ON_UNMATCHED); if(unmatched!=null) { -- cgit