Attachment 98241 Details for Bug 228856 – Fix IAC config problem with swt jar.

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

[patch] Fix IAC config problem with swt jar.

228856 patch.txt (text/plain), 2.72 KB, created by Bing Xu

on 2008-04-30 14:49:44 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bing Xu

Created: 2008-04-30 14:49:44 EDT

Size: 2.72 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.iac.administrator
>Index: src/org/eclipse/tptp/platform/iac/administrator/internal/common/IACConfigUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.iac.administrator/src/org/eclipse/tptp/platform/iac/administrator/internal/common/IACConfigUtil.java,v
>retrieving revision 1.2
>diff -u -r1.2 IACConfigUtil.java
>--- src/org/eclipse/tptp/platform/iac/administrator/internal/common/IACConfigUtil.java	22 Apr 2008 20:10:19 -0000	1.2
>+++ src/org/eclipse/tptp/platform/iac/administrator/internal/common/IACConfigUtil.java	30 Apr 2008 18:48:49 -0000
>@@ -21,6 +21,7 @@
> 
> import org.eclipse.core.runtime.FileLocator;
> import org.eclipse.core.runtime.Path;
>+import org.eclipse.tptp.platform.agentcontroller.config.FileFilterImpl;
> import org.eclipse.tptp.platform.agentcontroller.config.IConfigUtility;
> import org.eclipse.tptp.platform.agentcontroller.config.SetConfig;
> 
>@@ -32,6 +33,7 @@
> 		String result;
> 		
> 		try{
>+						
> 			org.osgi.framework.Bundle bundle = org.eclipse.core.runtime.Platform.getBundle(pluginAlias);		
> 			File f = FileLocator.getBundleFile(bundle);
> 			 
>@@ -40,8 +42,12 @@
> 			}		
> 			
> 			if(f.exists() && !f.isDirectory()){
>-				//return the path of jar file
>-				return f.getAbsolutePath();		
>+				//228856 
>+				if("org.eclipse.swt".equalsIgnoreCase(pluginAlias)){
>+					return AddAllSWTJars(f);
>+				}else
>+					//return the path of jar file
>+					return f.getAbsolutePath();		
> 			}else if (f.isDirectory()){
> 				return locateBundleJarFile(f.getCanonicalPath());
> 			}else if(!f.exists()){
>@@ -79,8 +85,31 @@
> 			return classpath.substring(0, classpath.length() - 1); // removing the last file.pathSeparator
> 		}else {
> 			return new String("null");
>+		}		   
>+	}
>+	
>+	private String AddAllSWTJars(File swtJar){
>+		
>+		// <Eclipse>/plugin contains three swt jar:  org.eclipse.swt_<version>.jar, org.eclipse.swt.<platform>_<version>.jar 
>+		// and org.eclipse.swt.<platform>.source_<version>.jar.   FileLocator returns the path to the first one. 
>+		// We need the path of the 2nd jar.  
>+		
>+		StringBuffer path = new StringBuffer();
>+		if(swtJar == null)
>+			return "null";
>+		
>+		File dir = swtJar.getParentFile();
>+		File[] jars = dir.listFiles(new FileFilterImpl("^org.eclipse.swt.*"));
>+
>+		for(int i = 0; i < jars.length; i++) {
>+			path.append(jars[i].getAbsolutePath() + File.pathSeparator);
> 		}
>+		String classpath = path.toString();
>+		if(classpath.length() > 1) {
>+			return classpath.substring(0, classpath.length() - 1); // removing the last file.pathSeparator
>+		}else {
>+			return new String("null");
>+		}	
> 		
>-		     
> 	}
> }

Actions: View | Diff

Attachments on bug 228856: 98241