From cf364c082dfe5ea566abc3c20bc5546a4629c5eb Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 11:47:24 +0000
Subject: [PATCH] AutoRefactor: remove unnecessary use of "this" in method calls
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java | 21 ++++------
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java | 8 ++--
opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java | 5 +-
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java | 3 -
opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java | 2
opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java | 3 -
opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagementContext.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/server/MonitoringPublisher.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java | 2
18 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 40b67bc..7b2099a 100644
--- a/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opendj-server-legacy/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -216,8 +216,7 @@
System.setProperty("mapAnyUriToUri", "true");
if(jaxbContext==null)
- jaxbContext = JAXBContext.newInstance(PKG_NAME,
- this.getClass().getClassLoader());
+ jaxbContext = JAXBContext.newInstance(PKG_NAME, getClass().getClassLoader());
// assign the DSMLv2 schema for validation
if(schema==null)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
index e43f9a0..a871af6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/BasicMonitoringAttributes.java
@@ -385,7 +385,7 @@
isTime = attributeName.indexOf("time") != -1;
isNumeric =
- !this.isGMTDate() &&
+ !isGMTDate() &&
this != SYSTEM_NAME &&
this != OPERATING_SYSTEM &&
this != CLASS_PATH &&
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
index d4400fd..f2ac402 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/CustomSearchResult.java
@@ -197,20 +197,17 @@
* {@inheritDoc}
*/
public int compareTo(CustomSearchResult o) {
- int compareTo;
if (this.equals(o))
{
- compareTo = 0;
+ return 0;
}
- else
- {
- compareTo = toString().compareTo(o.toString());
- }
- return compareTo;
+ return toString().compareTo(o.toString());
}
/**
- * {@inheritDoc}
+ * Return a new object, copy of the current object.
+ *
+ * @return a new object, copy of the current object
*/
public CustomSearchResult duplicate()
{
@@ -303,7 +300,7 @@
*/
public Entry getEntry() throws OpenDsException
{
- DN dn = DN.valueOf(this.getDN());
+ DN dn = DN.valueOf(getDN());
Map<ObjectClass,String> objectClasses = new HashMap<ObjectClass,String>();
Map<AttributeType,List<org.opends.server.types.Attribute>> userAttributes =
new HashMap<AttributeType,List<org.opends.server.types.Attribute>>();
@@ -311,7 +308,7 @@
operationalAttributes =
new HashMap<AttributeType,List<org.opends.server.types.Attribute>>();
- for (String wholeName : this.getAttributeNames())
+ for (String wholeName : getAttributeNames())
{
final org.opends.server.types.Attribute attribute =
LDIFReader.parseAttrDescription(wholeName);
@@ -322,7 +319,7 @@
// corresponding definition and add the value to the appropriate hash.
if (lowerName.equals("objectclass"))
{
- for (Object value : this.getAttributeValues(attrName))
+ for (Object value : getAttributeValues(attrName))
{
String ocName = value.toString().trim();
String lowerOCName = toLowerCase(ocName);
@@ -346,7 +343,7 @@
}
AttributeBuilder builder = new AttributeBuilder(attribute, true);
- for (Object value : this.getAttributeValues(attrName))
+ for (Object value : getAttributeValues(attrName))
{
ByteString bs;
if (value instanceof byte[])
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
index b750d5e..1160af4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/CustomTree.java
@@ -74,7 +74,7 @@
*/
public void paintComponent(Graphics g)
{
- int[] selectedRows = this.getSelectionRows();
+ int[] selectedRows = getSelectionRows();
if (selectedRows == null)
{
selectedRows = new int[] {};
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
index 6b707bf..ba60f5a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/SplashScreen.java
@@ -155,7 +155,7 @@
String resource = INFO_SPLASH_ICON.get().toString();
resource = "org/opends/quicksetup/" + resource;
return Toolkit.getDefaultToolkit().createImage(
- this.getClass().getClassLoader().getResource(resource));
+ getClass().getClassLoader().getResource(resource));
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java
index 5fb035b..8c896d8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -113,7 +113,7 @@
checkAbort();
// create license accepted file
- LicenseFile.createFileLicenseApproved(this.getInstallationPath());
+ LicenseFile.createFileLicenseApproved(getInstallationPath());
checkAbort() ;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
index f844ca9..18e51fd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -160,7 +160,7 @@
checkAbort();
// create license accepted file
- LicenseFile.createFileLicenseApproved(this.getInstallationPath());
+ LicenseFile.createFileLicenseApproved(getInstallationPath());
createData();
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagementContext.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagementContext.java
index a1da725..e55cd87 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagementContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/ManagementContext.java
@@ -519,7 +519,7 @@
*/
@Override
public final void close() {
- this.getDriver().close();
+ getDriver().close();
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
index 391a84f..7634c39 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/AbstractTextAccessLogPublisher.java
@@ -103,7 +103,7 @@
// Generate a unique identifier for attaching partial results to
// operations.
- attachmentName = this.getClass().getName() + "#" + hashCode();
+ attachmentName = getClass().getName() + "#" + hashCode();
// Pre-parse the log record types for more efficient queries.
if (cfg.getLogRecordType().isEmpty())
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
index a19a609..4446645 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/OpendsJmxConnector.java
@@ -134,7 +134,7 @@
*/
public void connect() throws IOException, SecurityException
{
- this.connect(null);
+ connect(null);
}
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 8ca5231..d19a911 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -357,7 +357,7 @@
{
synchronized (this)
{
- this.wait(1000);
+ wait(1000);
if (!disabled && !stateSavingDisabled)
{
// save the ServerState
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java
index ee61e57..6828410 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/RoutableMsg.java
@@ -113,8 +113,7 @@
*/
public String toString()
{
- return "["+
- this.getClass().getCanonicalName() +
+ return "[" + getClass().getCanonicalName() +
" sender=" + this.senderID +
" destination=" + this.destination + "]";
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
index d708490..78eb777 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/Session.java
@@ -169,8 +169,8 @@
}
try {
- this.interrupt();
- this.join();
+ interrupt();
+ join();
}
catch (InterruptedException e) {
Thread.currentThread().interrupt();
@@ -556,7 +556,7 @@
latch.countDown();
if (logger.isTraceEnabled())
{
- logger.trace(this.getName() + " starting.");
+ logger.trace(getName() + " starting.");
}
boolean needClosing = false;
while (!closeInitiated)
@@ -587,7 +587,7 @@
}
if (logger.isTraceEnabled())
{
- logger.trace(this.getName() + " stopped.");
+ logger.trace(getName() + " stopped.");
}
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java
index 540c052..61dedb2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/protocol/UpdateMsg.java
@@ -131,8 +131,9 @@
@Override
public boolean equals(Object obj)
{
- return obj != null && obj.getClass() == this.getClass() &&
- csn.equals(((UpdateMsg) obj).csn);
+ return obj != null
+ && obj.getClass() == getClass()
+ && csn.equals(((UpdateMsg) obj).csn);
}
/** {@inheritDoc} */
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MonitoringPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MonitoringPublisher.java
index 082ddff..a6eff33 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MonitoringPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/MonitoringPublisher.java
@@ -154,7 +154,7 @@
try
{
// Here, "this" is the monitoring publisher thread
- this.join(2000);
+ join(2000);
}
catch (InterruptedException e)
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
index fd4f0d7..65c9f87 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/ServerHandler.java
@@ -699,7 +699,7 @@
*/
public boolean isReplicationServer()
{
- return !this.isDataServer();
+ return !isDataServer();
}
// The handshake phase must be done by blocking any access to structures
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
index 8b04fd4..5788e21 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/service/ReplicationDomain.java
@@ -1495,7 +1495,7 @@
{
ieCtx.initializeTask = initTask;
}
- ieCtx.initializeCounters(this.countEntries());
+ ieCtx.initializeCounters(countEntries());
ieCtx.msgCnt = 0;
ieCtx.initNumLostConnections = broker.getNumLostConnections();
ieCtx.initWindow = initWindow;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
index e831086..cef85b3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Entry.java
@@ -3029,7 +3029,7 @@
*/
private void processCollectiveAttributes()
{
- if (this.isSubentry() || this.isLDAPSubentry())
+ if (isSubentry() || isLDAPSubentry())
{
return;
}
--
Gitblit v1.10.0