rework item content and label providers

3 files changed, 1 insertions, 60 deletions

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/plugin.xml b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/plugin.xml
index 2e30cf53cb..067657ae0a 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/plugin.xml
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/plugin.xml
@@ -29,26 +29,6 @@
    
  <extension
        point="org.eclipse.ui.popupMenus">
-       <objectContribution
-          adaptable="false"
-          id="org.eclipse.jpt.jpadiagrameditor.ui.openDiagramOnJpaContentNode"
-          nameFilter="*"
-          objectClass="org.eclipse.jpt.jpa.ui.JpaContextModelRootModel">
-          
-			<enablement>
-				<test property="org.eclipse.jpt.jpadiagrameditor.ui.jpaContentNodeFacet" value="jpt.jpa"/>
-			</enablement>
-       <menu
-             id="org.eclipse.jpt.jpadiagrameditor.ui.openDiagramJpaContentNodeMenu"
-             label="%diagrameditor.opendiagram.menu.label">
-       </menu>
-       <action
-             class="org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.ui.OpenJpaDiagramActionDelegate"
-             enablesFor="1"
-             id="org.eclipse.jpt.jpadiagrameditor.ui.openDiagramOnJpaContentNodeAction"
-             label="%diagrameditor.opendiagram.action.label">
-       </action>
-    </objectContribution>
     <objectContribution
           adaptable="false"
           id="org.eclipse.jpt.jpadiagrameditor.ui.openDiagramJpa"
@@ -164,13 +144,6 @@
       properties="jpaProjectFacet"
       class="org.eclipse.jpt.jpadiagrameditor.ui.internal.propertytester.JpaProjectFacetVersionPropertyTester">
     </propertyTester>
-    <propertyTester
-          class="org.eclipse.jpt.jpadiagrameditor.ui.internal.propertytester.JpaContentNodeFacetProjectVersionPropertyTester"
-          id="org.eclipse.jpt.jpadiagrameditor.ui.JpaContentNodeFacetVersionPropertyTester"
-          namespace="org.eclipse.jpt.jpadiagrameditor.ui"
-          properties="jpaContentNodeFacet"
-          type="org.eclipse.jpt.jpa.ui.JpaContextModelRootModel">
-    </propertyTester>
 </extension>
 
 </plugin>
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java
index 73a94a0063..6286aadc39 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/modelintegration/ui/OpenJpaDiagramActionDelegate.java
@@ -16,7 +16,6 @@
 package org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.ui;
 
 import java.lang.ref.WeakReference;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -26,7 +25,6 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.graphiti.mm.pictograms.Diagram;
 import org.eclipse.graphiti.platform.IDiagramContainer;
-import org.eclipse.jdt.internal.ui.dialogs.OptionalMessageDialog;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -35,19 +33,14 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jpt.jpa.core.JpaModel;
 import org.eclipse.jpt.jpa.core.JpaProject;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
-import org.eclipse.jpt.jpa.ui.JpaContextModelRootModel;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditor;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.JPADiagramEditorPlugin;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.i18n.JPAEditorMessages;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.util.CreateDiagramJob;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.modelintegration.util.ModelIntegrationUtil;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.provider.JPAEditorDiagramTypeProvider;
-import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorConstants;
-import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JPAEditorUtil;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.JpaArtifactFactory;
 import org.eclipse.jpt.jpadiagrameditor.ui.internal.util.Wrp;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IObjectActionDelegate;
@@ -153,9 +146,7 @@ public class OpenJpaDiagramActionDelegate implements IObjectActionDelegate {
 	protected PersistenceUnit obtainJpaProjectAndPersistenceUnit(ISelection selection) throws CoreException {
 		JpaProject jpaProject = null;
 		Object firstElement = ((IStructuredSelection) selection).getFirstElement();
-		if(firstElement instanceof JpaContextModelRootModel){
-			jpaProject = JpaArtifactFactory.instance().getJpaProject(((JpaContextModelRootModel)firstElement).getProject());
-		} else if (firstElement instanceof JpaModel) {
+		if (firstElement instanceof JpaModel) {
         	jpaProject = ((JpaModel)firstElement).getJpaProject();
         } else if (firstElement instanceof IProject) {
         	jpaProject = JpaArtifactFactory.instance().getJpaProject((IProject)firstElement);
diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertytester/JpaContentNodeFacetProjectVersionPropertyTester.java b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertytester/JpaContentNodeFacetProjectVersionPropertyTester.java
deleted file mode 100644
index 0f6ce5a16d..0000000000
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/propertytester/JpaContentNodeFacetProjectVersionPropertyTester.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jpt.jpadiagrameditor.ui.internal.propertytester;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.jpt.jpa.core.JpaProject;
-import org.eclipse.jpt.jpa.ui.JpaContextModelRootModel;
-
-public class JpaContentNodeFacetProjectVersionPropertyTester extends
-		PropertyTester {
-
-	public boolean test(Object receiver, String property, Object[] args,
-			Object value) {
-		
-		String[] subValues = ((String) value).split(":"); //$NON-NLS-1$
-		String receiverId = subValues[0];
-
-		if (receiver instanceof JpaContextModelRootModel) {
-			if(receiverId.equals(JpaProject.FACET_ID)){
-				return true;
-			}			
-		}
-		return false;
-	}	
-}