cleaned up 243421 code

5 files changed, 159 insertions, 251 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
index c397dfdd5d..ea984a162f 100644
--- a/jpa/plugins/org.eclipse.jpt.core/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.core/plugin.xml
@@ -30,34 +30,22 @@
 			properties="isMapped, isVirtual"
 			class="org.eclipse.jpt.core.internal.context.PersistentAttributePropertyTester">
 		</propertyTester>
-  <propertyTester
-        class="org.eclipse.jpt.core.internal.JpaTester"
-        id="org.eclipse.jpt.core.propertyTester.jpaSourceFolder"
-        namespace="org.eclipse.wst.common.project.facet.core"
-        properties="projectFacet"
-        type="org.eclipse.jdt.core.IPackageFragmentRoot">
-  </propertyTester>
-  <propertyTester
-        class="org.eclipse.jpt.core.internal.JpaTester"
-        id="org.eclipse.jpt.core.propertyTester.jpaPackage"
-        namespace="org.eclipse.wst.common.project.facet.core"
-        properties="projectFacet"
-        type="org.eclipse.jdt.core.IPackageFragment">
-  </propertyTester>
-  <propertyTester
-        class="org.eclipse.jpt.core.internal.JptPlatformTester"
-        id="org.eclipse.jpt.core.propertyTester.jptPlatformResource"
-        namespace="org.eclipse.jpt.core"
-        properties="jptPlatform"
-        type="org.eclipse.core.resources.IResource">
-  </propertyTester>
-  <propertyTester
-        class="org.eclipse.jpt.core.internal.JptPlatformTester"
-        id="org.eclipse.jpt.core.propertyTester.jptPlatformJavaElement"
-        namespace="org.eclipse.jpt.core"
-        properties="jptPlatform"
-        type="org.eclipse.jdt.core.IJavaElement">
-  </propertyTester>
+		
+		<propertyTester
+			id="org.eclipse.jpt.core.propertyTester.platformResource"
+			type="org.eclipse.core.resources.IResource"
+			namespace="org.eclipse.jpt.core"
+			properties="jpaPlatform"
+			class="org.eclipse.jpt.core.internal.JpaPlatformTester">
+		</propertyTester>
+		
+		<propertyTester
+			id="org.eclipse.jpt.core.propertyTester.javaElement"
+			type="org.eclipse.jdt.core.IJavaElement"
+			namespace="org.eclipse.jpt.core"
+			properties="jpaPlatform"
+			class="org.eclipse.jpt.core.internal.JpaPlatformTester">
+		</propertyTester>
 		
 	</extension>
 	
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JptPlatformTester.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaPlatformTester.java
index aecfced5f7..17236d7b80 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JptPlatformTester.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaPlatformTester.java
@@ -14,10 +14,10 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jpt.core.JptCorePlugin;
 
