add JPA perspective and view constants

4 files changed, 44 insertions, 26 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/perspective/JpaPerspectiveFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/perspective/JpaPerspectiveFactory.java
index 6402201b1f..2826ff3223 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/perspective/JpaPerspectiveFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/perspective/JpaPerspectiveFactory.java
@@ -1,51 +1,58 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2008 Oracle. All rights reserved. This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2007, 2013 Oracle. All rights reserved.
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0, which accompanies this distribution
+ * and is available at http://www.eclipse.org/legal/epl-v10.html.
  * 
- * Contributors: Oracle. - initial API and implementation
- ******************************************************************************/        
+ * Contributors:
+ *     Oracle - initial API and implementation
+ ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.perspective;
 
 import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jpt.jpa.ui.internal.views.JpaDetailsView;
+import org.eclipse.jpt.jpa.ui.internal.views.JpaStructureView;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 import org.eclipse.ui.navigator.resources.ProjectExplorer;
 import org.eclipse.ui.progress.IProgressConstants;
 
-public class JpaPerspectiveFactory implements IPerspectiveFactory {
+public class JpaPerspectiveFactory
+	implements IPerspectiveFactory
+{
+	/**
+	 * Perspective ID specified in <code>plugin.xml</code>.
+	 */
+	public static final String ID = "org.eclipse.jpt.ui.jpaPerspective"; //$NON-NLS-1$
+
+	private static final String DATABASE_EXPLORER_VIEW_ID = "org.eclipse.datatools.connectivity.DataSourceExplorerNavigator"; //$NON-NLS-1$
 
 	public void createInitialLayout(IPageLayout layout) {
 		String editorArea = layout.getEditorArea();
 
-		//Package area
-		IFolderLayout folder = layout.createFolder(
-				"left", IPageLayout.LEFT, (float) 0.25, editorArea); //$NON-NLS-1$
+		// Project Explorer
+		IFolderLayout folder = layout.createFolder("left", IPageLayout.LEFT, (float) 0.25, editorArea); //$NON-NLS-1$
 		folder.addView(ProjectExplorer.VIEW_ID);
 		folder.addPlaceholder(JavaUI.ID_TYPE_HIERARCHY);
-		folder.addPlaceholder(IPageLayout.ID_RES_NAV);
+//		folder.addPlaceholder(IPageLayout.ID_RES_NAV);
+		folder.addPlaceholder(IPageLayout.ID_PROJECT_EXPLORER);
 
-		//Database Explorer area
-		layout.addView("org.eclipse.datatools.connectivity.DataSourceExplorerNavigator", //$NON-NLS-1$
-			IPageLayout.BOTTOM, (float) 0.60, ProjectExplorer.VIEW_ID);
+		// Data Source Explorer
+		layout.addView(DATABASE_EXPLORER_VIEW_ID, IPageLayout.BOTTOM, (float) 0.60, ProjectExplorer.VIEW_ID);
 
-		//Problems/Console area
-		IFolderLayout outputFolder = layout.createFolder(
-				"bottom", IPageLayout.BOTTOM, (float) 0.60, editorArea); //$NON-NLS-1$
+		// Problems
+		IFolderLayout outputFolder = layout.createFolder("bottom", IPageLayout.BOTTOM, (float) 0.60, editorArea); //$NON-NLS-1$
 		outputFolder.addView(IPageLayout.ID_PROBLEM_VIEW);
 		outputFolder.addPlaceholder(IPageLayout.ID_BOOKMARKS);
 		outputFolder.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID);
 
-		//JPA Details (Split with Problems/Console area)
-		layout.addView("org.eclipse.jpt.ui.jpaDetailsView", //$NON-NLS-1$
-				IPageLayout.RIGHT, (float) .60, "bottom"); //$NON-NLS-1$
+		// JPA Details (split with Problems)
+		layout.addView(JpaDetailsView.ID, IPageLayout.RIGHT, (float) 0.60, "bottom"); //$NON-NLS-1$
 		
-		//JPA Structure area
-		IFolderLayout outlineFolder = layout.createFolder(
-				"right", IPageLayout.RIGHT, (float) 0.75, editorArea); //$NON-NLS-1$
-		outlineFolder.addView("org.eclipse.jpt.ui.jpaStructureView"); //$NON-NLS-1$
+		// JPA Structure
+		IFolderLayout outlineFolder = layout.createFolder("right", IPageLayout.RIGHT, (float) 0.75, editorArea); //$NON-NLS-1$
+		outlineFolder.addView(JpaStructureView.ID);
 		outlineFolder.addView(IPageLayout.ID_OUTLINE);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java
index 1112da1630..a6eedd23c1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaDetailsView.java
@@ -53,6 +53,11 @@ public class JpaDetailsView
 	extends ViewPart
 {
 	/**
+	 * View ID specified in <code>plugin.xml</code>.
+	 */
+	public static final String ID = "org.eclipse.jpt.ui.jpaDetailsView"; //$NON-NLS-1$
+
+	/**
 	 * The scrolled form that holds the {@link #pageBook page book}.
 	 * We need to force it to reflow whenever we change the page book's
 	 * current page.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructureView.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructureView.java
index 8afe0d18e9..de8afaa9fc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructureView.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/views/JpaStructureView.java
@@ -45,6 +45,11 @@ public class JpaStructureView
 	extends PageBookView
 {
 	/**
+	 * View ID specified in <code>plugin.xml</code>.
+	 */
+	public static final String ID = "org.eclipse.jpt.ui.jpaStructureView"; //$NON-NLS-1$
+
+	/**
 	 * The manager is created when the view's control is
 	 * {@link #createPartControl(Composite) created}
 	 * and disposed, if necessary, when the view is
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/proj/JpaProjectWizard.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/proj/JpaProjectWizard.java
index 956521178a..fb8d6abf97 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/proj/JpaProjectWizard.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/proj/JpaProjectWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2010, 2013 Oracle. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0, which accompanies this distribution
  * and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -13,6 +13,7 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jpt.jpa.ui.JptJpaUiImages;
 import org.eclipse.jpt.jpa.ui.internal.JptUiMessages;
+import org.eclipse.jpt.jpa.ui.internal.perspective.JpaPerspectiveFactory;
 import org.eclipse.jpt.jpa.ui.internal.wizards.proj.model.JpaProjectCreationDataModelProvider;
 import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
@@ -56,6 +57,6 @@ public class JpaProjectWizard
 	
 	@Override
 	protected String getFinalPerspectiveID() {
-		return "org.eclipse.jpt.ui.jpaPerspective"; //$NON-NLS-1$
+		return JpaPerspectiveFactory.ID;
 	}
 }