Author: elvisisking
Date: 2012-04-27 16:34:53 -0400 (Fri, 27 Apr 2012)
New Revision: 40581
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CommentedCndElement.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ReconnectToServerAction.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/domain/ModeShapeRepository.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/domain/ModeShapeWorkspace.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/ReconnectJob.java
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java
Log:
JBIDE-11699 Fix Errors Found In ModeShape Tools Using FindBugs Eclipse Plugin. Fixed
problems in a couple "equals" methods, as well as, some other minor issues.
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CommentedCndElement.java
===================================================================
---
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CommentedCndElement.java 2012-04-27
20:34:11 UTC (rev 40580)
+++
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/src/org/jboss/tools/modeshape/jcr/cnd/CommentedCndElement.java 2012-04-27
20:34:53 UTC (rev 40581)
@@ -118,10 +118,8 @@
// remove beginning inner comment chars
if (result.startsWith(BLOCK_COMMENT_INNER_CHARS)) {
result = result.substring(BLOCK_COMMENT_INNER_CHARS.length());
- result.trim();
} else if (result.startsWith(BLOCK_COMMENT_INNER_CHARS2)) {
result = result.substring(BLOCK_COMMENT_INNER_CHARS2.length());
- result.trim();
}
// remove other inner comment chars
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ReconnectToServerAction.java
===================================================================
---
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ReconnectToServerAction.java 2012-04-27
20:34:11 UTC (rev 40580)
+++
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/actions/ReconnectToServerAction.java 2012-04-27
20:34:53 UTC (rev 40581)
@@ -39,8 +39,8 @@
* @param viewer the server view tree viewer
*/
public ReconnectToServerAction( TreeViewer viewer ) {
- super(RestClientI18n.serverReconnectActionText.text());
- setToolTipText(RestClientI18n.serverReconnectActionToolTip.text());
+ super(RestClientI18n.serverReconnectActionText);
+ setToolTipText(RestClientI18n.serverReconnectActionToolTip);
setImageDescriptor(Activator.getDefault().getImageDescriptor(REFRESH_IMAGE));
setEnabled(false);
@@ -102,7 +102,7 @@
// run job in own thread not in the UI thread
Thread t = new Thread();
- t.run();
+ t.start();
job.setThread(t);
job.schedule();
}
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/domain/ModeShapeRepository.java
===================================================================
---
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/domain/ModeShapeRepository.java 2012-04-27
20:34:11 UTC (rev 40580)
+++
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/domain/ModeShapeRepository.java 2012-04-27
20:34:53 UTC (rev 40581)
@@ -50,7 +50,12 @@
*/
@Override
public boolean equals( Object obj ) {
- return this.delegate.equals(obj);
+ if ((obj == null) || !getClass().equals(obj.getClass())) {
+ return false;
+ }
+
+ ModeShapeRepository that = (ModeShapeRepository)obj;
+ return this.delegate.equals(that.delegate);
}
/**
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/domain/ModeShapeWorkspace.java
===================================================================
---
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/domain/ModeShapeWorkspace.java 2012-04-27
20:34:11 UTC (rev 40580)
+++
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/domain/ModeShapeWorkspace.java 2012-04-27
20:34:53 UTC (rev 40581)
@@ -48,7 +48,12 @@
*/
@Override
public boolean equals( Object obj ) {
- return this.delegate.equals(obj);
+ if ((obj == null) || !getClass().equals(obj.getClass())) {
+ return false;
+ }
+
+ ModeShapeWorkspace that = (ModeShapeWorkspace)obj;
+ return this.delegate.equals(that.delegate);
}
/**
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/ReconnectJob.java
===================================================================
---
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/ReconnectJob.java 2012-04-27
20:34:11 UTC (rev 40580)
+++
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/jobs/ReconnectJob.java 2012-04-27
20:34:53 UTC (rev 40581)
@@ -18,6 +18,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.osgi.util.NLS;
import org.jboss.tools.modeshape.rest.Activator;
import org.jboss.tools.modeshape.rest.RestClientI18n;
import org.jboss.tools.modeshape.rest.ServerManager;
@@ -39,7 +40,7 @@
* @param server the server being connected to (never <code>null</code>)
*/
public ReconnectJob( ModeShapeServer server ) {
- super(reconnectJobTaskName.text(server.getShortDescription()));
+ super(NLS.bind(reconnectJobTaskName, server.getShortDescription()));
this.server = server;
}
@@ -64,21 +65,16 @@
ServerManager serverManager = Activator.getDefault().getServerManager();
try {
- String taskName =
reconnectJobTaskName.text(this.server.getShortDescription());
+ String taskName = NLS.bind(reconnectJobTaskName,
this.server.getShortDescription());
monitor.beginTask(taskName, 1);
monitor.setTaskName(taskName);
Status status = serverManager.ping(this.server);
result = Utils.convert(status);
} catch (Exception e) {
- String msg = null;
-
- if (e instanceof InterruptedException) {
- msg = e.getLocalizedMessage();
- } else {
- msg = RestClientI18n.publishJobUnexpectedErrorMsg.text();
- }
-
- result = new org.eclipse.core.runtime.Status(IStatus.ERROR, PLUGIN_ID, msg,
e);
+ result = new org.eclipse.core.runtime.Status(IStatus.ERROR,
+ PLUGIN_ID,
+
RestClientI18n.publishJobUnexpectedErrorMsg,
+ e);
} finally {
monitor.done();
done(result);
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java
===================================================================
---
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java 2012-04-27
20:34:11 UTC (rev 40580)
+++
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/src/org/jboss/tools/modeshape/rest/log/EclipseLogger.java 2012-04-27
20:34:53 UTC (rev 40581)
@@ -77,7 +77,9 @@
@Override
public void debug( String pattern,
Object[] arguments ) {
- debug(MessageFormat.format(pattern, arguments), arguments);
+ if (isDebugEnabled()) {
+ info(MessageFormat.format(pattern, arguments), arguments);
+ }
}
/**
Show replies by date