-public class JptPlatformTester extends PropertyTester {
+public class JpaPlatformTester extends PropertyTester {
 	
 	public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
-		if (!property.equals("jptPlatform")) { //$NON-NLS-1$
+		if (! property.equals("jpaPlatform")) { //$NON-NLS-1$
 			return false;
 		}
 		IProject project = null;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/plugin.xml
index af0b96eaea..bc210276f0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/plugin.xml
@@ -37,46 +37,32 @@
 
 	<extension
 		point="org.eclipse.ui.navigator.navigatorContent">
-        <commonWizard
-              menuGroupId="org.eclipse.jpt.ui"
-              type="new"
-              wizardId="org.eclipse.jpt.eclipselink.ui.wizard.newEclipseLinkMappingFile">
-           <enablement>
-              <and>
-                 <or>
-                    <instanceof
-                          value="org.eclipse.core.resources.IProject">
-                    </instanceof>
-                    <instanceof
-                          value="org.eclipse.jdt.core.IPackageFragmentRoot">
-                    </instanceof>
-                    <instanceof
-                          value="org.eclipse.jdt.core.IPackageFragment">
-                    </instanceof>
-                    <instanceof
-                          value="org.eclipse.core.resources.IFolder">
-                    </instanceof>
-                 </or>
-                 <test
-                       forcePluginActivation="true"
-                       property="org.eclipse.wst.common.project.facet.core.projectFacet"
-                       value="jpt.jpa">
-                 </test>
-                 <test
-                       property="org.eclipse.jpt.core.jptPlatform"
-                       value="org.eclipse.eclipselink.platform">
-                 </test>
-              </and>
-           </enablement>
-        </commonWizard>
-			
-			<!--
-			
-			<commonSorter
-				id="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter"
-				class="org.eclipse.jst.j2ee.navigator.internal.J2EEViewerSorter" />
-			
-			-->
+		
+		<commonWizard
+			menuGroupId="org.eclipse.jpt.ui"
+			type="new"
+			wizardId="org.eclipse.jpt.eclipselink.ui.wizard.newEclipseLinkMappingFile">
+			<enablement>
+				<and>
+					<or>
+						<instanceof value="org.eclipse.core.resources.IProject"/>
+                    	<instanceof value="org.eclipse.core.resources.IFolder"/>
+						<instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+						<instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+					</or>
+					<adapt type="org.eclipse.core.resources.IResource">
+						<test 
+							forcePluginActivation="true"
+							property="org.eclipse.wst.common.project.facet.core.projectFacet"
+							value="jpt.jpa" />
+					</adapt>
+					<test
+						property="org.eclipse.jpt.core.jpaPlatform"
+						value="org.eclipse.eclipselink.platform">
+					</test>
+				</and>
+			</enablement>
+		</commonWizard>
 		
 	</extension>
 	
diff --git a/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF
index 193b16a3b9..4901061407 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF
+++ b/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF
@@ -33,7 +33,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.navigator.resources;bundle-version="3.3.100",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.wst.common.emfworkbench.integration;bundle-version="1.1.202",
+ org.eclipse.wst.common.emfworkbench.integration;bundle-version="[1.1.202, 1.2.0)",
  org.eclipse.wst.common.frameworks;bundle-version="[1.1.200,1.2.0)",
  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.200,1.2.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.1.200,2.0.0)",
diff --git a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
index 2f988e62a0..fc4ac0c55a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
+++ b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml
@@ -447,7 +447,8 @@
 			<triggerPoints>
 				<and>
 					<adapt type="org.eclipse.core.resources.IProject"> 
-						<test forcePluginActivation="true"
+						<test 
+							forcePluginActivation="true"
 							property="org.eclipse.wst.common.project.facet.core.projectFacet"
 							value="jpt.jpa" />
 					</adapt>
@@ -469,58 +470,52 @@
 					</and>
 				</enablement>
 			</actionProvider>
-        <commonWizard
-              menuGroupId="org.eclipse.jpt.ui"
-              type="new"
-              wizardId="org.eclipse.jpt.ui.wizard.newEntity">
-           <enablement>
-              <and>
-                 <or>
-                    <instanceof
-                          value="org.eclipse.core.resources.IProject">
-                    </instanceof>
-                    <instanceof
-                          value="org.eclipse.jdt.core.IPackageFragment">
-                    </instanceof>
-                    <instanceof
-                          value="org.eclipse.jdt.core.IPackageFragmentRoot">
-                    </instanceof>
-                 </or>
-                 <test
-                       forcePluginActivation="true"
-                       property="org.eclipse.wst.common.project.facet.core.projectFacet"
-                       value="jpt.jpa">
-                 </test>
-              </and>
-           </enablement>
-        </commonWizard>
-        <commonWizard
-              menuGroupId="org.eclipse.jpt.ui"
-              type="new"
-              wizardId="org.eclipse.jpt.ui.wizard.newMappingFile">
-           <enablement>
-              <and>
-                 <or>
-                    <instanceof
-                          value="org.eclipse.core.resources.IProject">
-                    </instanceof>
-                    <instanceof
-                          value="org.eclipse.jdt.core.IPackageFragmentRoot">
-                    </instanceof>
-                    <instanceof
-                          value="org.eclipse.jdt.core.IPackageFragment">
-                    </instanceof>
-                    <instanceof
-                          value="org.eclipse.core.resources.IFolder">
-                    </instanceof>
-                 </or>
-                 <test
-                       forcePluginActivation="true"
-                       property="org.eclipse.wst.common.project.facet.core.projectFacet"
-                       value="jpt.jpa">
-                 </test></and>
-           </enablement>
-        </commonWizard>
+			
+			<commonWizard
+				menuGroupId="org.eclipse.jpt.ui"
+				type="new"
+				wizardId="org.eclipse.jpt.ui.wizard.newEntity">
+				<enablement>
+					<and>
+						<or>
+							<instanceof
+								value="org.eclipse.core.resources.IProject"/>
+							<instanceof
+								value="org.eclipse.jdt.core.IPackageFragment"/>
+							<instanceof
+								value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+						</or>
+						<adapt type="org.eclipse.core.resources.IResource">
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.wst.common.project.facet.core.projectFacet"
+								value="jpt.jpa" />
+						</adapt>
+					</and>
+				</enablement>
+			</commonWizard>
+			
+			<commonWizard
+				menuGroupId="org.eclipse.jpt.ui"
+				type="new"
+				wizardId="org.eclipse.jpt.ui.wizard.newMappingFile">
+				<enablement>
+					<and>
+						<or>
+							<instanceof value="org.eclipse.core.resources.IProject"/>
+							<instanceof value="org.eclipse.core.resources.IFolder"/>
+							<instanceof value="org.eclipse.jdt.core.IPackageFragmentRoot"/>
+							<instanceof value="org.eclipse.jdt.core.IPackageFragment"/>
+						</or>
+						<adapt type="org.eclipse.core.resources.IResource">
+							<test 
+								forcePluginActivation="true"
+								property="org.eclipse.wst.common.project.facet.core.projectFacet"
+								value="jpt.jpa" />
+						</adapt>
+					</and>
+				</enablement>
+			</commonWizard>
 			
 			<!--
 			
@@ -589,132 +584,71 @@
 <!-- Extension: Persistence Perspective                                                  -->
 <!-- =================================================================================== -->
 	
- <extension
-       point="org.eclipse.ui.perspectives">
-    <perspective
-          class="org.eclipse.jpt.ui.internal.perspective.JpaPerspectiveFactory"
-          icon="icons/full/eview16/jpa_perspective.gif"
-          id="org.eclipse.jpt.ui.jpaPerspective"
-          name="%jpaPerspective">
-       <description>
-          %jpaPerspectiveDescription
-       </description>
-    </perspective>
- </extension>
- <extension
-       point="org.eclipse.ui.perspectiveExtensions">
-    <perspectiveExtension
-          targetID="org.eclipse.jpt.ui.jpaPerspective">
-       <newWizardShortcut
-             id="org.eclipse.jpt.ui.wizard.newJpaProject">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jpt.ui.wizard.newEntity">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jpt.ui.wizard.newMappingFile">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jdt.ui.wizards.NewEnumCreationWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.ui.wizards.new.file">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.ui.wizards.new.folder">
-       </newWizardShortcut>
-       <newWizardShortcut
-             id="org.eclipse.ui.editors.wizards.UntitledTextFileWizard">
-       </newWizardShortcut>
-       <perspectiveShortcut
-             id="org.eclipse.jdt.ui.JavaPerspective">
-       </perspectiveShortcut>
-       <perspectiveShortcut
-             id="org.eclipse.debug.ui.DebugPerspective">
-       </perspectiveShortcut>
-       <perspectiveShortcut
-             id="org.eclipse.jst.j2ee.J2EEPerspective">
-       </perspectiveShortcut>
-       <perspectiveShortcut
-             id="org.eclipse.jdt.ui.JavaBrowsingPerspective">
-       </perspectiveShortcut>
-       <actionSet
-             id="org.eclipse.debug.ui.launchActionSet">
-       </actionSet>
-       <actionSet
-             id="org.eclipse.jdt.ui.JavaActionSet">
-       </actionSet>
-       <actionSet
-             id="org.eclipse.jdt.ui.JavaElementCreationActionSet">
-       </actionSet>
-       <actionSet
-             id="org.eclipse.ui.NavigateActionSet">
-       </actionSet>
-       <actionSet
-             id="org.eclipse.jpt.ui.JptCreationActionSet">
-       </actionSet>
-       <viewShortcut
-             id="org.eclipse.jdt.ui.PackageExplorer">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.jdt.ui.TypeHierarchy">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.jdt.ui.SourceView">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.jdt.ui.JavadocView">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.ui.navigator.ProjectExplorer">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.ui.views.ContentOutline">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.ui.views.ProblemView">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.ui.views.ResourceNavigator">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.jpt.ui.jpaStructureView">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.jpt.ui.jpaDetailsView">
-       </viewShortcut>
-       <viewShortcut
-             id="org.eclipse.datatools.connectivity.DataSourceExplorerNavigator">
-       </viewShortcut>
-    </perspectiveExtension>
-    <perspectiveExtension
-          targetID="org.eclipse.jst.j2ee.J2EEPerspective">
-       <newWizardShortcut
-             id="org.eclipse.jpt.ui.wizard.newJpaProject">
-       </newWizardShortcut>
-       <perspectiveShortcut
-             id="org.eclipse.jpt.ui.jpaPerspective">
-       </perspectiveShortcut>
-    </perspectiveExtension>
- </extension>
+	<extension
+		point="org.eclipse.ui.perspectives">
+		
+		<perspective
+			class="org.eclipse.jpt.ui.internal.perspective.JpaPerspectiveFactory"
+			icon="icons/full/eview16/jpa_perspective.gif"
+			id="org.eclipse.jpt.ui.jpaPerspective"
+			name="%jpaPerspective">
+			<description>%jpaPerspectiveDescription</description>
+		</perspective>
+	</extension>
+	
+	
+	<extension
+		point="org.eclipse.ui.perspectiveExtensions">
+		
+		<perspectiveExtension
+			targetID="org.eclipse.jpt.ui.jpaPerspective">
+			
+			<newWizardShortcut id="org.eclipse.jpt.ui.wizard.newJpaProject"/>
+			<newWizardShortcut id="org.eclipse.jpt.ui.wizard.newEntity"/>
+			<newWizardShortcut id="org.eclipse.jpt.ui.wizard.newMappingFile"/>
+			<newWizardShortcut id="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard"/>
+			<newWizardShortcut id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard"/>
+			<newWizardShortcut id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard"/>
+			<newWizardShortcut id="org.eclipse.jdt.ui.wizards.NewEnumCreationWizard"/>
+			<newWizardShortcut id="org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard"/>
+			<newWizardShortcut id="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard"/>
+			<newWizardShortcut id="org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard"/>
+			<newWizardShortcut id="org.eclipse.ui.wizards.new.file"/>
+			<newWizardShortcut id="org.eclipse.ui.wizards.new.folder"/>
+			<newWizardShortcut id="org.eclipse.ui.editors.wizards.UntitledTextFileWizard"/>
+			
+			<perspectiveShortcut id="org.eclipse.jdt.ui.JavaPerspective"/>
+			<perspectiveShortcut id="org.eclipse.debug.ui.DebugPerspective"/>
+			<perspectiveShortcut id="org.eclipse.jst.j2ee.J2EEPerspective"/>
+			<perspectiveShortcut id="org.eclipse.jdt.ui.JavaBrowsingPerspective"/>
+			
+			<actionSet id="org.eclipse.debug.ui.launchActionSet"/>
+			<actionSet id="org.eclipse.jdt.ui.JavaActionSet"/>
+			<actionSet id="org.eclipse.jdt.ui.JavaElementCreationActionSet"/>
+			<actionSet id="org.eclipse.ui.NavigateActionSet"/>
+			<actionSet id="org.eclipse.jpt.ui.JptCreationActionSet"/>
+			
+			<viewShortcut id="org.eclipse.jdt.ui.PackageExplorer"/>
+			<viewShortcut id="org.eclipse.jdt.ui.TypeHierarchy"/>
+			<viewShortcut id="org.eclipse.jdt.ui.SourceView"/>
+			<viewShortcut id="org.eclipse.jdt.ui.JavadocView"/>
+			<viewShortcut id="org.eclipse.ui.navigator.ProjectExplorer"/>
+			<viewShortcut id="org.eclipse.ui.views.ContentOutline"/>
+			<viewShortcut id="org.eclipse.ui.views.ProblemView"/>
+			<viewShortcut id="org.eclipse.ui.views.ResourceNavigator"/>
+			<viewShortcut id="org.eclipse.jpt.ui.jpaStructureView"/>
+			<viewShortcut id="org.eclipse.jpt.ui.jpaDetailsView"/>
+			<viewShortcut id="org.eclipse.datatools.connectivity.DataSourceExplorerNavigator"/>
+			
+		</perspectiveExtension>
+    	
+		<perspectiveExtension
+			targetID="org.eclipse.jst.j2ee.J2EEPerspective">
+			<newWizardShortcut id="org.eclipse.jpt.ui.wizard.newJpaProject"/>
+			<perspectiveShortcut id="org.eclipse.jpt.ui.jpaPerspective"/>
+		</perspectiveExtension>
+		
+	</extension>
 	
 	
 	<extension
@@ -729,7 +663,7 @@
 				label="%jpaMenuName"/>
 
 			<enablement>
-					<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa"/>
+				<test property="org.eclipse.wst.common.project.facet.core.projectFacet" value="jpt.jpa"/>
 			</enablement>
 
 			<action