diff options
Diffstat (limited to 'pki/base/common/src/com/netscape/cmscore')
25 files changed, 64 insertions, 94 deletions
diff --git a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java index 1c4d9fbcf..a7d5329c0 100644 --- a/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java +++ b/pki/base/common/src/com/netscape/cmscore/authentication/ChallengePhraseAuthentication.java @@ -20,7 +20,6 @@ package com.netscape.cmscore.authentication; import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import java.util.Vector; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.authentication.AuthToken; @@ -80,7 +79,6 @@ public class ChallengePhraseAuthentication implements IAuthManager { private ICertUserLocator mCULocator = null; private ILogger mLogger = CMS.getLogger(); private String mRequestor = null; - private Vector mID = null; private MessageDigest mSHADigest = null; // request attributes hacks diff --git a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java b/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java index 1a1aaa634..16bc40e29 100644 --- a/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/authorization/AuthzSubsystem.java @@ -421,9 +421,8 @@ public class AuthzSubsystem implements IAuthzSubsystem { IAuthzManager mgr = (IAuthzManager) get((String) e.nextElement()); - String infoMsg = - "Shutting down authz manager instance " + mgr.getName(); - + //String infoMsg = + // "Shutting down authz manager instance " + mgr.getName(); //log(ILogger.LL_INFO, infoMsg); mgr.shutdown(); diff --git a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java b/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java index 0dbeb4b51..a9307e858 100644 --- a/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java +++ b/pki/base/common/src/com/netscape/cmscore/base/SubsystemLoader.java @@ -37,8 +37,8 @@ public class SubsystemLoader { private static final String PROP_CLASSNAME = "class"; private static final String PROP_ID = "id"; - public static Vector load(IConfigStore config) throws EBaseException { - Vector v = new Vector(); + public static Vector<ISubsystem> load(IConfigStore config) throws EBaseException { + Vector<ISubsystem> v = new Vector<ISubsystem>(); // load a list of installable subsystems (services) for (int i = 0;; i++) { diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java index 8a05c1c74..cdb315795 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpConnector.java @@ -170,7 +170,7 @@ public class HttpConnector implements IConnector { r.setExtData(IRequest.ERROR, new EBaseException(CMS.getUserMessage("CMS_BASE_REMOTE_AUTHORITY_ERROR"))); // XXX overload svcerrors for now. - Vector policyErrors = r.getExtDataInStringVector(IRequest.ERRORS); + Vector<String> policyErrors = r.getExtDataInStringVector(IRequest.ERRORS); if (policyErrors != null && policyErrors.size() > 0) { r.setExtData(IRequest.SVCERRORS, policyErrors); diff --git a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java b/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java index d7024f4ad..ea235391d 100644 --- a/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java +++ b/pki/base/common/src/com/netscape/cmscore/connector/HttpPKIMessage.java @@ -103,7 +103,6 @@ public class HttpPKIMessage implements IHttpPKIMessage { reqStatus = r.getRequestStatus().toString(); CMS.debug("HttpPKMessage.toRequest: requestStatus=" + reqStatus); - int len = RequestTransfer.getTransferAttributes(r).length; String key; Object value; Enumeration<Object> enum1 = mNameVals.elements(); diff --git a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java b/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java index 962b02a9d..b42bc00f9 100644 --- a/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java +++ b/pki/base/common/src/com/netscape/cmscore/crmf/CRMFParser.java @@ -48,7 +48,7 @@ public class CRMFParser { */ public static PKIArchiveOptionsContainer[] getPKIArchiveOptions(String crmfBlob) throws IOException { - Vector options = new Vector(); + Vector<PKIArchiveOptionsContainer> options = new Vector<PKIArchiveOptionsContainer>(); byte[] crmfBerBlob = null; diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java index f9c4369a2..7eb470d55 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CRLRepository.java @@ -27,7 +27,6 @@ import netscape.security.x509.RevokedCertificate; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.EDBException; -import com.netscape.certsrv.dbs.IDBRegistry; import com.netscape.certsrv.dbs.IDBSSession; import com.netscape.certsrv.dbs.IDBSearchResults; import com.netscape.certsrv.dbs.IDBSubsystem; @@ -59,26 +58,24 @@ public class CRLRepository extends Repository implements ICRLRepository { mBaseDN = baseDN; mDBService = dbService; - IDBRegistry reg = dbService.getRegistry(); - - /** - * String crlRecordOC[] = new String[1]; - * crlRecordOC[0] = Schema.LDAP_OC_CRL_RECORD; - * reg.registerObjectClass(CRLIssuingPointRecord.class.getName(), - * crlRecordOC); - * reg.registerAttribute(ICRLIssuingPointRecord.ATTR_ID, new - * StringMapper(Schema.LDAP_ATTR_CRL_ID)); - * reg.registerAttribute(ICRLIssuingPointRecord.ATTR_CRL_NUMBER, new - * BigIntegerMapper(Schema.LDAP_ATTR_CRL_NUMBER)); - * reg.registerAttribute(ICRLIssuingPointRecord.ATTR_CRL_SIZE, new - * LongMapper(Schema.LDAP_ATTR_CRL_SIZE)); - * reg.registerAttribute(ICRLIssuingPointRecord.ATTR_THIS_UPDATE, new - * DateMapper(Schema.LDAP_ATTR_THIS_UPDATE)); - * reg.registerAttribute(ICRLIssuingPointRecord.ATTR_NEXT_UPDATE, new - * DateMapper(Schema.LDAP_ATTR_NEXT_UPDATE)); - * reg.registerAttribute(ICRLIssuingPointRecord.ATTR_CRL, new - * ByteArrayMapper(Schema.LDAP_ATTR_CRL)); - **/ + /* + DBRegistry reg = dbService.getRegistry(); + String crlRecordOC[] = new String[1]; + crlRecordOC[0] = Schema.LDAP_OC_CRL_RECORD; + reg.registerObjectClass(CRLIssuingPointRecord.class.getName(), crlRecordOC); + reg.registerAttribute(ICRLIssuingPointRecord.ATTR_ID, + new StringMapper(Schema.LDAP_ATTR_CRL_ID)); + reg.registerAttribute(ICRLIssuingPointRecord.ATTR_CRL_NUMBER, + new BigIntegerMapper(Schema.LDAP_ATTR_CRL_NUMBER)); + reg.registerAttribute(ICRLIssuingPointRecord.ATTR_CRL_SIZE, + new LongMapper(Schema.LDAP_ATTR_CRL_SIZE)); + reg.registerAttribute(ICRLIssuingPointRecord.ATTR_THIS_UPDATE, + new DateMapper(Schema.LDAP_ATTR_THIS_UPDATE)); + reg.registerAttribute(ICRLIssuingPointRecord.ATTR_NEXT_UPDATE, + new DateMapper(Schema.LDAP_ATTR_NEXT_UPDATE)); + reg.registerAttribute(ICRLIssuingPointRecord.ATTR_CRL, + new ByteArrayMapper(Schema.LDAP_ATTR_CRL)); + */ } /** diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java index ae77330fc..0df563cad 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java @@ -1535,8 +1535,6 @@ public class CertificateRepository extends Repository public ICertRecordList getInvalidCertsByNotBeforeDate(Date date, int pageSize) throws EBaseException { - Date rightNow = CMS.getCurrentDate(); - ICertRecordList list = null; IDBSSession s = mDBService.createSession(); diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java index 7201f61e7..ddc9f1874 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSSession.java @@ -263,6 +263,7 @@ public class DBSSession implements IDBSSession { return search(base, filter, null); } + @SuppressWarnings("unchecked") public IDBSearchResults search(String base, String filter, int maxSize) throws EBaseException { try { @@ -290,6 +291,7 @@ public class DBSSession implements IDBSSession { } } + @SuppressWarnings("unchecked") public IDBSearchResults search(String base, String filter, int maxSize, int timeLimit) throws EBaseException { try { @@ -322,6 +324,7 @@ public class DBSSession implements IDBSSession { * Retrieves a list of object that satifies the given * filter. */ + @SuppressWarnings("unchecked") public IDBSearchResults search(String base, String filter, String attrs[]) throws EBaseException { try { @@ -458,13 +461,13 @@ public class DBSSession implements IDBSSession { /** * Retrieves a list of objects. */ - public IDBVirtualList<?> createVirtualList(String base, String filter, + public IDBVirtualList<Object> createVirtualList(String base, String filter, String attrs[], String sortKey, int pageSize) throws EBaseException { return new DBVirtualList<Object>(mDBSystem.getRegistry(), mConn, base, filter, attrs, sortKey, pageSize); } - public IDBVirtualList<?> createVirtualList(String base, String filter, + public IDBVirtualList<Object> createVirtualList(String base, String filter, String attrs[], String startFrom, String sortKey, int pageSize) throws EBaseException { return new DBVirtualList<Object>(mDBSystem.getRegistry(), mConn, base, filter, attrs, startFrom, sortKey, pageSize); diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java index 4adb17dd8..4bc5b6471 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java @@ -526,6 +526,7 @@ public class DBSubsystem implements IDBSubsystem { * applications can use. Optionally, check the integrity * of the database. */ + @SuppressWarnings("unchecked") public void init(ISubsystem owner, IConfigStore config) throws EBaseException { diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java b/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java index b89f388ce..aadfb888a 100644 --- a/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java +++ b/pki/base/common/src/com/netscape/cmscore/dbs/Repository.java @@ -23,7 +23,6 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.EDBException; import com.netscape.certsrv.dbs.IDBObj; -import com.netscape.certsrv.dbs.IDBRegistry; import com.netscape.certsrv.dbs.IDBSSession; import com.netscape.certsrv.dbs.IDBSubsystem; import com.netscape.certsrv.dbs.Modification; @@ -90,23 +89,20 @@ public abstract class Repository implements IRepository { BI_INCREMENT = new BigInteger(Integer.toString(increment)); + /* // register schema IDBRegistry reg = db.getRegistry(); - - /** - * if (!reg.isObjectClassRegistered( - * RepositoryRecord.class.getName())) { - * String repRecordOC[] = new String[2]; - * repRecordOC[0] = RepositorySchema.LDAP_OC_TOP; - * repRecordOC[1] = RepositorySchema.LDAP_OC_REPOSITORY; - * reg.registerObjectClass( - * RepositoryRecord.class.getName(), repRecordOC); - * } - * if (!reg.isAttributeRegistered(RepositoryRecord.ATTR_SERIALNO)) { - * reg.registerAttribute(RepositoryRecord.ATTR_SERIALNO, - * new BigIntegerMapper(RepositorySchema.LDAP_ATTR_SERIALNO)); - * } - **/ + if (!reg.isObjectClassRegistered(RepositoryRecord.class.getName())) { + String repRecordOC[] = new String[2]; + repRecordOC[0] = RepositorySchema.LDAP_OC_TOP; + repRecordOC[1] = RepositorySchema.LDAP_OC_REPOSITORY; + reg.registerObjectClass(RepositoryRecord.class.getName(), repRecordOC); + } + if (!reg.isAttributeRegistered(RepositoryRecord.ATTR_SERIALNO)) { + reg.registerAttribute(RepositoryRecord.ATTR_SERIALNO, + new BigIntegerMapper(RepositorySchema.LDAP_ATTR_SERIALNO)); + } + */ } /** @@ -256,7 +252,6 @@ public abstract class Repository implements IRepository { */ private void initCache() throws EBaseException { mNext = getSerialNumber(); - BigInteger serialConfig = new BigInteger("0"); mRadix = 10; CMS.debug("Repository: in InitCache"); diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java index a752c1e29..469ba62a0 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/LdapPredicateParser.java @@ -68,8 +68,6 @@ public class LdapPredicateParser { // The first token cannot be an operator. We are not dealing with // reverse-polish notation. String token = pt.nextToken(); - boolean opANDSeen; - boolean opORSeen; if (getOP(token) != EXPRESSION) { if (Debug.ON) @@ -78,7 +76,7 @@ public class LdapPredicateParser { } ILdapExpression current = parseExpression(token); boolean malformed = false; - Vector expSet = new Vector(); + Vector<ILdapExpression> expSet = new Vector<ILdapExpression>(); int prevType = EXPRESSION; while (pt.hasMoreTokens()) { @@ -156,7 +154,7 @@ public class LdapPredicateParser { if (commaIndex < 0) return LdapSimpleExpression.parse(input); int currentIndex = 0; - Vector expVector = new Vector(); + Vector<LdapSimpleExpression> expVector = new Vector<LdapSimpleExpression>(); while (commaIndex > 0) { LdapSimpleExpression exp = (LdapSimpleExpression) diff --git a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index 147eee07e..453703443 100644 --- a/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -49,7 +49,6 @@ import com.netscape.certsrv.publish.ILdapPublisher; import com.netscape.certsrv.publish.ILdapRule; import com.netscape.certsrv.publish.IPublisherProcessor; import com.netscape.certsrv.publish.IXcertPublisherProcessor; -import com.netscape.certsrv.publish.LdapCertMapResult; import com.netscape.certsrv.publish.MapperPlugin; import com.netscape.certsrv.publish.MapperProxy; import com.netscape.certsrv.publish.PublisherPlugin; @@ -786,7 +785,6 @@ public class PublisherProcessor implements ruleInst = (ILdapRule) Class.forName(className).newInstance(); Vector<String> v = ruleInst.getInstanceParams(); - IConfigStore rc = ruleInst.getConfigStore(); return v; } catch (InstantiationException e) { @@ -1324,8 +1322,6 @@ public class PublisherProcessor implements Object dirdn = null; if (mapper != null) { - LdapCertMapResult result = null; - if (mLdapConnModule != null) { try { conn = mLdapConnModule.getConn(); @@ -1394,8 +1390,6 @@ public class PublisherProcessor implements String dirdn = null; if (mapper != null) { - LdapCertMapResult result = null; - if (mLdapConnModule != null) { conn = mLdapConnModule.getConn(); } @@ -1439,8 +1433,6 @@ public class PublisherProcessor implements String dirdn = null; if (mapper != null) { - LdapCertMapResult result = null; - if (mLdapConnModule != null) { conn = mLdapConnModule.getConn(); } diff --git a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java b/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java index 6ed38a699..90ca05d81 100644 --- a/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/logging/LogQueue.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.logging.ILogQueue; public class LogQueue implements ILogQueue { private static LogQueue mLogQueue = new LogQueue(); - protected Vector mListeners = null; + protected Vector<ILogEventListener> mListeners = null; /** * Constructs a log queue. @@ -52,7 +52,7 @@ public class LogQueue implements ILogQueue { * */ public void init() { - mListeners = new Vector(); + mListeners = new Vector<ILogEventListener>(); } diff --git a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java b/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java index 54a92f723..a057484cf 100644 --- a/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java +++ b/pki/base/common/src/com/netscape/cmscore/notification/EmailFormProcessor.java @@ -193,7 +193,6 @@ public class EmailFormProcessor implements IEmailFormProcessor { // -- for bug 382162, don't remove the following line, in // case John changes his mind for the better // mContent.add(TOK_PREFIX+t); - int tl = token_keys.length; for (int i = 0; i < token_keys.length; i++) { if (t.startsWith(token_keys[i])) { diff --git a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java index 4046c789f..6c73bcb96 100644 --- a/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java +++ b/pki/base/common/src/com/netscape/cmscore/policy/PolicyPredicateParser.java @@ -68,8 +68,6 @@ public class PolicyPredicateParser { // The first token cannot be an operator. We are not dealing with // reverse-polish notation. String token = pt.nextToken(); - boolean opANDSeen; - boolean opORSeen; if (getOP(token) != EXPRESSION) { if (Debug.ON) @@ -78,7 +76,7 @@ public class PolicyPredicateParser { } IExpression current = parseExpression(token); boolean malformed = false; - Vector expSet = new Vector(); + Vector<IExpression> expSet = new Vector<IExpression>(); int prevType = EXPRESSION; while (pt.hasMoreTokens()) { @@ -156,7 +154,7 @@ public class PolicyPredicateParser { if (commaIndex < 0) return SimpleExpression.parse(input); int currentIndex = 0; - Vector expVector = new Vector(); + Vector<SimpleExpression> expVector = new Vector<SimpleExpression>(); while (commaIndex > 0) { SimpleExpression exp = (SimpleExpression) diff --git a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java b/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java index 2435fa462..585af5600 100644 --- a/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/profile/ProfileSubsystem.java @@ -98,7 +98,7 @@ public class ProfileSubsystem implements IProfileSubsystem { String configPath = subStore.getString(PROP_CONFIG); CMS.debug("Start Profile Creation - " + id + " " + classid + " " + info.getClassName()); - IProfile profile = createProfile(id, classid, info.getClassName(), + createProfile(id, classid, info.getClassName(), configPath); CMS.debug("Done Profile Creation - " + id); diff --git a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java b/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java index 0e252f523..16db3985c 100644 --- a/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/pki/base/common/src/com/netscape/cmscore/request/ARequestQueue.java @@ -902,7 +902,6 @@ class Request return true; } - @SuppressWarnings("unchecked") public boolean setExtData(String key, Hashtable<String, String> value) { if (!(isValidExtDataKey(key) && isValidExtDataHashtableValue(value))) { return false; diff --git a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java index 20cdae832..2a9afb868 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java +++ b/pki/base/common/src/com/netscape/cmscore/security/KeyCertUtil.java @@ -485,7 +485,6 @@ public class KeyCertUtil { SEQUENCE seq = (SEQUENCE) ASN1Util.decode(outerSeq, pubkBytes); BIT_STRING bs = (BIT_STRING) seq.elementAt(1); - byte[] bits = bs.getBits(); ByteArrayInputStream bitstream = new ByteArrayInputStream(bs.getBits()); ASN1Header wrapper = new ASN1Header(bitstream); byte[] valBytes = new byte[(int) wrapper.getContentLength()]; diff --git a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java b/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java index 49c84d526..32a0e90ed 100644 --- a/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java +++ b/pki/base/common/src/com/netscape/cmscore/security/PWCBsdr.java @@ -151,9 +151,7 @@ public class PWCBsdr implements PasswordCallback { if (pw != null) { CMS.debug("non-null password returned in first attempt"); - String tmp = new String(pw.getCharCopy()); - - return (pw); + return pw; } else { /* password not found */ // we don't want caller to do getPasswordAgain, for now log(ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_SECURITY_THROW_CALLBACK")); diff --git a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index 6796a3322..a4c4d6854 100644 --- a/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -1511,7 +1511,6 @@ public final class UGSubsystem implements IUGSubsystem { try { LDAPAttribute attrMembers = new LDAPAttribute("uniquemember"); LDAPModificationSet mod = new LDAPModificationSet(); - String st = null; String desc = grp.getDescription(); diff --git a/pki/base/common/src/com/netscape/cmscore/util/Debug.java b/pki/base/common/src/com/netscape/cmscore/util/Debug.java index 66e316c11..8c41d5bb5 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/Debug.java +++ b/pki/base/common/src/com/netscape/cmscore/util/Debug.java @@ -40,15 +40,15 @@ public class Debug so I create a thread-local DateFormatter for each thread */ private static String DATE_PATTERN = "dd/MMM/yyyy:HH:mm:ss"; - private static ThreadLocal mFormatObject = new ThreadLocal() { - protected synchronized Object initialValue() { + private static ThreadLocal<SimpleDateFormat> mFormatObject = new ThreadLocal<SimpleDateFormat>() { + protected synchronized SimpleDateFormat initialValue() { return new SimpleDateFormat(DATE_PATTERN); } }; /* the dateformatter should be accessed with this function */ private static SimpleDateFormat getDateFormatter() { - return ((SimpleDateFormat) (mFormatObject.get())); + return mFormatObject.get(); } public static final boolean ON = false; diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java b/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java index 27d5b6c79..7853346f5 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java +++ b/pki/base/common/src/com/netscape/cmscore/util/FileAsString.java @@ -50,7 +50,7 @@ public class FileAsString { private void readFile() throws IOException { BufferedReader br = createBufferedReader(mFilename); - StringBuffer buf = new StringBuffer(""); + StringBuffer buf = new StringBuffer(); int bytesread = 0; do { @@ -60,7 +60,6 @@ public class FileAsString { if (bytesread > 0) { buf.append(cbuf, 0, bytesread); } - String s = new String(buf); } while (bytesread != -1); br.close(); diff --git a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java b/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java index 454c3c8db..eb1d1097a 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java +++ b/pki/base/common/src/com/netscape/cmscore/util/FileDialogFilter.java @@ -63,7 +63,6 @@ public class FileDialogFilter implements FilenameFilter { */ boolean searchPattern(String fileName, String filter) { int filterCursor = 0; - int fileNameCursor = 0; int filterChar = filter.charAt(filterCursor); diff --git a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java index 3ee2d3ab4..caf05c6df 100644 --- a/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java +++ b/pki/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java @@ -165,12 +165,12 @@ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable { public void updateThreadPanel() { Thread currentThread = Thread.currentThread(); - Vector data = new Vector(); + Vector<Vector<String>> data = new Vector<Vector<String>>(); Thread threads[] = new Thread[100]; int numThreads = Thread.enumerate(threads); for (int i = 0; i < numThreads; i++) { - Vector row = new Vector(); + Vector<String> row = new Vector<String>(); row.addElement(threads[i].getName()); row.addElement(threads[i].getThreadGroup().getName()); @@ -185,7 +185,7 @@ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable { data.addElement(row); } - Vector colNames = new Vector(); + Vector<String> colNames = new Vector<String>(); colNames.addElement("Name"); colNames.addElement("Group"); @@ -220,13 +220,13 @@ class ThreadTableModel extends AbstractTableModel { * */ private static final long serialVersionUID = -6977965542104110870L; - Vector rowData; - Vector columnNames; + Vector<Vector<String>> rowData; + Vector<String> columnNames; public ThreadTableModel() { } - public void setInfo(Vector _rowData, Vector _columnNames) { + public void setInfo(Vector<Vector<String>> _rowData, Vector<String> _columnNames) { rowData = _rowData; columnNames = _columnNames; } @@ -243,16 +243,16 @@ class ThreadTableModel extends AbstractTableModel { return columnNames.size(); } - public Object getValueAt(int row, int column) { - return ((Vector) rowData.elementAt(row)).elementAt(column); + public String getValueAt(int row, int column) { + return rowData.elementAt(row).elementAt(column); } public boolean isCellEditable(int row, int column) { return false; } - public void setValueAt(Object value, int row, int column) { - ((Vector) rowData.elementAt(row)).setElementAt(value, column); + public void setValueAt(String value, int row, int column) { + rowData.elementAt(row).setElementAt(value, column); fireTableCellUpdated(row, column); } } |