Google Git
Sign in
eclipse/platform/eclipse.platform/refs/heads/v20031021_update_refactoring^!/.
commit
6fb417169575cb3769137f099a31af0bd9fdce32
[log]
author
Dorian Birsan <dbirsan>
Mon Nov 17 18:09:10 2003 +0000
committer
Dorian Birsan <dbirsan>
Mon Nov 17 18:09:10 2003 +0000
tree
40742cbad1ccadae85883901169a6cc0e04a3bf5
parent
b0b6a81da7c3f79fb63af7164a8180386e04dd73 [diff]
*** empty log message ***

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/ConfigurationActivity.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/ConfigurationActivity.java
index fdfee47..80ce23d 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/ConfigurationActivity.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/ConfigurationActivity.java

@@ -23,7 +23,7 @@
 	private int action;
 	private Date date;
 	private int status;
-	private InstallConfigurationModel installConfiguration;
+	private InstallConfiguration installConfiguration;
 	
 
 	/**
@@ -118,7 +118,7 @@
 	 * Sets the installConfiguration.
 	 * @param installConfiguration The installConfiguration to set
 	 */
-	public void setInstallConfigurationModel(InstallConfigurationModel installConfiguration) {
+	public void setInstallConfiguration(InstallConfiguration installConfiguration) {
 		assertIsWriteable();		
 		this.installConfiguration = installConfiguration;
 	}
@@ -156,7 +156,7 @@
 	 * @see IActivity#getInstallConfiguration()
 	 */
 	public IInstallConfiguration getInstallConfiguration() {
-		return (IInstallConfiguration) getInstallConfigurationModel();
+		return installConfiguration;
 	}
 }
 

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfiguration.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfiguration.java
index 981244f..77d476c 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfiguration.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfiguration.java

@@ -28,7 +28,8 @@
  *
  */
 
