[111279] cleanup to remove common compiler warnings
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/provisional/exceptions/SourceEditingRuntimeException.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/provisional/exceptions/SourceEditingRuntimeException.java
deleted file mode 100644
index ce88951..0000000
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/provisional/exceptions/SourceEditingRuntimeException.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- * Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.sse.core.internal.provisional.exceptions;
-
-import org.eclipse.wst.sse.core.internal.SSECoreMessages;
-
-/**
- * The SourceEditingRuntimeException is often thrown by Source Editor methods
- * when a service we use throws a checked exception, but we want to convert
- * and treat as a runtime exception. (Such as BadLocationException is a common
- * example).
- *
- * @deprecated - this is really doing no good (and maybe harm) ... will
- * eliminate.
- */
-public class SourceEditingRuntimeException extends RuntimeException {
-
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 1L;
- private Throwable originalException;
-
- public SourceEditingRuntimeException() {
- super();
- }
-
- public SourceEditingRuntimeException(String s) {
- super(s);
- }
-
- /**
- * This form of the constructor is used to wrapper another exception.
- */
- public SourceEditingRuntimeException(Throwable t) {
- super();
- originalException = t;
- }
-
- /**
- * This form of the constructor is used to wrapper another exception, but
- * still provide a new descriptive message.
- */
- public SourceEditingRuntimeException(Throwable t, String s) {
- super(s);
- originalException = t;
- }
-
- public String getMessage() {
- String result = super.getMessage();
- if ((result != null) && (!result.endsWith("."))) //$NON-NLS-1$
- result = result + "."; //$NON-NLS-1$
- if (originalException != null) {
- String embeddedMessage = originalException.getMessage();
- embeddedMessage = originalException.getClass().getName() + ": " + originalException.getMessage(); //$NON-NLS-1$
- // not all exceptions have messages (e.g. many
- // NullPointerException)
- String originalError = SSECoreMessages.Original_Error__UI_; //$NON-NLS-1$ = "Original Error:"
- if (result == null)
- result = ""; //$NON-NLS-1$
- if (embeddedMessage != null)
- result = result + " " + originalError + " " + embeddedMessage;//$NON-NLS-2$//$NON-NLS-1$
- else
- result = result + " " + originalError + " " + originalException.toString();//$NON-NLS-2$//$NON-NLS-1$
- }
- return result;
- }
-
- public Throwable getOriginalException() {
- return originalException;
- }
-
- public String toString() {
- // we don't put super.toString or getClass to "hide" that it was a
- // SourceEditing exception (otherwise, focus goes on that,
- // instead of original exception.
- String message = getMessage();
- // message should never be null ... but just in case
- return (message != null) ? message : super.toString();
-
- }
-}
diff --git a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/BasicStructuredDocument.java b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/BasicStructuredDocument.java
index 1915dd0..bed4ef7 100644
--- a/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/BasicStructuredDocument.java
+++ b/bundles/org.eclipse.wst.sse.core/src/org/eclipse/wst/sse/core/internal/text/BasicStructuredDocument.java
@@ -59,7 +59,6 @@
import org.eclipse.wst.sse.core.internal.provisional.events.RegionsReplacedEvent;
import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentEvent;
import org.eclipse.wst.sse.core.internal.provisional.events.StructuredDocumentRegionsReplacedEvent;
-import org.eclipse.wst.sse.core.internal.provisional.exceptions.SourceEditingRuntimeException;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegionList;
@@ -464,8 +463,8 @@
// safeguard from listeners that throw exceptions
try {
if (p instanceof IDocumentPartitionerExtension) {
- //IRegion changedPartion =
- ((IDocumentPartitionerExtension) p).documentChanged2(documentEvent);
+ // IRegion changedPartion =
+ ((IDocumentPartitionerExtension) p).documentChanged2(documentEvent);
}
else {
p.documentChanged(documentEvent);
@@ -1720,10 +1719,10 @@
* <p>
*
* <pre>
- * <html>[<head></head>]</html> returns <head>,</head>
+ * <html>[<head></head>]</html> returns <head>,</head>
* </pre>
* <pre>
- * <ht[ml><head></he]ad></html> returns <html>,<head>,</head>
+ * <ht[ml><head></he]ad></html> returns <html>,<head>,</head>
* </pre>
*
* </p>
@@ -1850,7 +1849,7 @@
String internalGet(int offset, int length) {
String result = null;
- //int myLength = getLength();
+ // int myLength = getLength();
// if ((0 > offset) || (0 > length) || (offset + length > myLength))
// throw new BadLocationException();
result = getStore().get(offset, length);
@@ -1951,7 +1950,7 @@
NoChangeEvent noChangeEvent = new NoChangeEvent(this, requester, changes, start, replacementLength);
noChangeEvent.reason = NoChangeEvent.NO_EVENT;
fireStructuredDocumentEvent(noChangeEvent);
- throw new SourceEditingRuntimeException("Program Error: unexpected structured document event: " + result); //$NON-NLS-1$
+ Logger.log(Logger.INFO, "Program Error: unexpected structured document event: " + result); //$NON-NLS-1$
}
}
}