clean up
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java
index afaef1c..d6ea937 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/PlatformConfiguration.java
@@ -10,11 +10,20 @@
*******************************************************************************/
package org.eclipse.update.internal.configurator;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.*;
-//PAL nio optional
-//import java.nio.channels.*;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.SyncFailedException;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -22,17 +31,16 @@
import java.util.Properties;
import java.util.Set;
-import javax.xml.parsers.*;
-//PAL cdcFoundation
-//import javax.xml.transform.*;
-//import javax.xml.transform.dom.*;
-//import javax.xml.transform.stream.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.osgi.service.datalocation.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.util.NLS;
-import org.eclipse.update.configurator.*;
-import org.eclipse.update.configurator.IPlatformConfiguration.ISitePolicy;
-import org.w3c.dom.*;
+import org.eclipse.update.configurator.IPlatformConfiguration;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
* This class is responsible for providing the features and plugins (bundles) to
diff --git a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java
index 8686ca6..9b76310 100644
--- a/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java
+++ b/update/org.eclipse.update.configurator/src/org/eclipse/update/internal/configurator/VersionedIdentifier.java
@@ -10,10 +10,8 @@
*******************************************************************************/
package org.eclipse.update.internal.configurator;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import org.osgi.framework.Version;
+//import java.util.ArrayList;
+//import java.util.StringTokenizer;
public class VersionedIdentifier {
private String identifier = ""; //$NON-NLS-1$
@@ -23,7 +21,7 @@
private String qualifier = ""; //$NON-NLS-1$
private String version;
- private static final String VER_SEPARATOR = "."; //$NON-NLS-1$
+ //private static final String VER_SEPARATOR = "."; //$NON-NLS-1$
public static final int LESS_THAN = -1;
public static final int EQUAL = 0;
@@ -85,7 +83,7 @@
return EQUAL;
}
- private void parseVersion(String v) {
+ /*private void parseVersion(String v) {
if (v == null || (v = v.trim()).equals("")) //$NON-NLS-1$
return;
@@ -109,9 +107,9 @@
} catch (Exception e) {
// use what we got so far ...
}
- }
+ }*/
- private String removeWhiteSpace(String s) {
+ /*private String removeWhiteSpace(String s) {
char[] chars = s.trim().toCharArray();
boolean whitespace = false;
for (int i = 0; i < chars.length; i++) {
@@ -121,7 +119,7 @@
}
}
return whitespace ? new String(chars) : s;
- }
+ }*/
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
index ccd3dd9..7b7b46a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultSiteParser.java
@@ -13,8 +13,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Iterator;
@@ -36,9 +34,7 @@
import org.eclipse.update.core.IURLEntry;
import org.eclipse.update.core.SiteFeatureReferenceModel;
import org.eclipse.update.core.URLEntry;
-import org.eclipse.update.internal.core.Digest;
import org.eclipse.update.internal.core.ExtendedSite;
-import org.eclipse.update.internal.core.LiteFeature;
import org.eclipse.update.internal.core.Messages;
import org.eclipse.update.internal.core.UpdateCore;
import org.w3c.dom.Document;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
index 82d82e0..18025a1 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeaturePackagedContentProvider.java
@@ -393,7 +393,7 @@
* @return NullReference if its decided not to continue
* @throws CoreException
*/
- private ContentReference continueOrErrorOrRethrow(String archiveID, CoreException coreException) throws CoreException {
+ /*private ContentReference continueOrErrorOrRethrow(String archiveID, CoreException coreException) throws CoreException {
ContentReference reference = null;
if (continueOnError) {
@@ -411,7 +411,7 @@
throw coreException;
}
return reference;
- }
+ }*/
private ContentReference continueOnErrorOrRethrow(String archiveID, Exception e) throws CoreException {
ContentReference reference = null;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
index 69d0b3f..c0002bf 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallConfiguration.java
@@ -51,7 +51,6 @@
import org.eclipse.update.core.model.SiteModel;
import org.eclipse.update.internal.configurator.ConfigurationActivator;
import org.eclipse.update.internal.configurator.FeatureEntry;
-import org.eclipse.update.internal.configurator.IConfigurationConstants;
import org.eclipse.update.internal.configurator.PlatformConfiguration;
import org.eclipse.update.internal.configurator.PluginEntry;
import org.eclipse.update.internal.configurator.SiteEntry;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/JarDeltaInstallHandler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/JarDeltaInstallHandler.java
index e5b49a7..5270d00 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/JarDeltaInstallHandler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/JarDeltaInstallHandler.java
@@ -49,8 +49,8 @@
super.overlayPlugin(oldPlugin, newPlugin, consumer);
}
- ContentReference[] oldReferences = oldFeature.getFeatureContentProvider().getPluginEntryContentReferences(oldPlugin, null);
- ContentReference[] newReferences = feature.getFeatureContentProvider().getPluginEntryContentReferences(newPlugin, null);
+ //ContentReference[] oldReferences = oldFeature.getFeatureContentProvider().getPluginEntryContentReferences(oldPlugin, null);
+ //ContentReference[] newReferences = feature.getFeatureContentProvider().getPluginEntryContentReferences(newPlugin, null);
URL oldURI = null;
try {