-public class InstallConfiguration extends InstallConfigurationModel implements IInstallConfiguration, IWritable {
+public class InstallConfiguration extends ModelObject
+implements IInstallConfiguration, IWritable {
 
 	private ListenersList listeners = new ListenersList();
 
@@ -52,7 +53,7 @@
 			if (csites != null) {
 				for (int i = 0; i < csites.length; i++) {
 					ConfiguredSite configSite = new ConfiguredSite(csites[i]);
-					addConfigurationSiteModel(configSite);
+					addConfigurationSite(configSite);
 				}
 			}
 		}
@@ -92,7 +93,14 @@
 	 */
 	public IConfiguredSite createConfiguredSite(File file) throws CoreException {
 
-		ISite site = InternalSiteManager.createSite(file);
+		IInstalledSite site = null;
+		try {
+			site = SiteManager.getInstalledSite(file.toURL(),null);
+		} catch (MalformedURLException e) {
+			Utilities.newCoreException("Cannot create configured site", IStatus.ERROR, e);
+		} catch (CoreException e) {
+			throw e;
+		}
 
 		//create a config site around the site
 		// even if the site == null
@@ -129,8 +137,15 @@
 	 */
 	public IConfiguredSite createLinkedConfiguredSite(File file) throws CoreException {
 
-		ISite site = InternalSiteManager.createSite(file);
-
+		IInstalledSite site = null;
+		try {
+			site = SiteManager.getInstalledSite(file.toURL(),null);
+		} catch (MalformedURLException e) {
+			Utilities.newCoreException("Cannot create linked site", IStatus.ERROR, e);
+		} catch (CoreException e) {
+			throw e;
+		}
+		
 		//create a config site around the site
 		// even if the site == null
 		BaseSiteLocalFactory factory = new BaseSiteLocalFactory();
@@ -175,7 +190,7 @@
 	 */
 	private void configure(ConfiguredSite linkedSite) throws CoreException {
 		ISite site = linkedSite.getSite();
-		ISiteFeatureReference[] newFeaturesRef = site.getFeatureReferences();
+		IFeatureReference[] newFeaturesRef = site.getFeatureReferences();
 
 		for (int i = 0; i < newFeaturesRef.length; i++) {
 			// TRACE
@@ -200,7 +215,7 @@
 		activity.setLabel(site.getSite().getURL().toExternalForm());
 		activity.setDate(new Date());
 		ConfiguredSite configSiteModel = (ConfiguredSite) site;
-		addConfigurationSiteModel(configSiteModel);
+		addConfigurationSite(configSiteModel);
 		configSiteModel.setInstallConfigurationModel(this);
 
 		// notify listeners
@@ -220,7 +235,7 @@
 	 * @param activity
 	 */
 	public void addActivity(IActivity activity) {
-		addActivityModel((ConfigurationActivity)activity);
+		addActivity((ConfigurationActivity)activity);
 	}
 
 	/*
@@ -230,7 +245,7 @@
 		if (!isCurrent() && isReadOnly())
 			return;
 
-		if (removeConfigurationSiteModel((ConfiguredSite) site)) {
+		if (removeConfigurationSite((ConfiguredSite) site)) {
 			// notify listeners
 			Object[] configurationListeners = listeners.getListeners();
 			for (int i = 0; i < configurationListeners.length; i++) {
@@ -427,7 +442,7 @@
 
 		// get the URL of the plugin that corresponds to the feature (pluginid = featureid)
 		String id = feature.getVersionedIdentifier().getIdentifier();
-		IPluginEntry[] entries = feature.getPluginEntries();
+		IPluginEntry[] entries = feature.getPluginEntries(false);
 		URL url = null;
 		IPluginEntry featurePlugin = null;
 		for (int k = 0; k < entries.length; k++) {
@@ -609,7 +624,7 @@
 				} else {
 					// the site didn't exist in the InstallConfiguration we are reverting to
 					// unconfigure everything from this site so it is still present
-					ISiteFeatureReference[] featuresToUnconfigure = nowConfigSites[i].getSite().getFeatureReferences();
+					IFeatureReference[] featuresToUnconfigure = nowConfigSites[i].getSite().getFeatureReferences();
 					for (int j = 0; j < featuresToUnconfigure.length; j++) {
 						IFeature featureToUnconfigure = null;
 						try {
@@ -631,7 +646,7 @@
 			if (sites != null && !sites.isEmpty()) {
 				ConfiguredSite[] sitesModel = new ConfiguredSite[sites.size()];
 				sites.toArray(sitesModel);
-				setConfigurationSiteModel(sitesModel);
+				setConfigurationSite(sitesModel);
 			}
 		}
 	}
@@ -652,7 +667,7 @@
 	private IPluginEntry[] getPlatformPlugins(IFeature feature, IPlatformConfiguration runtimeConfiguration) {
 		Map featurePlatformPlugins = new HashMap();
 		String[] platformPluginID = runtimeConfiguration.getBootstrapPluginIdentifiers();
-		IPluginEntry[] featurePlugins = feature.getPluginEntries();
+		IPluginEntry[] featurePlugins = feature.getPluginEntries(false);
 
 		for (int i = 0; i < platformPluginID.length; i++) {
 			String featurePluginId = null;

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfigurationModel.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfigurationModel.java
index 44cdf1d..b6d9bf4 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfigurationModel.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfigurationModel.java

@@ -68,7 +68,7 @@
 	 * in this case we do not want to create a new activity, so we do not want t call
 	 * addConfigurationSite()
 	 */
-	public void addConfigurationSiteModel(ConfiguredSite site) {
+	public void addConfigurationSite(ConfiguredSite site) {
 		if (configurationSites == null) {
 			configurationSites = new ArrayList();
 		}
@@ -77,17 +77,17 @@
 		}
 	}
 
-	public void setConfigurationSiteModel(ConfiguredSite[] sites) {
+	public void setConfigurationSite(ConfiguredSite[] sites) {
 		configurationSites = null;
 		for (int i = 0; i < sites.length; i++) {
-			addConfigurationSiteModel(sites[i]);
+			addConfigurationSite(sites[i]);
 		}
 	}
 
 	/**
 	 * @since 2.0
 	 */
-	public boolean removeConfigurationSiteModel(ConfiguredSite site) {
+	public boolean removeConfigurationSite(ConfiguredSite site) {
 		if (!initialized) initialize();
 
 		if (configurationSites != null) {
@@ -132,7 +132,7 @@
 			activities = new ArrayList();
 		if (!activities.contains(activity)) {
 			activities.add(activity);
-			activity.setInstallConfigurationModel(this);
+			activity.setInstallConfiguration(this);
 		}
 	}
 	/**

diff --git a/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfigurationParser.java b/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfigurationParser.java
index 06a710c..1cd70fb 100644
--- a/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfigurationParser.java
+++ b/update/org.eclipse.update.core/src/org/eclipse/update/internal/configuration/InstallConfigurationParser.java

@@ -158,7 +158,7 @@
 	 	String updatable = configSite.isUpdatable()?"true":"false";
 
 		// add to install configuration
-		config.addConfigurationSiteModel(configSite);
+		config.addConfigurationSite(configSite);
 
 		// DEBUG:		
 		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {
@@ -233,7 +233,7 @@
 		int status = Integer.parseInt(statusString);
 		activity.setStatus(status);
 
-		config.addActivityModel(activity);
+		config.addActivity(activity);
 
 		// DEBUG:		
 		if (UpdateCore.DEBUG && UpdateCore.DEBUG_SHOW_PARSING) {

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 bd524c9..5f9b613 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

@@ -175,7 +175,7 @@
 		activity.setAction(IActivity.ACTION_RECONCILIATION);
 		activity.setDate(new Date());
 		activity.setLabel(siteLocal.getLocationURLString());
-		((InstallConfiguration) newInstallConfiguration).addActivityModel(activity);
+		((InstallConfiguration) newInstallConfiguration).addActivity(activity);
 
 		// [22993] set the timeline to the previous InstallConfiguration
 		// if the reconciliation is not optimistic (if the world hasn't changed)

diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/META-INF/MANIFEST.MF b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3b2b3dc
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0

+Created-By: 1.3.0 (IBM Corporation)

+


diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/copyright.html b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/copyright.html
new file mode 100644
index 0000000..2dae1d4
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/copyright.html

@@ -0,0 +1,8 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+</head>
+  <body>
+<h3>Image du Copyright by the *Blue* company</h3>
+</body>
+</html>

diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/docs/desc.html b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/docs/desc.html
new file mode 100644
index 0000000..d5834f5
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/docs/desc.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+</head>
+ <body>
+ 
+<h1><b>Default Description Of the Feature</b></h1>
+<big><big><big><b><br>
+WARNING:<br>
+THIS IS THE NON EN_US VERSION OF THE HTML</b></big></big></big><br>
+<br>
+<br>
+<br>
+<br>
+ <br>
+Once upon a time there were three little pigs and the time came for them
+to leave home and seek their fortunes.<br>
+<br>
+Before they left, their mother told them " Whatever you do , do it the best
+that you can because that's the way to get along in the world.<br>
+<br>
+The first little pig built his house out of straw because it was the easiest
+thing to do.<br>
+<br>
+The second little pig built his house out of sticks. This was a little bit
+stronger than a straw house.<br>
+<br>
+The third little pig built his house out of bricks.<br>
+<br>
+One night the big bad wolf, who dearly loved to eat fat little piggies, came
+along and saw the first little pig in his house of straw. He said "Let me
+in, Let me in, little pig or I'll huff and I'll puff and I'll blow your house
+in!"<br>
+<br>
+"Not by the hair of my chinny chin chin", said the little pig.<br>
+<br>
+But of course the wolf did blow the house in and ate the first little pig.<br>
+<br>
+ 
+</body>
+</html>

diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/docs/desc_us.html b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/docs/desc_us.html
new file mode 100644
index 0000000..1673a4c
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/docs/desc_us.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+</head>
+ <body>
+ 
+<h1><b>English Description Of the Feature</b></h1>
+ <br>
+Once upon a time there were three little pigs and the time came for them
+to leave home and seek their fortunes.<br>
+<br>
+Before they left, their mother told them " Whatever you do , do it the best
+that you can because that's the way to get along in the world.<br>
+<br>
+The first little pig built his house out of straw because it was the easiest
+thing to do.<br>
+<br>
+The second little pig built his house out of sticks. This was a little bit
+stronger than a straw house.<br>
+<br>
+The third little pig built his house out of bricks.<br>
+<br>
+One night the big bad wolf, who dearly loved to eat fat little piggies, came
+along and saw the first little pig in his house of straw. He said "Let me
+in, Let me in, little pig or I'll huff and I'll puff and I'll blow your house
+in!"<br>
+<br>
+"Not by the hair of my chinny chin chin", said the little pig.<br>
+<br>
+But of course the wolf did blow the house in and ate the first little pig.<br>
+<br>
+ 
+</body>
+</html>

diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.jpg b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.jpg
new file mode 100644
index 0000000..b3dd211
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.jpg
Binary files differ

diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.properties b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.properties
new file mode 100644
index 0000000..b1c1b1f
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.properties

@@ -0,0 +1 @@
+desc=docs/desc.html
\ No newline at end of file

diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.xml b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.xml
new file mode 100644
index 0000000..dc5e2df
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature id="org.eclipse.help.feature" image="feature.jpg" label="Help System Feature" nl="en,fr,de" os="OS_WIN32,OS_LINUX" provider-name="Object Technology International" version="1.0.4" ws="WIN32,MOTIF,GTK">
+  <description url="%desc">This feature will help you. It will show you the way</description>
+  <copyright url="copyright.html">(c) a certain *Blue* company</copyright>
+  <license>International License Agreement for Non-Warranted Programs Part 1 - General Terms PLEASE READ THIS AGREEMENT CAREFULLY BEFORE USING THE PROGRAM. IBM WILL LICENSE THE PROGRAM TO YOU ONLY IF YOU FIRST ACCEPT THE TERMS OF THIS AGREEMENT. BY USING THE PROGRAM YOU AGREE TO THESE TERMS. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, PROMPTLY RETURN THE UNUSED PROGRAM TO THE PARTY (EITHER IBM OR ITS RESELLER) FROM WHOM YOU ACQUIRED IT TO RECEIVE A REFUND OF THE AMOUNT YOU PAID. ... The limitation of liability will not apply to any breach of IBM's obligations implied by Section 12 of the Sales of Goods Act 1979 or Section 2 of the Supply of Goods and Services Act 1982.</license>
+  <url>
+    <update label="URL to update the feature" url="http://www.eclipse.org"/>
+    <discovery label="Discovery 1" url="http://www.eclipse.org"/>
+    <discovery label="Discovery 2" url="http://www.eclipse.org"/>
+  </url>
+  <plugin download-size="1500" id="org.eclipse.help" install-size="1000" fragment="false" nl="fr,en" os="WIN32,LINUX" version="1.0" ws="WIN32,GTK,MOTIF"/>
+</feature>
\ No newline at end of file

diff --git a/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature_en_US.properties b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature_en_US.properties
new file mode 100644
index 0000000..46358d2
--- /dev/null
+++ b/update/org.eclipse.update.tests.core/data/ExecutableFeaturePackagedSite/data2/features/org.eclipse.help.feature_1.0.4/feature_en_US.properties

@@ -0,0 +1 @@
+desc=docs/desc_us.html
\ No newline at end of file