removing some dead code
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/AbstractStructuredTextReconcilingStrategy.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/AbstractStructuredTextReconcilingStrategy.java
index fae0606..1f2b52f 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/AbstractStructuredTextReconcilingStrategy.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/AbstractStructuredTextReconcilingStrategy.java
@@ -475,12 +475,4 @@
fMarkerAnnotations = new HashSet();
return fMarkerAnnotations;
}
-
-// public IReconcileStep getFirstStep() {
-// return fFirstStep;
-// }
-//
-// public void setFirstStep(IReconcileStep firstStep) {
-// fFirstStep = firstStep;
-// }
}
diff --git a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java
index 6c44846..7437b3e 100644
--- a/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java
+++ b/bundles/org.eclipse.wst.sse.ui/src/org/eclipse/wst/sse/ui/internal/reconcile/validator/ValidatorStrategy.java
@@ -32,7 +32,6 @@
import org.eclipse.wst.sse.ui.internal.IReleasable;
import org.eclipse.wst.sse.ui.internal.reconcile.DocumentAdapter;
import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey;
-import org.eclipse.wst.sse.ui.internal.reconcile.StructuredReconcileStep;
import org.eclipse.wst.sse.ui.internal.reconcile.StructuredTextReconcilingStrategy;
import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation;
import org.eclipse.wst.validation.internal.provisional.core.IValidator;
@@ -95,7 +94,11 @@
* @return true if the strategy contains at least one ValidatorMetaData
* that says it can handle the partition type (for a given content type)
*/
- public boolean canValidatePartition(String partitionType) {
+ public final boolean canValidatePartition(String partitionType) {
+ return canHandlePartition(partitionType);
+ }
+
+ protected boolean canHandlePartition(String partitionType) {
ValidatorMetaData vmd = null;
for (int i = 0; i < fMetaData.size(); i++) {
vmd = (ValidatorMetaData) fMetaData.get(i);
@@ -105,18 +108,7 @@
return false;
}
- protected boolean canHandlePartition(String partition) {
- return canValidatePartition(partition);
- }
-
- /*
- * so that removal will work properly
- *
- * @see org.eclipse.wst.sse.ui.reconcile.AbstractStructuredTextReconcilingStrategy#containsStep(org.eclipse.jface.text.reconciler.IReconcileStep)
- */
- protected boolean containsStep(IReconcileStep step) {
- return step != null ? fVidToVStepMap.values().contains(step) : false;
- }
+
/**
* @see org.eclipse.wst.sse.ui.internal.provisional.reconcile.AbstractStructuredTextReconcilingStrategy#createReconcileSteps()
@@ -132,22 +124,6 @@
return fContentTypeIds;
}
- /*
- * so that removal will work properly
- *
- * @see org.eclipse.wst.sse.ui.reconcile.AbstractStructuredTextReconcilingStrategy#getPartitionTypes()
- */
- public String[] getPartitionTypes() {
- List partitionTypes = new ArrayList();
- Iterator keys = fVidToVStepMap.keySet().iterator();
- String key = null;
- while (keys.hasNext()) {
- key = (String) keys.next();
- StructuredReconcileStep step = (StructuredReconcileStep) fVidToVStepMap.get(key);
- partitionTypes.addAll(Arrays.asList(step.getPartitionTypes()));
- }
- return (String[]) partitionTypes.toArray(new String[partitionTypes.size()]);
- }
/**
* @param tr Partition of the region to reconcile.
* @param dr Dirty region representation of the typed region
@@ -163,7 +139,7 @@
return;
String partitionType = tr.getType();
- if (canValidatePartition(partitionType)) {
+ if (canHandlePartition(partitionType)) {
ValidatorMetaData vmd = null;
// IReconcileResult[]
@@ -228,7 +204,8 @@
*
* @param partitionType
* @return true if all validators associated with this
- * parition type are total scope, otherwise return false
+ * parition type are total scope (will validate the
+ * entire document), otherwise return false
*/
public boolean allTotalScope(String partitionType) {
Iterator vmds = fMetaData.iterator();