[260231] integration into Eclipse platform
diff --git a/plugins/org.eclipse.actf.visualization.blind.html/fragment.xml b/plugins/org.eclipse.actf.visualization.blind.html/fragment.xml
index 8a6a91b..71a18cf 100644
--- a/plugins/org.eclipse.actf.visualization.blind.html/fragment.xml
+++ b/plugins/org.eclipse.actf.visualization.blind.html/fragment.xml
@@ -25,17 +25,6 @@
<viewShortcut id="org.eclipse.ui.views.ResourceNavigator"/>
<viewShortcut id="org.eclipse.jdt.ui.PackageExplorer"/>
<view
- id="org.eclipse.ui.views.ResourceNavigator"
- ratio="0.2f"
- relationship="left"
- relative="org.eclipse.ui.editorss">
- </view>
- <view
- id="org.eclipse.jdt.ui.PackageExplorer"
- relationship="stack"
- relative="org.eclipse.ui.views.ResourceNavigator"
- visible="false"/>
- <view
closeable="false"
id="org.eclipse.actf.visualization.ui.report.views.SummaryReportView"
ratio="0.7f"
diff --git a/plugins/org.eclipse.actf.visualization.blind.html/src/org/eclipse/actf/visualization/internal/blind/html/ui/HTMLPerspective.java b/plugins/org.eclipse.actf.visualization.blind.html/src/org/eclipse/actf/visualization/internal/blind/html/ui/HTMLPerspective.java
index 456ecb5..d32308b 100644
--- a/plugins/org.eclipse.actf.visualization.blind.html/src/org/eclipse/actf/visualization/internal/blind/html/ui/HTMLPerspective.java
+++ b/plugins/org.eclipse.actf.visualization.blind.html/src/org/eclipse/actf/visualization/internal/blind/html/ui/HTMLPerspective.java
@@ -13,16 +13,53 @@
package org.eclipse.actf.visualization.internal.blind.html.ui;
import org.eclipse.actf.visualization.ui.IVisualizationPerspective;
+import org.eclipse.ui.IFolderLayout;
import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IPerspectiveFactory;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.views.IViewRegistry;
-public class HTMLPerspective implements IPerspectiveFactory, IVisualizationPerspective {
+@SuppressWarnings("nls")
+public class HTMLPerspective implements IPerspectiveFactory,
+ IVisualizationPerspective {
+
+ private static final String RESOURCE_FOLDER = "actf.html.resource.folder";
+
+ private static final String RESOURCE_NAVIGATOR = "org.eclipse.ui.views.ResourceNavigator";
+ private static final String PACKAGE_EXPLORER = "org.eclipse.jdt.ui.PackageExplorer";
public void createInitialLayout(IPageLayout layout) {
layout.setEditorAreaVisible(true);
-
- //layout info: moved to fragment XML
- //initializer: moved to Startup.java
- }
-
+
+ // layout info: moved to fragment XML
+ // initializer: moved to Startup.java
+
+ String editorArea = layout.getEditorArea();
+
+ // check existence of Resource Navigator/Package Explorer
+ // (do not add place holder in the case of RCP)
+ IWorkbench workbench = PlatformUI.getWorkbench();
+ boolean hasResourceNavigator = false;
+ boolean hasPackageExplorer = false;
+ if (workbench != null) {
+ IViewRegistry viewReg = workbench.getViewRegistry();
+ hasResourceNavigator = (viewReg.find(RESOURCE_NAVIGATOR) != null);
+ hasPackageExplorer = (viewReg.find(PACKAGE_EXPLORER) != null);
+ }
+
+ if (hasResourceNavigator) {
+ IFolderLayout resourceFolder = layout.createFolder(RESOURCE_FOLDER,
+ IPageLayout.LEFT, 0.2f, editorArea);
+ resourceFolder.addView(RESOURCE_NAVIGATOR);
+ if (hasPackageExplorer) {
+ resourceFolder.addPlaceholder(PACKAGE_EXPLORER);
+ }
+ } else if (hasPackageExplorer) {
+ IFolderLayout resourceFolder = layout.createFolder(RESOURCE_FOLDER,
+ IPageLayout.LEFT, 0.2f, editorArea);
+ resourceFolder.addView(PACKAGE_EXPLORER);
+ }
+ }
+
}
