Attachment 30330 Details for Bug 114779 – Patch for Problem #2 (will not fix entire bug)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for Problem #2 (will not fix entire bug)

bug114779.txt (text/plain), 3.83 KB, created by Brian Bauman

on 2005-11-21 14:58:50 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Bauman

Created: 2005-11-21 14:58:50 EST

Size: 3.83 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/PDEState.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDEState.java,v
>retrieving revision 1.74
>diff -u -r1.74 PDEState.java
>--- src/org/eclipse/pde/internal/core/PDEState.java	17 Nov 2005 05:10:08 -0000	1.74
>+++ src/org/eclipse/pde/internal/core/PDEState.java	21 Nov 2005 19:55:29 -0000
>@@ -122,6 +122,11 @@
> 		if (DEBUG)
> 			System.out.println("Time to create state: " + (System.currentTimeMillis() - start) + " ms"); //$NON-NLS-1$ //$NON-NLS-2$
> 	}
>+	
>+	public void setPlatformProperties(Dictionary properties) {
>+		fState.setPlatformProperties(properties);
>+		createTargetModels();
>+	}
> 
> 	private void readTargetState() {
> 		fTargetTimestamp = computeTimestamp(fTargetURLs);
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/preferences/TargetEnvironmentTab.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/preferences/TargetEnvironmentTab.java,v
>retrieving revision 1.2
>diff -u -r1.2 TargetEnvironmentTab.java
>--- src/org/eclipse/pde/internal/ui/preferences/TargetEnvironmentTab.java	7 Nov 2005 05:00:22 -0000	1.2
>+++ src/org/eclipse/pde/internal/ui/preferences/TargetEnvironmentTab.java	21 Nov 2005 19:55:30 -0000
>@@ -11,6 +11,8 @@
> package org.eclipse.pde.internal.ui.preferences;
> 
> import java.lang.reflect.InvocationTargetException;
>+import java.util.Dictionary;
>+import java.util.Hashtable;
> import java.util.Locale;
> import java.util.Set;
> import java.util.StringTokenizer;
>@@ -23,8 +25,13 @@
> import org.eclipse.jdt.launching.JavaRuntime;
> import org.eclipse.jface.dialogs.Dialog;
> import org.eclipse.jface.operation.IRunnableWithProgress;
>+import org.eclipse.pde.core.IModel;
>+import org.eclipse.pde.core.IModelProviderEvent;
>+import org.eclipse.pde.internal.core.ExternalModelManager;
> import org.eclipse.pde.internal.core.IEnvironmentVariables;
>+import org.eclipse.pde.internal.core.ModelProviderEvent;
> import org.eclipse.pde.internal.core.PDECore;
>+import org.eclipse.pde.internal.core.PDEState;
> import org.eclipse.pde.internal.ui.IHelpContextIds;
> import org.eclipse.pde.internal.ui.PDEPlugin;
> import org.eclipse.pde.internal.ui.PDEUIMessages;
>@@ -217,11 +224,40 @@
> 	}
> 
> 	public boolean performOk() {
>+		if (checkChanged()) 
>+			updateState();
> 		applyTargetEnvironmentGroup();
> 		applyJREGroup();
> 		return true;
> 	}
> 	
>+	private boolean checkChanged() {
>+		String locale = fNLCombo.getText();
>+		int dash = locale.indexOf("-"); //$NON-NLS-1$
>+		if (dash != -1)
>+			locale = locale.substring(0, dash);
>+		locale = locale.trim();
>+		return !(
>+			preferences.getString(OS).equals(fOSCombo.getText()) &&
>+			preferences.getString(WS).equals(fWSCombo.getText()) &&
>+			preferences.getString(NL).equals(locale) &&
>+			preferences.getString(ARCH).equals(fArchCombo.getText()));
>+	}
>+	
>+	private void updateState() {
>+		Dictionary props = new Hashtable(6);
>+		props.put("osgi.os", fOSCombo.getText()); //$NON-NLS-1$
>+		props.put ("osgi.ws", fWSCombo.getText()); //$NON-NLS-1$
>+		props.put ("osgi.nl", fNLCombo.getText()); //$NON-NLS-1$
>+		props.put ("osgi.arch", fArchCombo.getText()); //$NON-NLS-1$
>+		PDEState state = PDECore.getDefault().getModelManager().getState();
>+		state.setPlatformProperties(props);
>+		state.resolveState(false);
>+		ExternalModelManager registry = PDECore.getDefault().getExternalModelManager();
>+		registry.fireModelProviderEvent(new ModelProviderEvent(registry, IModelProviderEvent.TARGET_CHANGED, 
>+				new IModel[0], new IModel[0], new IModel[0]));
>+	}
>+	
> 	private void applyJREGroup() {
> 		try {
> 			if (!fDefaultJRE.equals(VMHelper.getDefaultVMInstallName()))

Actions: View | Diff

Attachments on bug 114779: 30330 | 67310 | 67325