View | Details | Raw Unified | Return to bug 34808 | Differences between
and this patch

Collapse All | Expand All

(-)macosx/org/eclipse/jdt/internal/launching/macosx/MacOSXLaunchingPlugin.java (-1 / +9 lines)
Lines 95-101 Link Here
95
			javaApplStub= javaApplStub.substring(0, javaApplStub.length()-expected.length());
95
			javaApplStub= javaApplStub.substring(0, javaApplStub.length()-expected.length());
96
			javaApplStub+= "/Contents/MacOS/";	//$NON-NLS-1$
96
			javaApplStub+= "/Contents/MacOS/";	//$NON-NLS-1$
97
		} else {
97
		} else {
98
			javaApplStub= "/System/Library/Frameworks/JavaVM.framework/Versions/A/Resources/MacOS/"; //$NON-NLS-1$
98
			javaApplStub= System.getProperty("java.class.path");	//$NON-NLS-1$
99
			pos= javaApplStub.indexOf(expected);
100
			if (pos > 0) {
101
				javaApplStub= javaApplStub.substring(0, pos);
102
				javaApplStub+= "/Contents/MacOS/";	//$NON-NLS-1$				
103
			} else {
104
				// fall back
105
				javaApplStub= "/System/Library/Frameworks/JavaVM.framework/Versions/A/Resources/MacOS/"; //$NON-NLS-1$
106
			}
99
		}
107
		}
100
		javaApplStub= "JAVASTUB=\""+ javaApplStub + "\"\n";	//$NON-NLS-1$ //$NON-NLS-2$
108
		javaApplStub= "JAVASTUB=\""+ javaApplStub + "\"\n";	//$NON-NLS-1$ //$NON-NLS-2$
101
		
109
		

Return to bug 34808