removed unused code, and tightened project by project compiler warning settings

10 files changed, 6 insertions, 21 deletions

diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/AttributeList.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/AttributeList.java
index a9ede05d41..814b9b4fb8 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/AttributeList.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/AttributeList.java
@@ -52,7 +52,6 @@ public class AttributeList extends NamedTopLevelNode {
 		int offset = 0;
 		String newText = ""; //$NON-NLS-1$
 		String nodeText = node.getFullNodeText();
-		boolean isLastChild = false;
 		if (!isAfter) {
 			offset = reference.getStartOffset();
 		} else {
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/CMGroupNode.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/CMGroupNode.java
index 5d90898f79..a9f13bee27 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/CMGroupNode.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/CMGroupNode.java
@@ -208,7 +208,6 @@ public class CMGroupNode extends CMRepeatableNode {
 		Object[] children = getChildren();
 
 		int startOffset = 0;
-		boolean isLastChild = position == children.length;
 		String newText = ""; //$NON-NLS-1$
 		if (position < children.length) {
 			DTDNode reference = (DTDNode) children[position];
@@ -248,9 +247,6 @@ public class CMGroupNode extends CMRepeatableNode {
 		int nesting = 0;
 		//    children.clear();
 		removeChildNodes();
-		// we skip past the first left paren we see since that is the
-		// beginning of our own node
-		boolean isConnectorSet = false;
 		DTDNode currentGroupNode = null;
 		CMBasicNode currentReferenceNode = null;
 		RegionIterator iter = iterator();
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Comment.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Comment.java
index 54f234c8df..4067288b32 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Comment.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Comment.java
@@ -66,7 +66,6 @@ public class Comment extends NamedTopLevelNode {
 
 	public void setText(String newText) {
 		beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_COMMENT_CHG")); //$NON-NLS-1$
-		int flatNodeStart = getStructuredDTDDocumentRegion().getStartOffset();
 		StartEndPair pair = new StartEndPair();
 		getStartAndEndOffsetForText(pair);
 		replaceText(this, pair.startOffset, pair.endOffset - pair.startOffset, newText);
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/DTDFile.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/DTDFile.java
index 5985ed9122..62363a2ed5 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/DTDFile.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/DTDFile.java
@@ -142,7 +142,6 @@ public class DTDFile implements IndexedRegion {
 
 	public void createAttributeList(DTDNode node, String name, boolean isAfter) {
 		getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_ATTR_LIST")); //$NON-NLS-1$
-		DTDNode topLevelNode = null;
 		String newStream = "<!ATTLIST " + name + ">\n"; //$NON-NLS-1$ //$NON-NLS-2$
 		int offset = getInsertOffset(node, isAfter);
 		getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -151,7 +150,6 @@ public class DTDFile implements IndexedRegion {
 
 	public void createComment(DTDNode node, String name, boolean isAfter) {
 		getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_COMMENT")); //$NON-NLS-1$
-		DTDNode topLevelNode = null;
 		String newStream = "<!-- " + name + " -->\n"; //$NON-NLS-1$ //$NON-NLS-2$
 		int offset = getInsertOffset(node, isAfter);
 		getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -160,7 +158,6 @@ public class DTDFile implements IndexedRegion {
 
 	public void createElement(DTDNode node, String name, boolean isAfter) {
 		getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_ELEMENT")); //$NON-NLS-1$
-		DTDNode topLevelNode = null;
 		String newStream = "<!ELEMENT " + name + " EMPTY>\n"; //$NON-NLS-1$ //$NON-NLS-2$
 		int offset = getInsertOffset(node, isAfter);
 		getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -169,7 +166,6 @@ public class DTDFile implements IndexedRegion {
 
 	public void createEntity(DTDNode node, String name, boolean isAfter) {
 		getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_ENTITY")); //$NON-NLS-1$
-		DTDNode topLevelNode = null;
 		String newStream = "<!ENTITY " + name + " \"\">\n"; //$NON-NLS-1$//$NON-NLS-2$
 		int offset = getInsertOffset(node, isAfter);
 		getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -178,7 +174,6 @@ public class DTDFile implements IndexedRegion {
 
 	public void createNotation(DTDNode node, String name, boolean isAfter) {
 		getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_NOTATION")); //$NON-NLS-1$
-		DTDNode topLevelNode = null;
 		String newStream = "<!NOTATION " + name + " SYSTEM \"\">\n"; //$NON-NLS-1$ //$NON-NLS-2$
 		int offset = getInsertOffset(node, isAfter);
 		getStructuredDocument().replaceText(this, offset, 0, newStream);
@@ -187,7 +182,6 @@ public class DTDFile implements IndexedRegion {
 
 	public void createParameterEntityReference(DTDNode node, String name, boolean isAfter) {
 		getDTDModel().beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_DTD_FILE_ADD_PARM_ENTITY_REF")); //$NON-NLS-1$
-		DTDNode topLevelNode = null;
 		String newStream = name + "\n"; //$NON-NLS-1$
 		int offset = getInsertOffset(node, isAfter);
 		getStructuredDocument().replaceText(this, offset, 0, newStream);
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Element.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Element.java
index bc784e692c..7347f0b09a 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Element.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Element.java
@@ -154,15 +154,14 @@ public class Element extends NamedTopLevelNode {
 			skipPastName(iter);
 		}
 
-		CMBasicNode basicNode = null;
 		while (iter.hasNext()) {
 			ITextRegion currentRegion = iter.next();
 
 			if (contentModel == null) {
 				if (currentRegion.getType().equals(DTDRegionTypes.NAME)) {
-					contentModel = basicNode = new CMBasicNode(getDTDFile(), getStructuredDTDDocumentRegion());
+					contentModel = new CMBasicNode(getDTDFile(), getStructuredDTDDocumentRegion());
 				} else if (currentRegion.getType().equals(DTDRegionTypes.CONTENT_PCDATA)) {
-					contentModel = basicNode = new CMBasicNode(getDTDFile(), getStructuredDTDDocumentRegion());
+					contentModel = new CMBasicNode(getDTDFile(), getStructuredDTDDocumentRegion());
 				} else if (currentRegion.getType().equals(DTDRegionTypes.LEFT_PAREN)) {
 					contentModel = new CMGroupNode(getDTDFile(), getStructuredDTDDocumentRegion());
 				}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Entity.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Entity.java
index 9eade1210d..625d22a2d4 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Entity.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/Entity.java
@@ -289,7 +289,7 @@ public class Entity extends ExternalNode {
 				if (valueRegion != null) {
 					replaceText(requestor, getStructuredDTDDocumentRegion().getStartOffset(valueRegion), valueRegion.getLength(), quoteChar + v + quoteChar);
 				} else {
-					int startOffset = 0, length = 0;
+					int startOffset = 0;
 					RegionIterator iter = iterator();
 					ITextRegion region = getNextRegion(iter, DTDRegionTypes.NAME);
 					if (region == null) {
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/ParameterEntityReference.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/ParameterEntityReference.java
index 6a82e97efc..f954a85705 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/ParameterEntityReference.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/ParameterEntityReference.java
@@ -104,7 +104,6 @@ public class ParameterEntityReference extends NamedTopLevelNode {
 
 	public void setText(String newText) {
 		beginRecording(this, DTDCorePlugin.getDTDString("_UI_LABEL_PARM_ENTITY_REF_COMMENT_CHG")); //$NON-NLS-1$
-		int flatNodeStart = getStructuredDTDDocumentRegion().getStartOffset();
 		StartEndPair pair = new StartEndPair();
 		getStartAndEndOffsetForText(pair);
 		replaceText(this, pair.startOffset, pair.endOffset - pair.startOffset, newText);
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/tokenizer/DTDTokenizer.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/tokenizer/DTDTokenizer.java
index ad01b20412..91bde29fda 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/tokenizer/DTDTokenizer.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/tokenizer/DTDTokenizer.java
@@ -439,7 +439,7 @@ public class DTDTokenizer {
 
 		// cached fields:
 		int yy_currentPos_l;
-		int yy_startRead_l;
+// trivial had edit to remove unused code		int yy_startRead_l;
 		int yy_markedPos_l;
 		int yy_endRead_l = yy_endRead;
 		char[] yy_buffer_l = yy_buffer;
@@ -503,7 +503,8 @@ public class DTDTokenizer {
 			}
 			yy_action = -1;
 
-			yy_startRead_l = yy_currentPos_l = yy_currentPos = yy_startRead = yy_markedPos_l;
+// trivial hand edit to remove unused code yy_startRead_l = 
+				yy_currentPos_l = yy_currentPos = yy_startRead = yy_markedPos_l;
 
 			yy_state = yy_lexical_state;
 
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/util/DTDModelUpdater.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/util/DTDModelUpdater.java
index fa2d0f9c8d..fb0e154bbe 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/util/DTDModelUpdater.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/util/DTDModelUpdater.java
@@ -67,7 +67,6 @@ public class DTDModelUpdater extends DTDVisitor {
 		nodesToDelete.clear();
 
 		if (node instanceof Entity) {
-			Entity entity = (Entity) node;
 			isParmEntity = true;
 			oldRefName = "%" + oldRefName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
 		}
diff --git a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/util/DTDReferenceUpdater.java b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/util/DTDReferenceUpdater.java
index 79bfcf2d1d..46509780a9 100644
--- a/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/util/DTDReferenceUpdater.java
+++ b/bundles/org.eclipse.wst.dtd.core/src/org/eclipse/wst/dtd/core/util/DTDReferenceUpdater.java
@@ -77,7 +77,6 @@ public class DTDReferenceUpdater extends DTDVisitor {
 		isNotation = referencedNode instanceof Notation;
 
 		if (referencedNode instanceof Entity) {
-			Entity entity = (Entity) referencedNode;
 			isParmEntity = true;
 			oldRefName = "%" + oldRefName + ";"; //$NON-NLS-1$ //$NON-NLS-2$
 			newRefName = "%" + newRefName + ";"; //$NON-NLS-1$ //$NON-NLS-2$