*** empty log message ***
diff --git a/update/org.eclipse.update.core/plugin.xml b/update/org.eclipse.update.core/plugin.xml
index d0e6686..9e905d4 100644
--- a/update/org.eclipse.update.core/plugin.xml
+++ b/update/org.eclipse.update.core/plugin.xml
@@ -4,7 +4,7 @@
name="%pluginName"
version="2.1.0"
provider-name="%providerName"
- class="org.eclipse.update.internal.core.UpdateCORE">
+ class="org.eclipse.update.internal.core.UpdateCore">
<runtime>
<library name="updatecore.jar">
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
index 98f571f..ebab3be 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/configuration/LocalSystemInfo.java
@@ -7,7 +7,7 @@
import java.io.File;
import java.util.ArrayList;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
import org.eclipse.update.internal.core.Volume;
/**
@@ -220,7 +220,7 @@
System.loadLibrary("update"); //$NON-NLS-1$
hasNatives = true;
} catch (UnsatisfiedLinkError e) {
- UpdateCORE.warn("Unable to load native library 'update'."); //$NON-NLS-1$
+ UpdateCore.warn("Unable to load native library 'update'."); //$NON-NLS-1$
hasNatives = false;
}
}
@@ -283,7 +283,7 @@
vol[i].markReadOnly();
}
} else {
- UpdateCORE.warn("Unable to find mount points");
+ UpdateCore.warn("Unable to find mount points");
// fallback
File [] roots = File.listRoots();
if (roots.length == 1) {
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
index 268c315..eb20743 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/BaseSiteFactory.java
@@ -59,9 +59,9 @@
ClassLoader l = new URLClassLoader(new URL[] { url }, null);
bundle = ResourceBundle.getBundle(Site.SITE_FILE, Locale.getDefault(), l);
} catch (MissingResourceException e) {
- UpdateCORE.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
} catch (MalformedURLException e) {
- UpdateCORE.warn(Policy.bind("BaseSiteFactory.CannotRetriveParentDirectory", url.toExternalForm())); //$NON-NLS-1$
+ UpdateCore.warn(Policy.bind("BaseSiteFactory.CannotRetriveParentDirectory", url.toExternalForm())); //$NON-NLS-1$
}
return bundle;
@@ -133,7 +133,7 @@
* @return InputStream
*/
protected InputStream openStream(URL resolvedURL) throws IOException {
- Response response = UpdateCORE.getPlugin().get(resolvedURL);
+ Response response = UpdateCore.getPlugin().get(resolvedURL);
return response.getInputStream();
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
index 90d34cc..dc19469 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/ContentReference.java
@@ -123,7 +123,7 @@
else if (url != null) {
if (response == null) {
URL resolvedURL = URLEncoder.encode(url);
- response = UpdateCORE.getPlugin().get(resolvedURL);
+ response = UpdateCore.getPlugin().get(resolvedURL);
UpdateManagerUtils.checkConnectionResult(response,resolvedURL);
}
return response.getInputStream();
@@ -145,7 +145,7 @@
URL resolvedURL = null;
try {
resolvedURL = URLEncoder.encode(url);
- response = UpdateCORE.getPlugin().get(resolvedURL);
+ response = UpdateCore.getPlugin().get(resolvedURL);
} catch (IOException e) {
return ContentReference.UNKNOWN_SIZE;
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
index 3477bf7..3f420dd 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Feature.java
@@ -82,7 +82,7 @@
versionId = new VersionedIdentifier(id, ver);
return versionId;
} catch (Exception e) {
- UpdateCORE.warn("Unable to create versioned identifier:" + id + ":" + ver);
+ UpdateCore.warn("Unable to create versioned identifier:" + id + ":" + ver);
}
}
@@ -111,7 +111,7 @@
try {
contentProvider = getFeatureContentProvider();
} catch (CoreException e) {
- UpdateCORE.warn("No content Provider", e);
+ UpdateCore.warn("No content Provider", e);
}
return (contentProvider != null) ? contentProvider.getURL() : null;
}
@@ -326,7 +326,7 @@
try {
childFeature = children[i].getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
if (childFeature != null) {
if (monitor != null)
@@ -564,7 +564,7 @@
return getFeatureContentProvider().getDownloadSizeFor(totalPlugins, totalNonPlugins);
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
return ContentEntryModel.UNKNOWN_SIZE;
}
}
@@ -605,7 +605,7 @@
return getFeatureContentProvider().getInstallSizeFor(totalPlugins, totalNonPlugins);
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
return ContentEntryModel.UNKNOWN_SIZE;
}
}
@@ -766,8 +766,8 @@
*/
private void debug(String trace) {
//DEBUG
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_INSTALL) {
- UpdateCORE.debug(trace);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL) {
+ UpdateCore.debug(trace);
}
}
@@ -835,11 +835,11 @@
if (this.equals(currentReference.getFeature()))
return currentReference; // 18867
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
}
- UpdateCORE.warn("ValidateAlreadyInstalled:Feature " + this +" not found on site" + this.getURL());
+ UpdateCore.warn("ValidateAlreadyInstalled:Feature " + this +" not found on site:" + this.getURL());
return null;
}
@@ -851,8 +851,8 @@
if (referenceToReinitialize==null) return;
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.debug("Re initialize feature reference:" + referenceToReinitialize);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.debug("Re initialize feature reference:" + referenceToReinitialize);
IFeature feature = null;
try {
@@ -873,7 +873,7 @@
}
}
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
@@ -899,8 +899,8 @@
if (UpdateManagerUtils.isValidEnvironment(included))
list.add(included);
else{
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_WARNINGS){
- UpdateCORE.warn("Filtered out feature reference:"+included);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS){
+ UpdateCore.warn("Filtered out feature reference:"+included);
}
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
index e92276c..0ae44a5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureContentProvider.java
@@ -12,7 +12,7 @@
import org.eclipse.update.core.model.*;
import org.eclipse.update.internal.core.InternalSiteManager;
import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* Base implementation of a feature content provider.
@@ -422,7 +422,7 @@
try {
prop.load(permissionReference.getInputStream());
} catch (IOException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
String executables = prop.getProperty(EXECUTABLES);
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
index dd02434..e42a05f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/FeatureReference.java
@@ -46,7 +46,7 @@
try {
setURL(ref.getURL());
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
@@ -59,7 +59,7 @@
try {
setURL(ref.getURL());
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
@@ -162,7 +162,7 @@
versionId = new VersionedIdentifier(id, ver);
return versionId;
} catch (Exception e) {
- UpdateCORE.warn("Unable to create versioned identifier:" + id + ":" + ver);
+ UpdateCore.warn("Unable to create versioned identifier:" + id + ":" + ver);
}
}
@@ -171,7 +171,7 @@
try {
versionId = getFeature().getVersionedIdentifier();
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
return versionId;
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
index 3db0588..aa16ef5 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Import.java
@@ -4,7 +4,7 @@
* All Rights Reserved.
*/
import org.eclipse.update.core.model.ImportModel;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
import org.eclipse.update.internal.core.UpdateManagerUtils;
/**
@@ -36,7 +36,7 @@
versionId = new VersionedIdentifier(id, ver);
return versionId;
} catch (Exception e) {
- UpdateCORE.warn("Unable to create versioned identifier:" + id + ":" + ver);
+ UpdateCore.warn("Unable to create versioned identifier:" + id + ":" + ver);
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
index e478e6f..6383199 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/IncludedFeatureReference.java
@@ -3,7 +3,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.update.configuration.IConfiguredSite;
import org.eclipse.update.core.model.IncludedFeatureReferenceModel;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/*
* (c) Copyright IBM Corp. 2000, 2002.
@@ -78,7 +78,7 @@
case IImport.RULE_GREATER_OR_EQUAL :
return id.getVersion().isGreaterOrEqualTo(baseIdentifier.getVersion());
}
- UpdateCORE.warn("Unknown matching rule:" + getMatch());
+ UpdateCore.warn("Unknown matching rule:" + getMatch());
return false;
}
@@ -159,8 +159,8 @@
}
}
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_WARNINGS){
- UpdateCORE.warn("Found best match feature:"+newRef+" for feature reference "+this.getURLString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS){
+ UpdateCore.warn("Found best match feature:"+newRef+" for feature reference "+this.getURLString());
}
if (newRef != null)
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
index e005c4a..8b50727 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/JarContentReference.java
@@ -12,7 +12,7 @@
import org.eclipse.update.core.model.InstallAbortedException;
import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* Local .jar file content reference
@@ -124,10 +124,10 @@
protected JarFile asJarFile() throws IOException {
if (this.jarFile == null) {
File file = asFile();
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_INSTALL)
- UpdateCORE.debug("asJarFile :" + file);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)
+ UpdateCore.debug("asJarFile :" + file);
if (file != null && !file.exists()) {
- UpdateCORE.warn("JarFile does not exits:" + file);
+ UpdateCore.warn("JarFile does not exits:" + file);
throw new FileNotFoundException(file.getAbsolutePath());
}
this.jarFile = new JarFile(file);
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
index 05c4441..9abd408 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/PluginEntry.java
@@ -5,7 +5,7 @@
*/
import org.eclipse.update.core.model.PluginEntryModel;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* Convenience implementation of plug-in entry.
@@ -45,7 +45,7 @@
versionId = new VersionedIdentifier(id, ver);
return versionId;
} catch (Exception e) {
- UpdateCORE.warn("Unable to create versioned identifier:" + id + ":" + ver);
+ UpdateCore.warn("Unable to create versioned identifier:" + id + ":" + ver);
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
index dd23846..c60a3b2 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Site.java
@@ -100,7 +100,7 @@
try {
url = getSiteContentProvider().getURL();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
return url;
}
@@ -151,10 +151,10 @@
//DEBUG:
if (!found) {
String URLString = (this.getURL() != null) ? this.getURL().toExternalForm() : "<no site url>";
- UpdateCORE.warn(Policy.bind("Site.CannotFindCategory", key, URLString));
+ UpdateCore.warn(Policy.bind("Site.CannotFindCategory", key, URLString));
//$NON-NLS-1$ //$NON-NLS-2$
if (getCategoryModels().length <= 0)
- UpdateCORE.warn(Policy.bind("Site.NoCategories"));
+ UpdateCore.warn(Policy.bind("Site.NoCategories"));
//$NON-NLS-1$
}
@@ -197,8 +197,8 @@
if (UpdateManagerUtils.isValidEnvironment(included))
list.add(included);
else{
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_WARNINGS){
- UpdateCORE.warn("Filtered out feature reference:"+included);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS){
+ UpdateCore.warn("Filtered out feature reference:"+included);
}
}
}
@@ -221,7 +221,7 @@
public ISiteFeatureReference getFeatureReference(IFeature feature) {
if (feature == null) {
- UpdateCORE.warn("Site:getFeatureReference: The feature is null");
+ UpdateCore.warn("Site:getFeatureReference: The feature is null");
return null;
}
@@ -233,7 +233,7 @@
return currentReference;
}
- UpdateCORE.warn("Feature " + feature + " not found on site" + this.getURL());
+ UpdateCore.warn("Feature " + feature + " not found on site" + this.getURL());
return null;
}
@@ -323,7 +323,7 @@
try {
featureToCompare = features[indexFeatures].getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
if (!feature.equals(featureToCompare)) {
IPluginEntry[] pluginEntries = features[indexFeatures].getFeature().getPluginEntries();
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
index 91f9da5..2a18a4c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/SiteFeatureReference.java
@@ -7,7 +7,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* Convenience implementation of a feature reference.
@@ -55,7 +55,7 @@
categories.add(siteCat);
else {
String siteURL = getSite().getURL() != null ? getSite().getURL().toExternalForm() : null;
- UpdateCORE.warn("Category " + categoriesAsString[i] + " not found in Site:" + siteURL);
+ UpdateCore.warn("Category " + categoriesAsString[i] + " not found in Site:" + siteURL);
}
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
index a219222..e8d042e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/Utilities.java
@@ -12,7 +12,7 @@
import org.eclipse.core.runtime.*;
import org.eclipse.update.core.model.InstallAbortedException;
import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* This class is a collection of utility functions that can be
@@ -189,7 +189,7 @@
* @since 2.0
*/
public static CoreException newCoreException(String s, int code, Throwable e) {
- String id = UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ String id = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
// check the case of a multistatus
IStatus status;
@@ -244,7 +244,7 @@
* @since 2.0
*/
public static CoreException newCoreException(String s, String s1, String s2, CoreException e1, CoreException e2) {
- String id = UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ String id = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
if (s == null)
s = "";
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
index d1f0f29..153c3a7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/VersionedIdentifier.java
@@ -6,7 +6,7 @@
import org.eclipse.core.runtime.PluginVersionIdentifier;
import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* Versioned Identifier. This is a utility class combining an identification
@@ -43,7 +43,7 @@
try {
this.version = new PluginVersionIdentifier(versionName);
} catch (RuntimeException e){
- UpdateCORE.warn("Invalid Version:"+versionName,e);
+ UpdateCore.warn("Invalid Version:"+versionName,e);
}
}
if (this.version==null)
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
index d164afd..a095c17 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/DefaultFeatureParser.java
@@ -52,7 +52,7 @@
private static final int STATE_IMPORT = 11;
private static final int STATE_PLUGIN = 12;
private static final int STATE_DATA = 13;
- private static final String PLUGIN_ID = UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ private static final String PLUGIN_ID = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
private static final String FEATURE = "feature"; //$NON-NLS-1$
private static final String INCLUDES = "includes"; //$NON-NLS-1$
@@ -152,7 +152,7 @@
*/
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName);
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -476,7 +476,7 @@
}
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("End Element:" + uri + ":" + localName + ":" + qName);
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@@ -771,7 +771,7 @@
objectStack.push(feature);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
debug("End process DefaultFeature tag: id:" //$NON-NLS-1$
+id + " ver:" //$NON-NLS-1$
+ver + " label:" //$NON-NLS-1$
@@ -804,7 +804,7 @@
objectStack.push(handler);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("Processed Handler: url:" //$NON-NLS-1$
+handlerURL + " library:" //$NON-NLS-1$
+library + " class:" //$NON-NLS-1$
@@ -821,7 +821,7 @@
objectStack.push(inf);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("Processed Info: url:" + infoURL); //$NON-NLS-1$
}
@@ -882,7 +882,7 @@
objectStack.push(includedFeature);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
debug("End process Includes tag: id:" //$NON-NLS-1$
+id + " ver:" + ver); //$NON-NLS-1$
debug("name =" + name + " optional=" + optional + " match=" + ruleName + " search-location=" + locationName);
@@ -900,7 +900,7 @@
inf.setURLString(infoURL);
inf.setAnnotation(label);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("Processed URLInfo: url:" + infoURL + " label:" + label);
//$NON-NLS-1$ //$NON-NLS-2$
@@ -980,7 +980,7 @@
objectStack.push(imp);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
debug("Processed import: id:" + id + " ver:" + ver);
//$NON-NLS-1$ //$NON-NLS-2$
debug("Processed import: match:" + match); //$NON-NLS-1$
@@ -1056,7 +1056,7 @@
objectStack.push(pluginEntry);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
debug("Processed Plugin: id:" + id + " ver:" + ver + " fragment:" + fragment);
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
debug("Processed Plugin: os:" + os + " ws:" + ws + " nl:" + nl);
@@ -1124,7 +1124,7 @@
objectStack.push(dataEntry);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
debug("Processed Data: id:" + id); //$NON-NLS-1$
debug("Processed Data: download size:" //$NON-NLS-1$
+download_size + " install size:" //$NON-NLS-1$
@@ -1135,7 +1135,7 @@
}
private void debug(String s) {
- UpdateCORE.debug("DefaultFeatureParser: " + s); //$NON-NLS-1$
+ UpdateCore.debug("DefaultFeatureParser: " + s); //$NON-NLS-1$
}
private void logStatus(SAXParseException ex) {
@@ -1171,8 +1171,8 @@
}
status.add(error);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
- UpdateCORE.log(error);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
+ UpdateCore.log(error);
}
private void internalErrorUnknownTag(String msg) {
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 61c3737..645eb84 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
@@ -12,7 +12,7 @@
import org.eclipse.core.runtime.*;
import org.eclipse.update.core.SiteFeatureReferenceModel;
import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
import org.xml.sax.*;
import org.xml.sax.helpers.DefaultHandler;
@@ -46,7 +46,7 @@
private static final int STATE_CATEGORY_DEF = 5;
private static final int STATE_DESCRIPTION_SITE = 6;
private static final int STATE_DESCRIPTION_CATEGORY_DEF = 7;
- private static final String PLUGIN_ID = UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ private static final String PLUGIN_ID = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
private static final String SITE = "site"; //$NON-NLS-1$
private static final String FEATURE = "feature"; //$NON-NLS-1$
@@ -81,7 +81,7 @@
this.parser.setContentHandler(this);
this.parser.setErrorHandler(this); // 18350
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("Created"); //$NON-NLS-1$
}
@@ -143,7 +143,7 @@
*/
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
debug("State: " + currentState); //$NON-NLS-1$
debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName);
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -292,7 +292,7 @@
break;
}
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("End Element:" + uri + ":" + localName + ":" + qName);
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@@ -455,7 +455,7 @@
site.setType(type);
objectStack.push(site);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("End process Site tag: siteURL:" + siteURL + " type:" + type);
//$NON-NLS-1$ //$NON-NLS-2$
@@ -484,7 +484,7 @@
if ((id == null || id.trim().equals("")) //$NON-NLS-1$
^ (ver == null || ver.trim().equals(""))) { //$NON-NLS-1$
String[] values = new String[] { id, ver, getState(currentState)};
- UpdateCORE.warn(Policy.bind("DefaultFeatureParser.IdOrVersionInvalid", values));
+ UpdateCore.warn(Policy.bind("DefaultFeatureParser.IdOrVersionInvalid", values));
//$NON-NLS-1$
} else {
feature.setFeatureIdentifier(id);
@@ -525,7 +525,7 @@
objectStack.push(feature);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("End Processing DefaultFeature Tag: url:" + urlInfo + " type:" + type);
//$NON-NLS-1$ //$NON-NLS-2$
@@ -554,7 +554,7 @@
SiteModel site = (SiteModel) objectStack.peek();
site.addArchiveReferenceModel(archive);
}
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("End processing Archive: path:" + id + " url:" + url);
//$NON-NLS-1$ //$NON-NLS-2$
@@ -568,7 +568,7 @@
SiteFeatureReferenceModel feature = (SiteFeatureReferenceModel) objectStack.peek();
feature.addCategoryName(category);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("End processing Category: name:" + category); //$NON-NLS-1$
}
@@ -586,7 +586,7 @@
site.addCategoryModel(category);
objectStack.push(category);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("End processing CategoryDef: name:" + name + " label:" + label);
//$NON-NLS-1$ //$NON-NLS-2$
}
@@ -599,7 +599,7 @@
String infoURL = attributes.getValue("url"); //$NON-NLS-1$
inf.setURLString(infoURL);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
debug("Processed Info: url:" + infoURL); //$NON-NLS-1$
objectStack.push(inf);
@@ -609,7 +609,7 @@
*
*/
private void debug(String s) {
- UpdateCORE.debug("DefaultSiteParser" + s);
+ UpdateCore.debug("DefaultSiteParser" + s);
}
/*
@@ -648,8 +648,8 @@
}
status.add(error);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING)
- UpdateCORE.log(error);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING)
+ UpdateCore.log(error);
}
/*
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
index a4085ec..d86ca0d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureModel.java
@@ -10,7 +10,7 @@
import org.eclipse.update.core.IIncludedFeatureReference;
import org.eclipse.update.core.VersionedIdentifier;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* Feature model object.
@@ -902,7 +902,7 @@
try {
imageURL = resolveURL(base,bundleURL, imageURLString);
} catch (MalformedURLException e){
- UpdateCORE.warn("",e);
+ UpdateCore.warn("",e);
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
index a84076e..1418795 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/FeatureReferenceModel.java
@@ -8,7 +8,7 @@
import java.net.URL;
import org.eclipse.update.core.Site;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
import org.eclipse.update.internal.core.UpdateManagerUtils;
/**
@@ -244,7 +244,7 @@
try {
url = resolveURL(base, bundleURL, urlString);
} catch (MalformedURLException e){
- UpdateCORE.warn("",e);
+ UpdateCore.warn("",e);
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
index 6f992cb..a229fdf 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/ModelObject.java
@@ -206,8 +206,8 @@
private String getExtendedString(String resolvedUrlString) {
IPath path = new Path(resolvedUrlString);
path = getExpandedPath(path);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_WARNINGS) {
- UpdateCORE.warn("Resolved :" + resolvedUrlString + " as:" + path.toOSString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_WARNINGS) {
+ UpdateCore.warn("Resolved :" + resolvedUrlString + " as:" + path.toOSString());
}
return path.toOSString();
@@ -356,9 +356,9 @@
bundle = ResourceBundle.getBundle(getPropertyName(), Locale.getDefault(), l);
bundles.put(url.toExternalForm(), bundle);
} catch (MissingResourceException e) {
- UpdateCORE.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
} catch (MalformedURLException e) {
- UpdateCORE.warn(e.getLocalizedMessage()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage()); //$NON-NLS-1$
}
return bundle;
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
index 96f3444..4f01524 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/core/model/URLEntryModel.java
@@ -7,7 +7,7 @@
import java.net.MalformedURLException;
import java.net.URL;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* Annotated URL model object.
@@ -143,7 +143,7 @@
try {
url = resolveURL(base,bundleURL, urlString);
} catch (MalformedURLException e){
- UpdateCORE.warn("",e);
+ UpdateCore.warn("",e);
}
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
index f25f969..2edd3b9 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfigurationPolicy.java
@@ -84,7 +84,7 @@
return;
if (featureReference == null) {
- UpdateCORE.warn("The feature reference to configure is null");
+ UpdateCore.warn("The feature reference to configure is null");
return;
}
@@ -95,14 +95,14 @@
if (!UpdateManagerUtils.isOptional(featureReference)){
URL url = featureReference.getURL();
String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateCORE.warn("Error retrieving feature:" + urlString, e);
+ UpdateCore.warn("Error retrieving feature:" + urlString, e);
return;
}
}
if (feature == null) {
URL url = featureReference.getURL();
String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateCORE.warn("The feature to unconfigure is null: feature reference is:" + urlString);
+ UpdateCore.warn("The feature to unconfigure is null: feature reference is:" + urlString);
}
// Setup optional install handler
@@ -161,12 +161,12 @@
public boolean unconfigure(IFeatureReference featureReference, boolean callInstallHandler, boolean createActivity) throws CoreException {
if (isUnconfigured(featureReference)){
- UpdateCORE.warn("Feature already unconfigured");
+ UpdateCore.warn("Feature already unconfigured");
return true;
}
if (featureReference == null) {
- UpdateCORE.warn("The feature reference to unconfigure is null");
+ UpdateCore.warn("The feature reference to unconfigure is null");
return false;
}
@@ -177,7 +177,7 @@
if (!UpdateManagerUtils.isOptional(featureReference)){
URL url = featureReference.getURL();
String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateCORE.warn("Error retrieving feature:" + urlString, e);
+ UpdateCore.warn("Error retrieving feature:" + urlString, e);
return false;
}
}
@@ -185,7 +185,7 @@
if (feature == null) {
URL url = featureReference.getURL();
String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateCORE.warn("The feature to unconfigure is null: feature reference is:" + urlString);
+ UpdateCore.warn("The feature to unconfigure is null: feature reference is:" + urlString);
return false;
}
@@ -256,7 +256,7 @@
if (!success) {
URL url = featureReference.getURL();
String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateCORE.warn("Unable to unconfigure:" + urlString);
+ UpdateCore.warn("Unable to unconfigure:" + urlString);
}
return success;
}
@@ -275,11 +275,11 @@
if (getPolicy() == IPlatformConfiguration.ISitePolicy.USER_EXCLUDE) {
// EXCLUDE: return unconfigured plugins MINUS any plugins that
// are configured
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.warn("UNCONFIGURED PLUGINS");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.warn("UNCONFIGURED PLUGINS");
String[] unconfigured = getPluginString(site, getUnconfiguredFeatures());
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.warn("CONFIGURED PLUGINS");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.warn("CONFIGURED PLUGINS");
String[] configured = getPluginString(site, getConfiguredFeatures());
pluginsToWrite = delta(configured, unconfigured);
} else {
@@ -288,10 +288,10 @@
}
//TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("GetPluginPath for: " + ((site == null) ? "<No site>" : site.getURL().toString()));
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("GetPluginPath for: " + ((site == null) ? "<No site>" : site.getURL().toString()));
for (int i = 0; i < pluginsToWrite.length; i++) {
- UpdateCORE.debug("To write:" + pluginsToWrite[i]);
+ UpdateCore.debug("To write:" + pluginsToWrite[i]);
}
}
@@ -308,18 +308,18 @@
}
String[] pluginsNotToWrite = getPluginString(site, arrayOfFeatureRef);
//TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER){
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER){
for (int i = 0; i < pluginsNotToWrite.length; i++) {
- UpdateCORE.debug("Not to write:"+pluginsNotToWrite[i]);
+ UpdateCore.debug("Not to write:"+pluginsNotToWrite[i]);
}
}
String[] included = delta(pluginsNotToWrite, pluginRead);
//TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER){
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER){
if (included!=null)
for (int i = 0; i < included.length; i++) {
- UpdateCORE.debug("Delta with read:"+included[i]);
+ UpdateCore.debug("Delta with read:"+included[i]);
}
}
result = union(included, pluginsToWrite);*/
@@ -386,11 +386,11 @@
try {
feature = element.getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
};
IPluginEntry[] entries = null;
if (feature == null) {
- UpdateCORE.warn("Null Feature", new Exception());
+ UpdateCore.warn("Null Feature", new Exception());
entries = new IPluginEntry[0];
} else {
entries = feature.getPluginEntries();
@@ -405,7 +405,7 @@
featureContentReference = feature.getFeatureContentProvider().getPluginEntryArchiveReferences(entry, null /*IProgressMonitor*/
);
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
// transform into a valid String
@@ -422,8 +422,8 @@
path += entry.isFragment() ? "fragment.xml" : "plugin.xml";
//$NON-NLS-1$ //$NON-NLS-2$
pluginsString.add(path);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.warn("Add plugin: "+path+" to the list");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.warn("Add plugin: "+path+" to the list");
}
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
index ad5fb1b..65400e1 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ConfiguredSite.java
@@ -181,15 +181,15 @@
try {
installedFeatureRef = getSite().install(feature, optionalFeatures, verificationListener, monitor);
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_INSTALL) {
- UpdateCORE.debug("Sucessfully installed: " + installedFeatureRef.getURL().toExternalForm());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL) {
+ UpdateCore.debug("Sucessfully installed: " + installedFeatureRef.getURL().toExternalForm());
}
if (installedFeatureRef != null) {
try {
installedFeature = installedFeatureRef.getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
}
@@ -299,7 +299,7 @@
private void configure(IFeature feature, IFeatureReference[] optionalFeatures, boolean callInstallHandler) throws CoreException {
if (feature == null) {
- UpdateCORE.warn("Attempting to configure a null feature in site:" + getSite().getURL().toExternalForm());
+ UpdateCore.warn("Attempting to configure a null feature in site:" + getSite().getURL().toExternalForm());
return;
}
@@ -320,7 +320,7 @@
} catch (CoreException e) {
// will skip any bad children
if (!childrenRef[i].isOptional())
- UpdateCORE.warn("Unable to configure child feature: " + childrenRef[i] + " " + e);
+ UpdateCore.warn("Unable to configure child feature: " + childrenRef[i] + " " + e);
}
}
@@ -360,7 +360,7 @@
break;
}
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
}
@@ -386,7 +386,7 @@
IFeatureReference featureReference = getSite().getFeatureReference(feature);
if (featureReference == null) {
- UpdateCORE.warn("Unable to retrieve Feature Reference for feature" + feature);
+ UpdateCore.warn("Unable to retrieve Feature Reference for feature" + feature);
return false;
}
@@ -396,7 +396,7 @@
// verify no enable parent
if (verifyEnableParent && !validateNoConfiguredParents(feature)) {
- UpdateCORE.warn("The feature " + feature.getVersionedIdentifier() + " to disable is needed by another enable feature");
+ UpdateCore.warn("The feature " + feature.getVersionedIdentifier() + " to disable is needed by another enable feature");
return false;
}
@@ -406,7 +406,7 @@
} catch (CoreException e) {
URL url = featureReference.getURL();
String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateCORE.warn("Unable to unconfigure" + urlString, e);
+ UpdateCore.warn("Unable to unconfigure" + urlString, e);
throw e;
}
if (sucessfullyUnconfigured) {
@@ -430,7 +430,7 @@
unconfigure(child, includePatches, true);
} catch (CoreException e) {
// skip any bad children
- UpdateCORE.warn("Unable to unconfigure child feature: " + childrenRef[i] + " " + e);
+ UpdateCore.warn("Unable to unconfigure child feature: " + childrenRef[i] + " " + e);
}
}
@@ -445,7 +445,7 @@
} else {
URL url = featureReference.getURL();
String urlString = (url != null) ? url.toExternalForm() : "<no feature reference url>";
- UpdateCORE.warn("Unable to unconfigure:" + urlString);
+ UpdateCore.warn("Unable to unconfigure:" + urlString);
return false;
}
}
@@ -479,7 +479,7 @@
}
}
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
}
@@ -565,7 +565,7 @@
String url = element.getURL().toString();
ISite site = element.getSite();
String siteString = (site != null) ? site.getURL().toExternalForm() : Policy.bind("ConfiguredSite.NoSite"); //$NON-NLS-1$
- UpdateCORE.warn(Policy.bind("ConfiguredSite.CannotFindFeatureToUnconfigure", url, siteString), e); //$NON-NLS-1$
+ UpdateCore.warn(Policy.bind("ConfiguredSite.CannotFindFeatureToUnconfigure", url, siteString), e); //$NON-NLS-1$
}
}
//} // end USER_EXCLUDE
@@ -588,7 +588,7 @@
feature = configuredFeatures[i].getFeature();
} catch (CoreException e) {
// notify we cannot find the feature
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
String featureString = configuredFeatures[i].getURL().toExternalForm();
if (!handler.reportProblem(Policy.bind("ConfiguredSite.CannotFindFeatureToConfigure", featureString))) { //$NON-NLS-1$
throw new InterruptedException();
@@ -619,7 +619,7 @@
// doesn't seem to exist on the site
String msg = "Error verifying existence of plugin:" + currentFeaturePluginEntry.getVersionedIdentifier().toString();
//$NON-NLS-1$
- UpdateCORE.log(msg, new Exception());
+ UpdateCore.log(msg, new Exception());
String siteString = (site != null) ? site.getURL().toExternalForm() : Policy.bind("ConfiguredSite.NoSite");
//$NON-NLS-1$
@@ -772,7 +772,7 @@
}
String msg1 = Policy.bind("ConfiguredSite.MissingPluginsBrokenFeature", values);
//$NON-NLS-1$
- UpdateCORE.warn(msg1);
+ UpdateCore.warn(msg1);
IStatus status = createStatus(IStatus.ERROR, IFeature.STATUS_UNHAPPY, msg1, null);
multi.add(status);
}
@@ -896,7 +896,7 @@
if (file == null)
return null;
- UpdateCORE.warn("IsContained: Checking for markers at:" + file);
+ UpdateCore.warn("IsContained: Checking for markers at:" + file);
if (file.exists() && file.isDirectory()) {
File productFile = new File(file, PRODUCT_SITE_MARKER);
File extensionFile = new File(file, EXTENSION_SITE_MARKER);
@@ -935,11 +935,11 @@
productId = getProductIdentifier("id", productFile);
privateId = getProductIdentifier("id", markerFile);
if (productId == null) {
- UpdateCORE.warn("Product ID is null at:" + productFile);
+ UpdateCore.warn("Product ID is null at:" + productFile);
return null;
}
if (!productId.equalsIgnoreCase(privateId)) {
- UpdateCORE.warn("Product id at" + productFile + " Different than:" + markerFile);
+ UpdateCore.warn("Product id at" + productFile + " Different than:" + markerFile);
String name = getProductIdentifier("name", markerFile);
String version = getProductIdentifier("version", markerFile);
String markerID = (name == null) ? version : name + ":" + version;
@@ -950,7 +950,7 @@
return privateId;
}
} else {
- UpdateCORE.warn("Product Marker doesn't exist:" + productFile);
+ UpdateCore.warn("Product Marker doesn't exist:" + productFile);
}
return null;
@@ -968,11 +968,11 @@
PropertyResourceBundle bundle = new PropertyResourceBundle(in);
result = bundle.getString(identifier);
} catch (IOException e) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_INSTALL)
- UpdateCORE.debug("Exception reading property file:" + propertyFile);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)
+ UpdateCore.debug("Exception reading property file:" + propertyFile);
} catch (MissingResourceException e) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_INSTALL)
- UpdateCORE.debug("Exception reading '" + identifier + "' from property file:" + propertyFile);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)
+ UpdateCore.debug("Exception reading '" + identifier + "' from property file:" + propertyFile);
}
return result;
}
@@ -988,10 +988,10 @@
if (productFile.exists()) {
return productFile;
} else {
- UpdateCORE.warn("Product marker doesn't exist:" + productFile);
+ UpdateCore.warn("Product marker doesn't exist:" + productFile);
}
} else {
- UpdateCORE.warn("Cannot retrieve install URL from BootLoader");
+ UpdateCore.warn("Cannot retrieve install URL from BootLoader");
}
return null;
}
@@ -1003,10 +1003,10 @@
void createPrivateSiteMarker() {
URL siteURL = getSite().getURL();
if (siteURL == null)
- UpdateCORE.warn("Unable to create marker. The Site url is null.");
+ UpdateCore.warn("Unable to create marker. The Site url is null.");
if (!"file".equalsIgnoreCase(siteURL.getProtocol()))
- UpdateCORE.warn("Unable to create private marker. The Site is not on the local file system.");
+ UpdateCore.warn("Unable to create private marker. The Site is not on the local file system.");
String siteLocation = siteURL.getFile();
File productFile = getProductFile();
@@ -1029,7 +1029,7 @@
if (productVer != null)
w.println("version=" + productVer);
} catch (Exception e) {
- UpdateCORE.warn("Unable to create private Marker at:" + file, e);
+ UpdateCore.warn("Unable to create private Marker at:" + file, e);
} finally {
if (w != null)
w.close();
@@ -1069,27 +1069,27 @@
private boolean containsMarker(String marker) {
ISite site = getSite();
if (site == null) {
- UpdateCORE.warn("Contains Markers:The site is null");
+ UpdateCore.warn("Contains Markers:The site is null");
return false;
}
URL url = site.getURL();
if (url == null) {
- UpdateCORE.warn("Contains Markers:Site URL is null");
+ UpdateCore.warn("Contains Markers:Site URL is null");
return false;
}
if (!"file".equalsIgnoreCase(url.getProtocol())) {
- UpdateCORE.warn("Contains Markers:Non file protocol");
+ UpdateCore.warn("Contains Markers:Non file protocol");
return false;
}
File file = new File(url.getFile());
if (!file.exists()) {
- UpdateCORE.warn("Contains Markers:The site doesn't exist:" + file);
+ UpdateCore.warn("Contains Markers:The site doesn't exist:" + file);
return false;
}
File extension = new File(file, marker);
if (!extension.exists()) {
- UpdateCORE.warn("Contains Markers:The extensionfile does not exist:" + extension);
+ UpdateCore.warn("Contains Markers:The extensionfile does not exist:" + extension);
return false;
}
return true;
@@ -1101,7 +1101,7 @@
public boolean isNativelyLinked() throws CoreException {
String platformString = getPlatformURLString();
if (platformString == null) {
- UpdateCORE.warn("Unable to retrieve platformString");
+ UpdateCore.warn("Unable to retrieve platformString");
return false;
}
@@ -1115,7 +1115,7 @@
if (entry != null) {
return entry.isNativelyLinked();
} else {
- UpdateCORE.warn("Unable to retrieve site:" + platformString + " from platform.");
+ UpdateCore.warn("Unable to retrieve site:" + platformString + " from platform.");
}
// check by comparing URLs
@@ -1142,7 +1142,7 @@
*/
private boolean validateNoConfiguredParents(IFeature feature) throws CoreException {
if (feature == null) {
- UpdateCORE.warn("ConfigurationPolicy: validate Feature is null");
+ UpdateCore.warn("ConfigurationPolicy: validate Feature is null");
return true;
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
index 6156e65..dad2f8d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/ErrorRecoveryLog.java
@@ -115,7 +115,7 @@
public void open(String logEntry) throws CoreException {
if (open) {
nbOfOpen++;
- UpdateCORE.warn("Open nested Error/Recovery log #"+nbOfOpen+":"+logEntry);
+ UpdateCore.warn("Open nested Error/Recovery log #"+nbOfOpen+":"+logEntry);
return;
}
@@ -127,7 +127,7 @@
paths=null;
open=true;
nbOfOpen=0;
- UpdateCORE.warn("Start new Error/Recovery log #"+nbOfOpen+":"+logEntry);
+ UpdateCore.warn("Start new Error/Recovery log #"+nbOfOpen+":"+logEntry);
} catch (IOException e) {
throw Utilities.newCoreException(
Policy.bind("UpdateManagerUtils.UnableToLog", new Object[] { logFile }),
@@ -144,7 +144,7 @@
File logFile = null;
try {
if (!open) {
- UpdateCORE.warn("Internal Error: The Error/Recovery log is not open:"+logEntry);
+ UpdateCore.warn("Internal Error: The Error/Recovery log is not open:"+logEntry);
return;
}
@@ -184,12 +184,12 @@
public void close(String logEntry) throws CoreException {
if (nbOfOpen>0){
- UpdateCORE.warn("Close nested Error/Recovery log #"+nbOfOpen+":"+logEntry);
+ UpdateCore.warn("Close nested Error/Recovery log #"+nbOfOpen+":"+logEntry);
nbOfOpen--;
return;
}
- UpdateCORE.warn("Close Error/Recovery log #"+nbOfOpen+":"+logEntry);
+ UpdateCore.warn("Close Error/Recovery log #"+nbOfOpen+":"+logEntry);
append(logEntry);
if (out != null) {
try {
@@ -235,7 +235,7 @@
//check if recovery is on
if (!RECOVERY_ON){
- UpdateCORE.warn("Recovering is turned off. Abort recovery");
+ UpdateCore.warn("Recovering is turned off. Abort recovery");
return multi;
}
@@ -252,7 +252,7 @@
prop = new Properties();
prop.load(in);
} catch (IOException e){
- UpdateCORE.warn("Unable to read:"+logFile,e);
+ UpdateCore.warn("Unable to read:"+logFile,e);
multi.add(createStatus(IStatus.ERROR,"Unable to access property file:"+logFile,e));
return multi;
}
@@ -261,7 +261,7 @@
if(eof!=null && eof.equals("eof")){
// all is good
delete();
- UpdateCORE.warn("Found log file. Log file contains end-of-file. No need to process");
+ UpdateCore.warn("Found log file. Log file contains end-of-file. No need to process");
multi.add(createStatus(IStatus.OK,null,null));
return multi;
}
@@ -291,7 +291,7 @@
*/
private IStatus createStatus(int statusSeverity, String msg, Exception e){
String id =
- UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
StringBuffer completeString = new StringBuffer("");
if (msg!=null)
@@ -317,7 +317,7 @@
if(values.contains(END_INSTALL_LOG)){
// all is good
delete();
- UpdateCORE.warn("Found log file. Log file contains END_INSTALL_LOG. No need to process rename");
+ UpdateCore.warn("Found log file. Log file contains END_INSTALL_LOG. No need to process rename");
multi.add(createStatus(IStatus.OK,null,null));
return multi;
}
@@ -330,7 +330,7 @@
while(val!=null && !found){
if(val.equalsIgnoreCase(ALL_INSTALLED)) found = true;
IStatus renameStatus = processRename(val);
- UpdateCORE.log(renameStatus);
+ UpdateCore.log(renameStatus);
if(renameStatus.getSeverity()!=IStatus.OK){
multi.add(renameStatus);
}
@@ -338,13 +338,13 @@
val = prop.getProperty(LOG_ENTRY_KEY+index);
}
if (val==null){
- UpdateCORE.warn("Unable to find value for :"+LOG_ENTRY_KEY+index);
+ UpdateCore.warn("Unable to find value for :"+LOG_ENTRY_KEY+index);
multi.add(createStatus(IStatus.ERROR,"Wrong log file. Unable to find entry for:"+LOG_ENTRY_KEY+index,null));
return multi;
}
// process recovery finished
delete();
- UpdateCORE.warn("Found log file. Successfully recovered by renaming. Feature is installed.");
+ UpdateCore.warn("Found log file. Successfully recovered by renaming. Feature is installed.");
multi.add(createStatus(IStatus.OK,null,null));
} else {
// remove all because install did not lay out all the files
@@ -353,7 +353,7 @@
String val = prop.getProperty(LOG_ENTRY_KEY+index);
while(val!=null){
IStatus removeStatus = processRemove(val);
- UpdateCORE.log(removeStatus);
+ UpdateCore.log(removeStatus);
if(removeStatus.getSeverity()!=IStatus.OK){
multi.addAll(removeStatus);
}
@@ -362,7 +362,7 @@
}
// process recovery finished
delete();
- UpdateCORE.warn("Found log file. Successfully recovered by removing. Feature is removed.");
+ UpdateCore.warn("Found log file. Successfully recovered by removing. Feature is removed.");
multi.add(createStatus(IStatus.OK,null,null));
}
return multi;
@@ -410,7 +410,7 @@
boolean sucess = false;
if (newFile.exists()) {
UpdateManagerUtils.removeFromFileSystem(newFile);
- UpdateCORE.warn("Removing already existing file:"+newFile);
+ UpdateCore.warn("Removing already existing file:"+newFile);
}
sucess = oldFile.renameTo(newFile);
@@ -501,7 +501,7 @@
if(values.contains(END_REMOVE_LOG)){
// all is good
delete();
- UpdateCORE.warn("Found log file. Log file contains END_REMOVE_LOG. No need to process rename");
+ UpdateCore.warn("Found log file. Log file contains END_REMOVE_LOG. No need to process rename");
multi.add(createStatus(IStatus.OK,null,null));
return multi;
}
@@ -518,7 +518,7 @@
while(val!=null && !found){
if(val.equalsIgnoreCase(END_ABOUT_REMOVE)) found = true;
IStatus renameStatus = processRemove(val);
- UpdateCORE.log(renameStatus);
+ UpdateCore.log(renameStatus);
if(renameStatus.getSeverity()!=IStatus.OK){
multi.add(renameStatus);
}
@@ -526,13 +526,13 @@
val = prop.getProperty(LOG_ENTRY_KEY+index);
}
if (val==null){
- UpdateCORE.warn("Unable to find value for :"+LOG_ENTRY_KEY+index);
+ UpdateCore.warn("Unable to find value for :"+LOG_ENTRY_KEY+index);
multi.add(createStatus(IStatus.ERROR,"Wrong log file. Unable to find entry for:"+LOG_ENTRY_KEY+index,null));
return multi;
}
// process recovery finished
delete();
- UpdateCORE.warn("Found log file. Successfully recovered by deleting. Feature is removed.");
+ UpdateCore.warn("Found log file. Successfully recovered by deleting. Feature is removed.");
multi.add(createStatus(IStatus.OK,null,null));
}
return multi;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
index 0b7830c..60ac0e7 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureExecutableFactory.java
@@ -43,7 +43,7 @@
contentProvider.getFeatureManifestReference(null /*IProgressMonitor*/
).asURL();
URL resolvedURL = URLEncoder.encode(nonResolvedURL);
- featureStream = UpdateCORE.getPlugin().get(resolvedURL).getInputStream();
+ featureStream = UpdateCore.getPlugin().get(resolvedURL).getInputStream();
feature = (TargetFeature) this.parseFeature(featureStream);
feature.setSite(site);
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
index ea8a4cd..f0263c3 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/FeatureTypeFactory.java
@@ -56,7 +56,7 @@
IFeatureFactory result = null;
String pluginID =
- UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
IConfigurationElement[] elements =
pluginRegistry.getConfigurationElementsFor(pluginID, SIMPLE_EXTENSION_ID, type);
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 fd3c689..e015884 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
@@ -174,9 +174,9 @@
for (int i = 0; i < newFeaturesRef.length; i++) {
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
String reconciliationType = "enable (optimistic)";
- UpdateCORE.debug("New Linked Site:New Feature: " + newFeaturesRef[i].getURL() + " as " + reconciliationType);
+ UpdateCore.debug("New Linked Site:New Feature: " + newFeaturesRef[i].getURL() + " as " + reconciliationType);
}
ConfigurationPolicy policy = linkedSite.getConfigurationPolicy();
policy.configure(newFeaturesRef[i], true, false);
@@ -341,7 +341,7 @@
try {
feature = configuredFeaturesRef[j].getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
saveFeatureEntry(cSite, feature, runtimeConfiguration);
}
@@ -361,7 +361,7 @@
} catch (IOException e) {
CoreException exc = Utilities.newCoreException(Policy.bind("InstallConfiguration.UnableToSavePlatformConfiguration", runtimeConfiguration.getConfigurationLocation().toExternalForm()), e);
//$NON-NLS-1$
- UpdateCORE.warn("",exc);
+ UpdateCore.warn("",exc);
}
}
@@ -482,17 +482,17 @@
try {
urlToCheck = new URL(configurationSites[i].getPlatformURLString());
} catch (MalformedURLException e) {
- UpdateCORE.warn(Policy.bind("InstallConfiguration.UnableToCreateURL", configurationSites[i].getPlatformURLString()), e);
+ UpdateCore.warn(Policy.bind("InstallConfiguration.UnableToCreateURL", configurationSites[i].getPlatformURLString()), e);
//$NON-NLS-1$
} catch (ClassCastException e) {
- UpdateCORE.warn(Policy.bind("InstallConfiguration.UnableToCast"), e);
+ UpdateCore.warn(Policy.bind("InstallConfiguration.UnableToCast"), e);
//$NON-NLS-1$
}
// if the URL doesn't exits log it
IPlatformConfiguration.ISiteEntry siteEntry = runtimeConfiguration.findConfiguredSite(urlToCheck);
if (siteEntry == null) {
- UpdateCORE.warn(Policy.bind("Unable to find site {0} in platform configuration {1}.", urlToCheck.toExternalForm(), runtimeConfiguration.getConfigurationLocation().toExternalForm()));
+ UpdateCore.warn(Policy.bind("Unable to find site {0} in platform configuration {1}.", urlToCheck.toExternalForm(), runtimeConfiguration.getConfigurationLocation().toExternalForm()));
//$NON-NLS-1$
}
}
@@ -508,7 +508,7 @@
File file = new File(getURL().getFile());
if (!file.exists()) {
//log + 24642 [works for all activities]
- UpdateCORE.log(this);
+ UpdateCore.log(this);
}
if (isTransient)
file.deleteOnExit();
@@ -605,7 +605,7 @@
try {
featureToUnconfigure = featuresToUnconfigure[j].getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
if (featureToUnconfigure != null)
nowConfigSites[i].unconfigure(featureToUnconfigure);
@@ -684,8 +684,8 @@
//
if (!rootString.startsWith("platform")) {
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.debug("getRuntimeConfiguration Plugin Entry Full URL:" + pluginEntryfullURL + " Platform String:" + rootString + " [NON PLATFORM URL].");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.debug("getRuntimeConfiguration Plugin Entry Full URL:" + pluginEntryfullURL + " Platform String:" + rootString + " [NON PLATFORM URL].");
return pluginEntryfullURL;
}
@@ -700,8 +700,8 @@
URL result = new URL(new URL(rootString), relativeString);
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.debug("getRuntimeConfiguration plugin Entry Full URL:" + pluginEntryfullURL + " Platform String:" + rootString + " Site URL:" + pluginEntryRootURL + " Relative:" + relativeString);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.debug("getRuntimeConfiguration plugin Entry Full URL:" + pluginEntryfullURL + " Platform String:" + rootString + " Site URL:" + pluginEntryRootURL + " Relative:" + relativeString);
// verify we are about to write a valid file URL
// check with fullURL as it is not resolved to platform:base/
@@ -709,7 +709,7 @@
if ("file".equals(pluginEntryfullURL.getProtocol())) {
String fileString = pluginEntryfullURL.getFile();
if (!new File(fileString).exists()) {
- UpdateCORE.warn("The URL:" + result + " doesn't point to a valid platform plugin.The URL will not be written in the platform configuration", new Exception());
+ UpdateCore.warn("The URL:" + result + " doesn't point to a valid platform plugin.The URL will not be written in the platform configuration", new Exception());
return null;
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
index 0272688..63cf3a8 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InstallHandlerProxy.java
@@ -61,7 +61,7 @@
InstallMonitor monitor)
throws CoreException {
- DEBUG = UpdateCORE.DEBUG_SHOW_IHANDLER;
+ DEBUG = UpdateCore.DEBUG_SHOW_IHANDLER;
// validate arguments
if (feature == null)
throw new IllegalArgumentException();
@@ -384,11 +384,11 @@
if (isUndoAction()) {
// for "undo" operations, deactivate handler and log error
String id =
- UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
IStatus status =
new Status(IStatus.ERROR, id, 0, "InstallHandler.deactivated", ce);
//$NON-NLS-1$
- UpdateCORE.getPlugin().getLog().log(status);
+ UpdateCore.getPlugin().getLog().log(status);
handler = null; // disable subsequent handler calls
savedStatus = status;
} else
@@ -415,11 +415,11 @@
if (isUndoAction()) {
// for "undo" operations, deactivate handler and log error
String id =
- UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
IStatus status =
new Status(IStatus.ERROR, id, 0, "InstallHandler.deactivated", ce);
//$NON-NLS-1$
- UpdateCORE.getPlugin().getLog().log(status);
+ UpdateCore.getPlugin().getLog().log(status);
handler = null; // disable subsequent handler calls
savedStatus = status;
} else
@@ -471,7 +471,7 @@
InputStream is = null;
try {
fos = new FileOutputStream(tempLib);
- is = UpdateCORE.getPlugin().get(cp).getInputStream();
+ is = UpdateCore.getPlugin().get(cp).getInputStream();
Utilities.copy(is, fos, null);
} finally {
if (fos != null)
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
index b34b340..fa8c05d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/InternalSiteManager.java
@@ -151,8 +151,8 @@
// attempt to use this type instead
//DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_TYPE) {
- UpdateCORE.debug("The Site :" + siteURL.toExternalForm() + " is a different type than the guessed type based on the protocol. new Type:" + e.getNewType());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_TYPE) {
+ UpdateCore.debug("The Site :" + siteURL.toExternalForm() + " is a different type than the guessed type based on the protocol. new Type:" + e.getNewType());
//$NON-NLS-1$ //$NON-NLS-2$
}
@@ -279,7 +279,7 @@
// find extension point
IInstallDeltaHandler handler = null;
- String pluginID = UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ String pluginID = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
@@ -313,7 +313,7 @@
*/
private static ISessionDelta[] getSessionDeltas() {
List sessionDeltas = new ArrayList();
- IPath path = UpdateCORE.getPlugin().getStateLocation();
+ IPath path = UpdateCore.getPlugin().getStateLocation();
InstallChangeParser parser;
File file = path.toFile();
@@ -322,8 +322,8 @@
for (int i = 0; i < allFiles.length; i++) {
try {
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Found delta change:" + allFiles[i]);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Found delta change:" + allFiles[i]);
}
parser = new InstallChangeParser(allFiles[i]);
ISessionDelta change = parser.getInstallChange();
@@ -331,8 +331,8 @@
sessionDeltas.add(change);
}
} catch (Exception e) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.log("Unable to parse install change:" + allFiles[i], e);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.log("Unable to parse install change:" + allFiles[i], e);
}
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
index fd0e0c1..264cb2e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/NonPluginEntryContentConsumer.java
@@ -32,7 +32,7 @@
if (!closed){
contentConsumer.store( contentReference,monitor);
} else {
- UpdateCORE.warn("Attempt to store in a closed NonPluginEntryContentConsumer",new Exception());
+ UpdateCore.warn("Attempt to store in a closed NonPluginEntryContentConsumer",new Exception());
}
}
@@ -44,7 +44,7 @@
closed = true;
contentConsumer.close();
} else {
- UpdateCORE.warn("Attempt to close a closed NonPluginEntryContentConsumer",new Exception());
+ UpdateCore.warn("Attempt to close a closed NonPluginEntryContentConsumer",new Exception());
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
index a3be00c..dec4c57 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/PluginEntryContentConsumer.java
@@ -32,7 +32,7 @@
if (!closed){
contentConsumer.store(contentReference,monitor);
} else {
- UpdateCORE.warn("Attempt to store in a closed PluginEntryContentConsumer",new Exception());
+ UpdateCore.warn("Attempt to store in a closed PluginEntryContentConsumer",new Exception());
}
}
@@ -44,7 +44,7 @@
closed = true;
contentConsumer.close();
} else {
- UpdateCORE.warn("Attempt to close a closed PluginEntryContentConsumer",new Exception());
+ UpdateCore.warn("Attempt to close a closed PluginEntryContentConsumer",new Exception());
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
index c51642e..5f83014 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/Response.java
@@ -65,7 +65,7 @@
try {
return ((HttpURLConnection) connection).getResponseCode();
} catch (IOException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
return IStatusCodes.HTTP_OK;
@@ -81,7 +81,7 @@
try {
return ((HttpURLConnection) connection).getResponseMessage();
} catch (IOException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
return "";
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
index 9561725..453644a 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SessionDelta.java
@@ -58,8 +58,8 @@
// process all feature references to configure
// find the configured site each feature belongs to
if (process == ENABLE) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.warn("ENABLE SESSION DELTA");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.warn("ENABLE SESSION DELTA");
if (featureReferences != null && featureReferences.size() > 0) {
// manage ProgressMonitor
if (pm != null) {
@@ -79,7 +79,7 @@
try {
featureToConfigure = ref.getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
if (featureToConfigure != null) {
@@ -98,10 +98,10 @@
} catch (CoreException e) {
// if I cannot configure one,
//then continue with others
- UpdateCORE.warn("Unable to configure feature:" + featureToConfigure, e);
+ UpdateCore.warn("Unable to configure feature:" + featureToConfigure, e);
}
} else {
- UpdateCORE.warn("Unable to configure null feature:" + ref,null);
+ UpdateCore.warn("Unable to configure null feature:" + ref,null);
}
}
@@ -117,16 +117,16 @@
*/
public void delete() {
if (deleted) {
- UpdateCORE.warn("Attempt to delete an already deleted session delta:" + file);
+ UpdateCore.warn("Attempt to delete an already deleted session delta:" + file);
return;
}
// remove the file from the file system
if (file != null) {
UpdateManagerUtils.removeFromFileSystem(file);
- UpdateCORE.warn("Removing SessionDelta:" + file);
+ UpdateCore.warn("Removing SessionDelta:" + file);
} else {
- UpdateCORE.warn("Unable to remove SessionDelta. File is null");
+ UpdateCore.warn("Unable to remove SessionDelta. File is null");
}
deleted = true;
@@ -212,7 +212,7 @@
}
}
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
}
}
@@ -229,8 +229,8 @@
private int compare(IFeature feature1, IFeature feature2) throws CoreException {
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Compare: " + feature1 + " && " + feature2);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Compare: " + feature1 + " && " + feature2);
}
if (feature1 == null)
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
index de6e2cb..27c0887 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java
@@ -109,7 +109,7 @@
public void remove(IFeature feature, IProgressMonitor progress) throws CoreException {
if (feature == null) {
- UpdateCORE.warn("Feature to remove is null");
+ UpdateCore.warn("Feature to remove is null");
return;
}
@@ -188,7 +188,7 @@
try {
childFeature = childrenRef[i].getFeature();
} catch (CoreException e) {
- UpdateCORE.warn("Unable to retrieve feature to remove for:" + childrenRef[i]);
+ UpdateCore.warn("Unable to retrieve feature to remove for:" + childrenRef[i]);
}
if (childFeature != null)
remove(childrenRef[i].getFeature(), monitor);
@@ -244,7 +244,7 @@
try {
result = feature.getFeatureContentProvider().getDownloadSizeFor(entriesToInstall, nonPluginEntriesToInstall);
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
result = ContentEntryModel.UNKNOWN_SIZE;
}
return result;
@@ -292,7 +292,7 @@
result = feature.getFeatureContentProvider().getInstallSizeFor(entriesToInstall, nonPluginEntriesToInstall);
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
result = ContentEntryModel.UNKNOWN_SIZE;
}
@@ -384,7 +384,7 @@
try {
recoveryLog.appendPath(ErrorRecoveryLog.FEATURE_ENTRY, references[i].asFile().getAbsolutePath());
} catch (IOException e) {
- String id = UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ String id = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
throw Utilities.newCoreException(Policy.bind("SiteFile.CannotRemoveFeature", feature.getVersionedIdentifier().getIdentifier(), getURL().toExternalForm()), e);
//$NON-NLS-1$
}
@@ -419,7 +419,7 @@
try {
childFeature = childrenRef[i].getFeature();
} catch (CoreException e) {
- UpdateCORE.warn("Unable to retrieve feature to remove for:" + childrenRef[i]);
+ UpdateCore.warn("Unable to retrieve feature to remove for:" + childrenRef[i]);
}
aboutToRemove(childFeature);
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
index 3bd054f..c1a8743 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
@@ -82,7 +82,7 @@
public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {
if (closed) {
- UpdateCORE.warn("Attempt to store in a closed SiteFileContentConsumer", new Exception());
+ UpdateCore.warn("Attempt to store in a closed SiteFileContentConsumer", new Exception());
return;
}
@@ -129,7 +129,7 @@
public IFeatureReference close() throws CoreException {
if (closed)
- UpdateCORE.warn("Attempt to close a closed SiteFileContentConsumer", new Exception());
+ UpdateCore.warn("Attempt to close a closed SiteFileContentConsumer", new Exception());
// create a new Feature reference to be added to the site
SiteFeatureReference ref = new SiteFeatureReference();
@@ -153,7 +153,7 @@
File renamedFile = new File(oldPath);
if (renamedFile.exists()) {
UpdateManagerUtils.removeFromFileSystem(renamedFile);
- UpdateCORE.warn("Removing already existing file:" + oldPath);
+ UpdateCore.warn("Removing already existing file:" + oldPath);
}
sucess = fileToRename.renameTo(renamedFile);
}
@@ -190,7 +190,7 @@
public void abort() throws CoreException {
if (closed) {
- UpdateCORE.warn("Attempt to abort a closed SiteFileContentConsumer", new Exception());
+ UpdateCore.warn("Attempt to abort a closed SiteFileContentConsumer", new Exception());
return;
}
@@ -216,7 +216,7 @@
if (!sucess) {
String msg = Policy.bind("Unable to delete", oldPath);
- UpdateCORE.log(msg, null);
+ UpdateCore.log(msg, null);
} else {
// remove the feature files;
Iterator iter = installedFiles.iterator();
@@ -247,7 +247,7 @@
try {
localFeature = localFeatureReference.getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
return;
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
index 0fd957a..7e0146d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileFactory.java
@@ -147,7 +147,7 @@
// check if feature.xml exists
File featureXMLFile = new File(currentFeatureDir, Feature.FEATURE_XML);
if (!featureXMLFile.exists()) {
- UpdateCORE.warn("Unable to find feature.xml in directory:" + currentFeatureDir);
+ UpdateCore.warn("Unable to find feature.xml in directory:" + currentFeatureDir);
} else {
// PERF: remove code
//SiteFileFactory archiveFactory = new SiteFileFactory();
@@ -193,10 +193,10 @@
try {
result = ref.peek(Feature.FEATURE_XML, null, null);
} catch (IOException e) {
- UpdateCORE.warn("Exception retrieving feature.xml in file:" + currentFeatureFile, e);
+ UpdateCore.warn("Exception retrieving feature.xml in file:" + currentFeatureFile, e);
};
if (result == null) {
- UpdateCORE.warn("Unable to find feature.xml in file:" + currentFeatureFile);
+ UpdateCore.warn("Unable to find feature.xml in file:" + currentFeatureFile);
} else {
featureURL = currentFeatureFile.toURL();
// PERF: remove code
@@ -284,8 +284,8 @@
((Site) site).addArchiveReferenceModel(archive);
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("Added archive to site:" + pluginID + " pointing to: " + location);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("Added archive to site:" + pluginID + " pointing to: " + location);
}
}
} catch (MalformedURLException e) {
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
index eeb279b..289f37f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileNonPluginContentConsumer.java
@@ -29,7 +29,7 @@
public void store(ContentReference contentReference, IProgressMonitor monitor) throws CoreException {
if (closed) {
- UpdateCORE.warn("Attempt to store in a closed SiteFileNonPluginContentConsumer", new Exception());
+ UpdateCore.warn("Attempt to store in a closed SiteFileNonPluginContentConsumer", new Exception());
return;
}
@@ -60,7 +60,7 @@
*/
public void close() {
if (closed) {
- UpdateCORE.warn("Attempt to close a closed SiteFileNonPluginContentConsumer", new Exception());
+ UpdateCore.warn("Attempt to close a closed SiteFileNonPluginContentConsumer", new Exception());
return;
}
closed = true;
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
index ad67a93..3e7f840 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFilePluginContentConsumer.java
@@ -46,7 +46,7 @@
String pluginPath = null;
if (closed) {
- UpdateCORE.warn("Attempt to store in a closed SiteFilePluginContentConsumer", new Exception());
+ UpdateCore.warn("Attempt to store in a closed SiteFilePluginContentConsumer", new Exception());
return;
}
@@ -101,7 +101,7 @@
public void close() throws CoreException {
if (closed) {
- UpdateCORE.warn("Attempt to close a closed SiteFilePluginContentConsumer", new Exception());
+ UpdateCore.warn("Attempt to close a closed SiteFilePluginContentConsumer", new Exception());
return;
}
@@ -131,7 +131,7 @@
public void abort() throws CoreException {
if (closed) {
- UpdateCORE.warn("Attempt to abort a closed SiteFilePluginContentConsumer", new Exception());
+ UpdateCore.warn("Attempt to abort a closed SiteFilePluginContentConsumer", new Exception());
return;
}
@@ -149,7 +149,7 @@
if (!sucess) {
String msg = Policy.bind("Unable to delete", oldPath);
- UpdateCORE.log(msg, null);
+ UpdateCore.log(msg, null);
} else {
// remove the plugin files;
Iterator iter = installedFiles.iterator();
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
index 58bb1b5..6a1547e 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteLocal.java
@@ -75,7 +75,7 @@
// check if we have to reconcile, if the timestamp has changed
long bootStamp = currentPlatformConfiguration.getChangeStamp();
if (localSite.getStamp() != bootStamp) {
- UpdateCORE.warn("Reconcile platform stamp:" + bootStamp + " is different from LocalSite stamp:" + localSite.getStamp()); //$NON-NLS-1$ //$NON-NLS-2$
+ UpdateCore.warn("Reconcile platform stamp:" + bootStamp + " is different from LocalSite stamp:" + localSite.getStamp()); //$NON-NLS-1$ //$NON-NLS-2$
newFeaturesFound = localSite.reconcile(isOptimistic);
} else {
// no reconciliation, preserve the list of plugins from the platform anyway
@@ -103,21 +103,21 @@
//attempt to parse the LocalSite.xml
URL resolvedURL = URLEncoder.encode(configXML);
try {
- InputStream in = UpdateCORE.getPlugin().get(resolvedURL).getInputStream();;
+ InputStream in = UpdateCore.getPlugin().get(resolvedURL).getInputStream();;
new SiteLocalParser(in, localSite);
} catch (FileNotFoundException exception) {
// file SITE_LOCAL_FILE doesn't exist, ok, log it
// and reconcile with platform configuration
- UpdateCORE.warn(localSite.getLocationURLString() + " does not exist, there is no previous state or install history we can recover from, we shall use default from platform configuration.", null);
+ UpdateCore.warn(localSite.getLocationURLString() + " does not exist, there is no previous state or install history we can recover from, we shall use default from platform configuration.", null);
//$NON-NLS-1$
return false;
} catch (SAXException exception) {
- UpdateCORE.warn(Policy.bind("SiteLocal.ErrorParsingSavedState", localSite.getLocationURLString()), exception);
+ UpdateCore.warn(Policy.bind("SiteLocal.ErrorParsingSavedState", localSite.getLocationURLString()), exception);
//$NON-NLS-1$
recoverSiteLocal(resolvedURL, localSite);
return false;
} catch (IOException exception) {
- UpdateCORE.warn(Policy.bind("SiteLocal.UnableToAccessFile", configXML.toExternalForm()), exception);
+ UpdateCore.warn(Policy.bind("SiteLocal.UnableToAccessFile", configXML.toExternalForm()), exception);
//$NON-NLS-1$
recoverSiteLocal(resolvedURL, localSite);
return false;
@@ -171,8 +171,8 @@
if (removeConfigurationModel(removedConfig)) {
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION) {
- UpdateCORE.debug("Removed configuration :" + removedConfig.getLabel());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION) {
+ UpdateCore.debug("Removed configuration :" + removedConfig.getLabel());
//$NON-NLS-1$
}
@@ -297,7 +297,7 @@
// end
w.println(gap + "</" + SiteLocalParser.SITE + ">"); //$NON-NLS-1$ //$NON-NLS-2$
- UpdateCORE.warn("Saved change stamp:" + changeStamp); //$NON-NLS-1$
+ UpdateCore.warn("Saved change stamp:" + changeStamp); //$NON-NLS-1$
}
/**
@@ -656,9 +656,9 @@
if (localXml.exists()) {
try {
UpdateManagerUtils.removeFromFileSystem(localXml);
- UpdateCORE.warn("Removed bad LocalSite.xml file:" + localXml);
+ UpdateCore.warn("Removed bad LocalSite.xml file:" + localXml);
} catch (Exception e) {
- UpdateCORE.warn("Unable to remove bad LocalSite.xml file:" + localXml, e);
+ UpdateCore.warn("Unable to remove bad LocalSite.xml file:" + localXml, e);
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
index fe3116b..f02de6f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteReconciler.java
@@ -70,9 +70,9 @@
oldConfiguredSites = oldInstallConfiguration.getConfiguredSites();
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
for (int i = 0; i < oldConfiguredSites.length; i++) {
- UpdateCORE.debug("Old Site :" + oldConfiguredSites[i].getSite().getURL());
+ UpdateCore.debug("Old Site :" + oldConfiguredSites[i].getSite().getURL());
}
}
}
@@ -93,8 +93,8 @@
IConfiguredSite currentConfigurationSite = null;
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Checking if:" + resolvedURL + " is a new site or a site to reconcile.");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Checking if:" + resolvedURL + " is a new site or a site to reconcile.");
}
// check if SiteEntry has been possibly modified
@@ -114,8 +114,8 @@
// old site not found, this is a new site, create it
if (!found) {
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Site not found in previous configurations.Create new Configured Site:" + resolvedURL);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Site not found in previous configurations.Create new Configured Site:" + resolvedURL);
}
ISite site = SiteManager.getSite(resolvedURL);
@@ -130,9 +130,9 @@
ISiteFeatureReference[] newFeaturesRef = site.getFeatureReferences();
for (int i = 0; i < newFeaturesRef.length; i++) {
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
String reconciliationType = isOptimistic ? "enable (optimistic)" : "disable (pessimistic)";
- UpdateCORE.debug("New Site Found:New Feature to create: " + newFeaturesRef[i].getURL() + " as " + reconciliationType);
+ UpdateCore.debug("New Site Found:New Feature to create: " + newFeaturesRef[i].getURL() + " as " + reconciliationType);
}
if (isOptimistic) {
@@ -208,8 +208,8 @@
private ConfiguredSite reconcile(IConfiguredSite oldConfiguredSite, boolean isOptimistic) throws CoreException {
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Configured Site to reconfigure:" + oldConfiguredSite.getSite().getURL() + (isOptimistic ? " OPTIMISTIC" : " PESSIMISTIC"));
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Configured Site to reconfigure:" + oldConfiguredSite.getSite().getURL() + (isOptimistic ? " OPTIMISTIC" : " PESSIMISTIC"));
}
ConfiguredSite newConfiguredSite = createNewConfigSite(oldConfiguredSite);
@@ -224,9 +224,9 @@
IFeatureReference[] oldConfiguredFeaturesRef = oldConfiguredSite.getFeatureReferences();
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
for (int i = 0; i < oldConfiguredFeaturesRef.length; i++) {
- UpdateCORE.debug("Old feature :" + oldConfiguredFeaturesRef[i].getURL());
+ UpdateCore.debug("Old feature :" + oldConfiguredFeaturesRef[i].getURL());
}
}
@@ -234,8 +234,8 @@
boolean newFeatureFound = true;
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Is this feature new? :" + foundFeatures[i].getURL());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Is this feature new? :" + foundFeatures[i].getURL());
}
// if it is an old feature, add it to the list of features to check
@@ -284,9 +284,9 @@
private void configureNewFoundFeature(boolean isOptimistic, ConfigurationPolicy newSitePolicy, ConfigurationPolicy oldSitePolicy, IFeatureReference foundFeature, IFeatureReference[] possibleParents) throws CoreException {
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
String reconciliationType = isOptimistic ? "enable (optimistic)" : "disable (pessimistic)";
- UpdateCORE.debug("This feature is new: " + foundFeature.getURL() + " reconciled as " + reconciliationType);
+ UpdateCore.debug("This feature is new: " + foundFeature.getURL() + " reconciled as " + reconciliationType);
}
if (isOptimistic) {
@@ -300,8 +300,8 @@
// none of my parents consider me as optional OR I have no parents,
// consider as root feature
if (allOptionalParents.length == 0) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("There are no features who consider the feature as optional. Treat as root feature.");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("There are no features who consider the feature as optional. Treat as root feature.");
}
newSitePolicy.unconfigure(foundFeature, true, false);
newFoundFeatures.add(foundFeature);
@@ -312,8 +312,8 @@
//At least one of my parent considers me non optional
// consider root feature
if (allParents.length > allOptionalParents.length) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("At least one parent considers the feature as NON optional. Treat as root feature.");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("At least one parent considers the feature as NON optional. Treat as root feature.");
}
newSitePolicy.unconfigure(foundFeature, true, false);
newFoundFeatures.add(foundFeature);
@@ -323,8 +323,8 @@
for (int i = 0; i < allOptionalParents.length; i++) {
// one parent that consider me optional is enable, enable feature
if (oldSitePolicy.isConfigured(allOptionalParents[i])) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Found parent feature:" + allOptionalParents[i] + " as enable: Enable optional child feature:" + foundFeature);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Found parent feature:" + allOptionalParents[i] + " as enable: Enable optional child feature:" + foundFeature);
}
newSitePolicy.configure(foundFeature, true, false);
return;
@@ -333,8 +333,8 @@
// found parent that consider me optional but they are all disable
// unconfigure feature without adding it to the list fo new found features
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("No parents are enable. Disable feature.");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("No parents are enable. Disable feature.");
}
newSitePolicy.unconfigure(foundFeature, true, false);
@@ -375,8 +375,8 @@
ConfigurationPolicy cPolicy = cSite.getConfigurationPolicy();
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Compare features within :" + configuredSite.getSite().getURL());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Compare features within :" + configuredSite.getSite().getURL());
}
for (int indexConfiguredFeatures = 0; indexConfiguredFeatures < configuredFeatures.length - 1; indexConfiguredFeatures++) {
@@ -408,8 +408,8 @@
private static int compare(IFeatureReference featureRef1, IFeatureReference featureRef2) throws CoreException {
// TRACE
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Compare: " + featureRef1 + " && " + featureRef2);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Compare: " + featureRef1 + " && " + featureRef2);
}
if (featureRef1 == null)
@@ -421,7 +421,7 @@
feature1 = featureRef1.getFeature();
feature2 = featureRef2.getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
return 0;
}
@@ -487,7 +487,7 @@
private boolean saveNewFeatures() throws CoreException {
if (getFeatureReferences().length == 0) {
- UpdateCORE.warn("No new features found");
+ UpdateCore.warn("No new features found");
return false;
}
@@ -501,13 +501,13 @@
}
if (getFeatureReferences().length == 0) {
- UpdateCORE.warn("No root feature found when saving new features");
+ UpdateCore.warn("No root feature found when saving new features");
return false;
}
date = new Date();
String fileName = UpdateManagerUtils.getLocalRandomIdentifier(DEFAULT_INSTALL_CHANGE_NAME, date);
- IPath path = UpdateCORE.getPlugin().getStateLocation();
+ IPath path = UpdateCore.getPlugin().getStateLocation();
IPath filePath = path.append(fileName);
File file = filePath.toFile();
// persist list of new features
@@ -591,7 +591,7 @@
private boolean platformBaseChanged(IConfiguredSite[] oldConfiguredSites) {
if (oldConfiguredSites == null) {
- UpdateCORE.warn("No previous configured sites. Optimistic reconciliation.");
+ UpdateCore.warn("No previous configured sites. Optimistic reconciliation.");
return true;
}
@@ -600,14 +600,14 @@
try {
platformURL = new URL(platformString);
} catch (MalformedURLException e) {
- UpdateCORE.warn("Unable to resolve platform:/base/. Check you are running a Platform", e);
+ UpdateCore.warn("Unable to resolve platform:/base/. Check you are running a Platform", e);
return true;
}
URL resolvedCurrentBaseURL = null;
try {
resolvedCurrentBaseURL = Platform.resolve(platformURL);
} catch (IOException e) {
- UpdateCORE.warn("Error while resolving platform:/base/. Check you are running a Platform", e);
+ UpdateCore.warn("Error while resolving platform:/base/. Check you are running a Platform", e);
return true;
}
@@ -626,21 +626,21 @@
}
if (!found) {
- UpdateCORE.warn("Unable to find an old consifured site with platform:/base/ as a platform URL");
+ UpdateCore.warn("Unable to find an old configured site with platform:/base/ as a platform URL");
return true;
}
if (cSite == null) {
- UpdateCORE.warn("The configuredSite that contains the platform is null");
+ UpdateCore.warn("The configuredSite that contains the platform is null");
return true;
}
if (UpdateManagerUtils.sameURL(resolvedCurrentBaseURL, cSite.getSite().getURL())) {
- UpdateCORE.warn("Platform URL found are the same:" + resolvedCurrentBaseURL + " : " + cSite.getSite().getURL());
+ UpdateCore.warn("Platform URL found are the same:" + resolvedCurrentBaseURL + " : " + cSite.getSite().getURL());
return false;
}
- UpdateCORE.warn("Platform URL found is different than the one previously saved. Reconcile optimistically:" + resolvedCurrentBaseURL + " : " + cSite.getSite().getURL());
+ UpdateCore.warn("Platform URL found is different than the one previously saved. Reconcile optimistically:" + resolvedCurrentBaseURL + " : " + cSite.getSite().getURL());
return true;
}
@@ -662,8 +662,8 @@
// determine "proposed" list of configured features
ConfiguredSite cSite = (ConfiguredSite) configuredSite;
// debug
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Validate configuration of site " + cSite.getSite().getURL());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Validate configuration of site " + cSite.getSite().getURL());
}
IFeatureReference[] configuredRefs = cSite.getConfiguredFeatures();
ArrayList allPossibleConfiguredFeatures = new ArrayList();
@@ -672,11 +672,11 @@
IFeature feature = configuredRefs[i].getFeature();
allPossibleConfiguredFeatures.add(feature);
// debug
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug(" configured feature " + feature.getVersionedIdentifier().toString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug(" configured feature " + feature.getVersionedIdentifier().toString());
}
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
@@ -697,11 +697,11 @@
try {
cPolicy.unconfigure(ref, true, false);
// debug
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Unconfiguring \"extra\" feature " + feature.getVersionedIdentifier().toString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Unconfiguring \"extra\" feature " + feature.getVersionedIdentifier().toString());
}
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
}
}
@@ -722,7 +722,7 @@
try {
children = list[i].getIncludedFeatureReferences();
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
}
if (children != null) {
@@ -737,7 +737,7 @@
} catch (CoreException e) {
// if optional, it may not exist, do not throw error for that
if (!children[j].isOptional()) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
}
}
@@ -745,10 +745,10 @@
}
// debug
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Computed top-level features");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Computed top-level features");
for (int i = 0; i < result.size(); i++) {
- UpdateCORE.debug(" " + ((IFeature) result.get(i)).getVersionedIdentifier().toString());
+ UpdateCore.debug(" " + ((IFeature) result.get(i)).getVersionedIdentifier().toString());
}
}
@@ -765,8 +765,8 @@
if (rightVid.getVersion().isGreaterOrEqualTo(leftVid.getVersion())) {
result.remove(left);
// debug
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Removing \"duplicate\" " + left.getVersionedIdentifier().toString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Removing \"duplicate\" " + left.getVersionedIdentifier().toString());
}
break;
}
@@ -801,8 +801,8 @@
if (!features.contains(feature)) {
features.add(feature);
// debug
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug("Retaining configured feature " + feature.getVersionedIdentifier().toString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug("Retaining configured feature " + feature.getVersionedIdentifier().toString());
}
}
@@ -811,7 +811,7 @@
try {
children = feature.getIncludedFeatureReferences();
} catch(CoreException e){
- UpdateCORE.warn("",e);
+ UpdateCore.warn("",e);
return;
}
@@ -821,7 +821,7 @@
child = children[j].getFeature();
} catch (CoreException e) {
if (!UpdateManagerUtils.isOptional(children[j]))
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
// 25202 do not return right now, the peer children may be ok
}
if (child != null)
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
index a94d022..a7185a0 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteStatusAnalyzer.java
@@ -73,7 +73,7 @@
feature1 = featureRef1.getFeature();
feature2 = featureRef2.getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
return 0;
}
@@ -117,8 +117,8 @@
// validate site
ISite featureSite = feature.getSite();
if (featureSite == null) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.debug("Cannot determine status of feature:" + feature.getLabel() + ". Site is NULL.");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.debug("Cannot determine status of feature:" + feature.getLabel() + ". Site is NULL.");
String msg = Policy.bind("SiteLocal.UnableToDetermineFeatureStatusSiteNull", new Object[] { feature.getURL()});
return createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null);
}
@@ -126,8 +126,8 @@
// validate configured site
ConfiguredSite cSite = (ConfiguredSite) featureSite.getCurrentConfiguredSite();
if (cSite == null) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.warn("Cannot determine status of feature: " + feature.getLabel() + ". Configured Site is NULL.");
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.warn("Cannot determine status of feature: " + feature.getLabel() + ". Configured Site is NULL.");
String msg = Policy.bind("SiteLocal.UnableToDetermineFeatureStatusConfiguredSiteNull", new Object[] { feature.getURL()});
return createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null);
}
@@ -138,15 +138,15 @@
if (!cSite.getConfigurationPolicy().isConfigured(ref))
return createStatus(IStatus.OK, IFeature.STATUS_DISABLED, "", null);
} else {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.warn("Unable to find reference for feature " + feature + " in site " + cSite.getSite().getURL());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.warn("Unable to find reference for feature " + feature + " in site " + cSite.getSite().getURL());
}
// check if broken
IStatus status = cSite.getBrokenStatus(feature);
if (status.getSeverity() != IStatus.OK) {
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION)
- UpdateCORE.debug("Feature broken:" + feature.getLabel() + ".Site:" + cSite.toString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION)
+ UpdateCore.debug("Feature broken:" + feature.getLabel() + ".Site:" + cSite.toString());
return status;
}
@@ -194,11 +194,11 @@
childFeature = children[i].getFeature();
} catch (CoreException e) {
if (!UpdateManagerUtils.isOptional(children[i]))
- UpdateCORE.warn("Error retrieving feature:" + children[i]);
+ UpdateCore.warn("Error retrieving feature:" + children[i]);
}
if (childFeature == null) {
- UpdateCORE.warn("getFeatureStatus: Feature is null for:" + children[i]);
+ UpdateCore.warn("getFeatureStatus: Feature is null for:" + children[i]);
// Unable to find children feature, broken
Object featureAsPrintableObject = children[i].getURL();
featureAsPrintableObject = children[i].getVersionedIdentifier();
@@ -298,7 +298,7 @@
msg = Policy.bind("SiteLocal.TwoVersionSamePlugin2", values);
}
- UpdateCORE.warn("Found another version of the same plugin on the path:" + compareID.toString());
+ UpdateCore.warn("Found another version of the same plugin on the path:" + compareID.toString());
tempmulti.add(createStatus(IStatus.ERROR, IFeature.STATUS_AMBIGUOUS, msg, null));
}
}
@@ -333,7 +333,7 @@
* creates a Status
*/
private IStatus createStatus(int statusSeverity, int statusCode, String msg, Exception e) {
- String id = UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ String id = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
StringBuffer completeString = new StringBuffer("");
if (msg != null)
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
index a1b85d7..3098126 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteTypeFactory.java
@@ -59,7 +59,7 @@
private ISiteFactory createFactoryFor(String type) throws CoreException {
ISiteFactory result = null;
- String pluginID = UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ String pluginID = UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
IConfigurationElement[] elements = pluginRegistry.getConfigurationElementsFor(pluginID,SIMPLE_EXTENSION_ID,type);
if (elements==null || elements.length==0){
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
index 1919c0b..8b4fa9b 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLContentProvider.java
Binary files differ
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
index eaf3091..5f0d590 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteURLFactory.java
@@ -41,7 +41,7 @@
SiteURLContentProvider contentProvider = new SiteURLContentProvider(url);
URL resolvedURL = URLEncoder.encode(url);
- Response response = UpdateCORE.getPlugin().get(resolvedURL);
+ Response response = UpdateCore.getPlugin().get(resolvedURL);
UpdateManagerUtils.checkConnectionResult(response, resolvedURL);
siteStream = response.getInputStream();
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCORE.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java
similarity index 96%
rename from update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCORE.java
rename to update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java
index 9639788..458cc47 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCORE.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateCore.java
@@ -22,7 +22,7 @@
/**
* The main plugin class to be used in the desktop.
*/
-public class UpdateCORE extends Plugin {
+public class UpdateCore extends Plugin {
// debug options
public static boolean DEBUG = false;
@@ -36,7 +36,7 @@
public static boolean DEBUG_SHOW_RECONCILER = false;
//The shared instance.
- private static UpdateCORE plugin;
+ private static UpdateCore plugin;
//log
private static UpdateManagerLogWriter log;
@@ -51,7 +51,7 @@
/**
* The constructor.
*/
- public UpdateCORE(IPluginDescriptor descriptor) {
+ public UpdateCore(IPluginDescriptor descriptor) {
super(descriptor);
plugin = this;
}
@@ -59,7 +59,7 @@
/**
* Returns the shared instance.
*/
- public static UpdateCORE getPlugin() {
+ public static UpdateCore getPlugin() {
return plugin;
}
@@ -176,7 +176,7 @@
* Logs a status
*/
public static void log(IStatus status){
- UpdateCORE.getPlugin().getLog().log(status);
+ UpdateCore.getPlugin().getLog().log(status);
}
/**
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
index d1f4092..ee6a72f 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerLogWriter.java
@@ -55,7 +55,7 @@
*/
public UpdateManagerLogWriter(File file) {
this.logFile = file;
- UpdateCORE.warn("UPDATE MANAGER LOG Location: "+file.getAbsolutePath());
+ UpdateCore.warn("UPDATE MANAGER LOG Location: "+file.getAbsolutePath());
}
/*
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
index c9c5a31..ca8c176 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerReconciler.java
@@ -55,7 +55,7 @@
public Object run(Object args) throws Exception {
// get debug setting and process command line arguments
- DEBUG = UpdateCORE.DEBUG_SHOW_RECONCILER;
+ DEBUG = UpdateCore.DEBUG_SHOW_RECONCILER;
processCommandLine((String[])args);
// obtain current platform configuration and save stamps
@@ -137,9 +137,9 @@
if (DEBUG)
debug(changes ? "changes detected" :"no changes detected"); //$NON-NLS-1$ //$NON-NLS-2$
} catch (CoreException e){
- UpdateCORE.warn(null,e);
+ UpdateCore.warn(null,e);
} catch (Exception e) {
- UpdateCORE.warn(null,e);
+ UpdateCore.warn(null,e);
}
cfg.refresh(); // recompute stamps and plugin path
@@ -266,6 +266,6 @@
}
private void debug(String s) {
- UpdateCORE.debug(this.getClass().getName()+": "+s); //$NON-NLS-1$
+ UpdateCore.debug(this.getClass().getName()+": "+s); //$NON-NLS-1$
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
index 06a1d96..5e26d41 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/core/UpdateManagerUtils.java
@@ -118,13 +118,13 @@
}
if (relativePath == null) {
- UpdateCORE.warn("Cannot calculate relative path");
+ UpdateCore.warn("Cannot calculate relative path");
return url.toString();
} else {
String relativeRootString = relativePath.getParentFile().getAbsolutePath();
String fullString = urlFile.getAbsolutePath();
if (!fullString.startsWith(relativeRootString)) {
- UpdateCORE.warn("Full path:" + fullString + " does not start with " + relativeRootString);
+ UpdateCore.warn("Full path:" + fullString + " does not start with " + relativeRootString);
return url.toString();
} else {
String returnString = fullString.substring(relativeRootString.length() + 1);
@@ -152,7 +152,7 @@
public static String getResourceString(String infoURL, ResourceBundle bundle) {
String result = null;
if (infoURL != null) {
- result = UpdateCORE.getPlugin().getDescriptor().getResourceString(infoURL, bundle);
+ result = UpdateCore.getPlugin().getDescriptor().getResourceString(infoURL, bundle);
}
return result;
};
@@ -195,7 +195,7 @@
public static void checkPermissions(ContentReference ref, String filePath) {
if (ref.getPermission() != 0) {
- UpdateCORE.warn("Change permission for " + filePath + " to " + ref.getPermission());
+ UpdateCore.warn("Change permission for " + filePath + " to " + ref.getPermission());
// FIXME: change the code to use JNI
}
@@ -267,7 +267,7 @@
if (!file.delete()) {
String msg = Policy.bind("UpdateManagerUtils.UnableToRemoveFile", file.getAbsolutePath());
//$NON-NLS-1$ //$NON-NLS-2$
- UpdateCORE.log(msg, new Exception());
+ UpdateCore.log(msg, new Exception());
}
}
@@ -288,7 +288,7 @@
if (!file.delete()) {
String msg = Policy.bind("UpdateManagerUtils.UnableToRemoveFile", file.getAbsolutePath());
//$NON-NLS-1$ //$NON-NLS-2$
- UpdateCORE.log(msg, new Exception());
+ UpdateCore.log(msg, new Exception());
}
}
@@ -440,14 +440,14 @@
try {
compareFeature = children[j].getFeature();
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
};
if (childFeature.equals(compareFeature)) {
if (onlyOptional) {
if (UpdateManagerUtils.isOptional(children[j])) {
parentList.add(possiblesParent[i]);
} else {
- UpdateCORE.warn("Feature :" + children[j] + " not optional. Not included in parents list.");
+ UpdateCore.warn("Feature :" + children[j] + " not optional. Not included in parents list.");
}
} else {
parentList.add(possiblesParent[i]);
@@ -456,7 +456,7 @@
}
}
} catch (CoreException e) {
- UpdateCORE.warn("", e);
+ UpdateCore.warn("", e);
};
}
@@ -484,7 +484,7 @@
try {
childFeature = child.getFeature();
} catch (CoreException e) {
- UpdateCORE.warn(null, e);
+ UpdateCore.warn(null, e);
}
if (childFeature == null)
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
index be042d1..5c4b227 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfigurationPolicyModel.java
@@ -9,7 +9,7 @@
import org.eclipse.update.core.IFeatureReference;
import org.eclipse.update.core.model.FeatureReferenceModel;
import org.eclipse.update.core.model.ModelObject;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
import org.eclipse.update.internal.core.UpdateManagerUtils;
/**
@@ -128,7 +128,7 @@
if (!found) {
list.put(feature,null);
} else {
- UpdateCORE.warn("Feature Reference :"+feature+" already part of the list.");
+ UpdateCore.warn("Feature Reference :"+feature+" already part of the list.");
}
}
@@ -143,8 +143,8 @@
this.configuredFeatureReferences = new HashMap();
if (!configuredFeatureReferences.containsKey(feature)){
//DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION){
- UpdateCORE.debug("Configuring "+feature.getURLString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION){
+ UpdateCore.debug("Configuring "+feature.getURLString());
}
this.add(feature, configuredFeatureReferences);
}
@@ -155,7 +155,7 @@
if (unconfiguredFeatureReferences != null) {
boolean success = remove(feature, unconfiguredFeatureReferences);
if (!success)
- UpdateCORE.warn("Feature not part of Unconfigured list: "+feature.getURLString());
+ UpdateCore.warn("Feature not part of Unconfigured list: "+feature.getURLString());
}
}
@@ -169,8 +169,8 @@
if (unconfiguredFeatureReferences == null)
this.unconfiguredFeatureReferences = new HashMap();
if (!unconfiguredFeatureReferences.containsKey(feature)){
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_CONFIGURATION){
- UpdateCORE.debug("Unconfiguring "+feature.getURLString());
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_CONFIGURATION){
+ UpdateCore.debug("Unconfiguring "+feature.getURLString());
}
this.add(feature, unconfiguredFeatureReferences);
}
@@ -180,7 +180,7 @@
if (configuredFeatureReferences != null) {
boolean success = remove(feature, configuredFeatureReferences);
if (!success)
- UpdateCORE.warn("Feature not part of Configured list: "+feature.getURLString());
+ UpdateCore.warn("Feature not part of Configured list: "+feature.getURLString());
}
}
@@ -192,13 +192,13 @@
if (unconfiguredFeatureReferences!=null){
boolean success = remove(feature, unconfiguredFeatureReferences);
if (!success)
- UpdateCORE.warn(feature.getURLString()+" not part of unconfigured list.");
+ UpdateCore.warn(feature.getURLString()+" not part of unconfigured list.");
}
if (configuredFeatureReferences != null) {
boolean success = remove(feature, configuredFeatureReferences);
if (!success)
- UpdateCORE.warn(feature.getURLString()+" not part of configured list.");
+ UpdateCore.warn(feature.getURLString()+" not part of configured list.");
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
index 496ffc8..4aaa21c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/ConfiguredSiteModel.java
@@ -7,7 +7,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.update.core.model.ModelObject;
import org.eclipse.update.core.model.SiteModel;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
*
@@ -146,7 +146,7 @@
*/
protected IStatus createStatus(int statusSeverity, int statusCode, String msg, Exception e){
String id =
- UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier();
+ UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier();
StringBuffer completeString = new StringBuffer("");
if (msg!=null)
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
index 88d12bc..ff972c9 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallChangeParser.java
@@ -47,9 +47,9 @@
this.file = file;
// DEBUG:
- if (UpdateCORE.DEBUG
- && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug(
+ if (UpdateCore.DEBUG
+ && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug(
"Start parsing Install Change:");
//$NON-NLS-1$
}
@@ -79,9 +79,9 @@
throws SAXException {
// DEBUG:
- if (UpdateCORE.DEBUG
- && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug(
+ if (UpdateCore.DEBUG
+ && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug(
"Start Element: uri:"
+ uri
+ " local Name:"
@@ -151,9 +151,9 @@
change.addReference(ref);
// DEBUG:
- if (UpdateCORE.DEBUG
- && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug(
+ if (UpdateCore.DEBUG
+ && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug(
"End Processing Feature Reference: url:"
+ featureURL.toExternalForm());
//$NON-NLS-1$
@@ -163,7 +163,7 @@
Policy.bind(
"InstallConfigurationParser.FeatureReferenceNoURL");
//$NON-NLS-1$
- UpdateCORE.log(msg,new Exception());
+ UpdateCore.log(msg,new Exception());
}
}
@@ -173,9 +173,9 @@
private void processNewFeature(Attributes attributes) {
// DEBUG:
- if (UpdateCORE.DEBUG
- && UpdateCORE.DEBUG_SHOW_RECONCILER) {
- UpdateCORE.debug(
+ if (UpdateCore.DEBUG
+ && UpdateCore.DEBUG_SHOW_RECONCILER) {
+ UpdateCore.debug(
"End Processing New Features:");
//$NON-NLS-1$
}
@@ -193,9 +193,9 @@
change.setCreationDate(new Date(date));
// DEBUG:
- if (UpdateCORE.DEBUG
- && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug(
+ if (UpdateCore.DEBUG
+ && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug(
"End Processing Change: date:" + date);
//$NON-NLS-1$
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
index 29d81e1..a3da0cf 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationModel.java
@@ -237,10 +237,10 @@
try {
try {
URL resolvedURL = URLEncoder.encode(getURL());
- InputStream in = UpdateCORE.getPlugin().get(resolvedURL).getInputStream();
+ InputStream in = UpdateCore.getPlugin().get(resolvedURL).getInputStream();
new InstallConfigurationParser(in, this);
} catch (FileNotFoundException exception) {
- UpdateCORE.warn(locationURLString + " does not exist, The local site is not in synch with the file system and is pointing to a file that doesn't exist.", exception); //$NON-NLS-1$
+ UpdateCore.warn(locationURLString + " does not exist, The local site is not in synch with the file system and is pointing to a file that doesn't exist.", exception); //$NON-NLS-1$
throw Utilities.newCoreException(Policy.bind("InstallConfiguration.ErrorDuringFileAccess", locationURLString), exception); //$NON-NLS-1$
} catch (SAXException exception) {
throw Utilities.newCoreException(Policy.bind("InstallConfiguration.ParsingErrorDuringCreation", locationURLString, "\r\n" + exception.toString()), exception); //$NON-NLS-1$ //$NON-NLS-2$
@@ -249,7 +249,7 @@
}
} catch (CoreException e) {
- UpdateCORE.warn("Error processing configuration history:" + locationURL.toExternalForm(), e);
+ UpdateCore.warn("Error processing configuration history:" + locationURL.toExternalForm(), e);
} finally {
initialized = true;
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
index d34b227..6105246 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/InstallConfigurationParser.java
@@ -56,8 +56,8 @@
this.config = (InstallConfigurationModel) config;
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("Start parsing Configuration:" + (config).getURL().toExternalForm()); //$NON-NLS-1$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("Start parsing Configuration:" + (config).getURL().toExternalForm()); //$NON-NLS-1$
}
bundle = getResourceBundle();
@@ -80,9 +80,9 @@
Locale.getDefault(),
l);
} catch (MissingResourceException e) {
- UpdateCORE.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
} catch (MalformedURLException e) {
- UpdateCORE.warn(e.getLocalizedMessage()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage()); //$NON-NLS-1$
}
return bundle;
}
@@ -98,8 +98,8 @@
throws SAXException {
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
try {
@@ -170,7 +170,7 @@
if (entry!=null){
configSite.setUpdatable(entry.isUpdateable());
} else {
- UpdateCORE.warn("Unable to retrieve site:" +platformURLString+" from platform.");
+ UpdateCore.warn("Unable to retrieve site:" +platformURLString+" from platform.");
}
String updatable = configSite.isUpdatable()?"true":"false";
@@ -178,8 +178,8 @@
config.addConfigurationSiteModel(configSite);
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("End process config site url:" + urlString + " policy:" + policyString + " updatable:"+updatable ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("End process config site url:" + urlString + " policy:" + policyString + " updatable:"+updatable ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
@@ -217,12 +217,12 @@
entry.resolve(siteURL,null);
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("End Processing DefaultFeature Tag: url:" + url.toExternalForm()); //$NON-NLS-1$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("End Processing DefaultFeature Tag: url:" + url.toExternalForm()); //$NON-NLS-1$
}
} else {
- UpdateCORE.log( Policy.bind("InstallConfigurationParser.FeatureReferenceNoURL"), new Exception());
+ UpdateCore.log( Policy.bind("InstallConfigurationParser.FeatureReferenceNoURL"), new Exception());
}
}
@@ -259,8 +259,8 @@
config.addActivityModel(activity);
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("End Processing Activity: action:" + actionString + " label: " + label + " date:" + dateString + " status" + statusString); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("End Processing Activity: action:" + actionString + " label: " + label + " date:" + dateString + " status" + statusString); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
}
@@ -283,8 +283,8 @@
config.setTimeline(timeline);
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("End Processing Config Tag: date:" + date+" timeline:"+ timeline); //$NON-NLS-1$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("End Processing Config Tag: date:" + date+" timeline:"+ timeline); //$NON-NLS-1$
}
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
index 72e4ad3..5fdfb26 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/model/SiteLocalParser.java
@@ -33,9 +33,9 @@
ClassLoader l = new URLClassLoader(new URL[] { url }, null);
bundle = ResourceBundle.getBundle(SiteLocalModel.SITE_LOCAL_FILE, Locale.getDefault(), l);
} catch (MissingResourceException e) {
- UpdateCORE.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
} catch (MalformedURLException e) {
- UpdateCORE.warn(e.getLocalizedMessage()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage()); //$NON-NLS-1$
}
return bundle;
}
@@ -66,8 +66,8 @@
this.site = (SiteLocalModel) site;
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("Start parsing localsite:" + ((SiteLocalModel) site).getLocationURLString()); //$NON-NLS-1$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("Start parsing localsite:" + ((SiteLocalModel) site).getLocationURLString()); //$NON-NLS-1$
}
bundle = getResourceBundle();
@@ -83,9 +83,9 @@
try {
url = UpdateManagerUtils.asDirectoryURL(site.getLocationURL());
} catch (MissingResourceException e) {
- UpdateCORE.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage() + ":" + url.toExternalForm()); //$NON-NLS-1$
} catch (MalformedURLException e) {
- UpdateCORE.warn(e.getLocalizedMessage()); //$NON-NLS-1$
+ UpdateCore.warn(e.getLocalizedMessage()); //$NON-NLS-1$
}
return url;
}
@@ -96,8 +96,8 @@
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("Start Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
try {
@@ -151,8 +151,8 @@
site.setStamp(stamp);
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("End process Site label:" + info); //$NON-NLS-1$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("End process Site label:" + info); //$NON-NLS-1$
}
}
@@ -178,8 +178,8 @@
site.addConfigurationModel(config);
}
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("End Processing Config Tag: url:" + url.toExternalForm()); //$NON-NLS-1$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("End Processing Config Tag: url:" + url.toExternalForm()); //$NON-NLS-1$
}
}
@@ -188,8 +188,8 @@
*/
public void endElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
// DEBUG:
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_PARSING) {
- UpdateCORE.debug("End Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
+ UpdateCore.debug("End Element: uri:" + uri + " local Name:" + localName + " qName:" + qName); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
String tag = localName.trim();
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
index 993fbcb..6571346 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerificationResult.java
@@ -232,7 +232,7 @@
// return new String(buf);
// }
// } catch (Exception e) {
-// UpdateCORE.warn("Error parsing X500 Certificate",e);
+// UpdateCore.warn("Error parsing X500 Certificate",e);
// }
return principal.toString();
}
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
index bc40ae2..62ee151 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/JarVerifier.java
@@ -16,7 +16,7 @@
import org.eclipse.core.runtime.*;
import org.eclipse.update.core.*;
import org.eclipse.update.internal.core.Policy;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* The JarVerifier will check the integrity of the JAR.
@@ -61,7 +61,7 @@
while (listOfKeystoreHandles.hasNext()) {
try {
handle = listOfKeystoreHandles.next();
- in = UpdateCORE.getPlugin().get(handle.getLocation()).getInputStream();;
+ in = UpdateCore.getPlugin().get(handle.getLocation()).getInputStream();;
try {
keystore = KeyStore.getInstance(handle.getType());
keystore.load(in, null); // no password
@@ -112,8 +112,8 @@
JarContentReference jarReference = (JarContentReference) contentRef;
try {
jarFile = jarReference.asFile();
- if (UpdateCORE.DEBUG && UpdateCORE.DEBUG_SHOW_INSTALL)
- UpdateCORE.debug("Attempting to read JAR file:"+jarFile);
+ if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_INSTALL)
+ UpdateCore.debug("Attempting to read JAR file:"+jarFile);
// # of entries
if (!jarFile.exists()) throw new IOException();
@@ -350,7 +350,7 @@
Exception e = new Exception(Policy.bind("JarVerifier.InvalidFile", file)); //$NON-NLS-1$
result.setResultException(e);
result.setVerificationCode(IVerificationResult.TYPE_ENTRY_NOT_SIGNED);
- UpdateCORE.warn(null,e);
+ UpdateCore.warn(null,e);
}
} catch (SecurityException e) {
// Jar file is signed
diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
index 1f9d1ba..9a3974d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/security/KeyStores.java
@@ -10,7 +10,7 @@
import java.security.Security;
import java.util.*;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* Class to manage the different KeyStores we should
* check for certificates of Signed JAR
@@ -130,7 +130,7 @@
try {
URL url = new URL(location);
- in = UpdateCORE.getPlugin().get(url).getInputStream();;
+ in = UpdateCore.getPlugin().get(url).getInputStream();;
Reader reader = new InputStreamReader(in);
int result = reader.read(buff);
StringBuffer contentBuff = new StringBuffer();
@@ -201,6 +201,6 @@
}
private void log(Exception e){
- UpdateCORE.warn("Cannot retrieve a KeyStore",e);
+ UpdateCore.warn("Cannot retrieve a KeyStore",e);
}
}
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/data/parsertests/feature3.xml b/update/org.eclipse.update.tests.core/data/parsertests/feature3.xml
new file mode 100644
index 0000000..ca660be
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/parsertests/feature3.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.platform"
+ version="2.1.0"
+ label="Eclipse Platform"
+ provider-name="www.eclipse.org"
+ image="splash/splash_full.bmp"
+ >
+
+ <description>
+ Eclipse platform feature.
+ </description>
+
+ <copyright url="$os$/$ws$/notice.html"/>
+ x
+
+ <license url="about.html">
+ x
+ </license>
+
+ <url>
+ <update url="file:/D:/" label="Eclipse Update Site"/>
+ </url>
+
+</feature>
\ No newline at end of file
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
index bc6e55f..475dbb0 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/UpdateTestsPlugin.java
@@ -5,7 +5,7 @@
*/
import org.eclipse.core.runtime.*;
import org.eclipse.help.internal.appserver.WebappManager;
-import org.eclipse.update.internal.core.UpdateCORE;
+import org.eclipse.update.internal.core.UpdateCore;
/**
* manages the startuo and shutown of the
@@ -73,7 +73,7 @@
} catch (CoreException e) {
text = "The webServer didn't start ";
IStatus status = new Status(IStatus.ERROR, "org.eclipse.update.tests.core", IStatus.OK, "WebServer not started. Update Tests results are invalid", null);
- UpdateCORE.warn("",new CoreException(status));
+ UpdateCore.warn("",new CoreException(status));
}finally {
System.out.println(text);
initialized = true;
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
index 7b59880..7a4028a 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/parser/TestFeatureParse.java
Binary files differ
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
index 21c6bdc..caf9c22 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstall.java
@@ -304,7 +304,7 @@
*/
public String getDefaultInstallableFeatureType() {
String pluginID =
- UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier() + ".";
+ UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier() + ".";
return pluginID + PACKAGED_FEATURE_TYPE;
}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
index 32e335b..a14bd6f 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/regularInstall/TestInstallURLSIteXML.java
@@ -317,7 +317,7 @@
*/
public String getDefaultInstallableFeatureType() {
String pluginID =
- UpdateCORE.getPlugin().getDescriptor().getUniqueIdentifier() + ".";
+ UpdateCore.getPlugin().getDescriptor().getUniqueIdentifier() + ".";
return pluginID + PACKAGED_FEATURE_TYPE;
}
diff --git a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
index 42077ca..57bbecf 100644
--- a/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
+++ b/update/org.eclipse.update.tests.core/src/org/eclipse/update/tests/types/TestFeatureType.java
Binary files differ
