Author: akazakov Date: 2012-04-19 19:00:00 -0400 (Thu, 19 Apr 2012) New Revision: 40363 Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JBossPerspectiveFactory.java Log: https://issues.jboss.org/browse/JBIDE-11546 compile failed in org.jboss.tools.common.ui when run against Juno TP. Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JBossPerspectiveFactory.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JBossPerspectiveFactory.java 2012-04-19 22:37:37 UTC (rev 40362) +++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/JBossPerspectiveFactory.java 2012-04-19 23:00:00 UTC (rev 40363) @@ -10,13 +10,15 @@ ******************************************************************************/ package org.jboss.tools.common.ui; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + import org.eclipse.debug.ui.IDebugUIConstants; import org.eclipse.jdt.internal.junit.ui.TestRunnerViewPart; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.ui.IFolderLayout; import org.eclipse.ui.IPageLayout; import org.eclipse.ui.IPerspectiveFactory; -import org.eclipse.ui.internal.PageLayout; import org.eclipse.ui.internal.cheatsheets.ICheatSheetResource; import org.eclipse.ui.navigator.resources.ProjectExplorer; import org.eclipse.ui.progress.IProgressConstants; @@ -92,9 +94,30 @@ // Top right. IFolderLayout topRight = layout.createFolder("topRight", IPageLayout.RIGHT, 0.7f, editorArea);//$NON-NLS-1$ topRight.addView(IPageLayout.ID_OUTLINE); - // This line is required to force CheatSheetView placeholder, because it added by default as sticky view and - // to make placeholder working it should be removed first - ((PageLayout)layout).removePlaceholder(ICheatSheetResource.CHEAT_SHEET_VIEW_ID); + try { + // This code is required to force CheatSheetView placeholder, because it added by default as sticky view in Eclipse 3.7 and + // to make placeholder working it should be removed first + // We have to use reflection because org.eclipse.ui.internal.PageLayout was renamed in Eclipse 4.2 (see https://issues.jboss.org/browse/JBIDE-11546 ) + // ((PageLayout)layout).removePlaceholder(ICheatSheetResource.CHEAT_SHEET_VIEW_ID); + Class pageLayoutClass = Class.forName("org.eclipse.ui.internal.PageLayout"); + Method removePlaceholder = pageLayoutClass.getMethod("removePlaceholder", String.class); + removePlaceholder.invoke(layout, "org.eclipse.ui.cheatsheets.views.CheatSheetView"); + } catch (ClassNotFoundException e) { + // org.eclipse.ui.internal.PageLayout was removed in Eclipse 4.2 so it's ok if you cannot find it. We need this class in Eclipse 3.7 only to fix its problem with CheatSheetView placeholder. + // So just ignore the exception. + } catch (SecurityException e) { + CommonUIPlugin.getDefault().logError(e); + } catch (NoSuchMethodException e) { + // It's ok for Eclipse 4.2. + } catch (IllegalArgumentException e) { + CommonUIPlugin.getDefault().logError(e); + } catch (IllegalAccessException e) { + CommonUIPlugin.getDefault().logError(e); + } catch (InvocationTargetException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + topRight.addPlaceholder(ICheatSheetResource.CHEAT_SHEET_VIEW_ID); // new actions - Java project creation wizard