Bug 330107 - removing warning dialog when open a diagram on project 2.0v201304102025

Change-Id: I47a484058b89da9ed88c7acf8294358992047336

2 files changed, 1 insertions, 15 deletions

diff --git a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/i18n/messages.properties b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/i18n/messages.properties
index b25035456d..0c5da7c234 100644
--- a/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/i18n/messages.properties
+++ b/jpa_diagram_editor/plugins/org.eclipse.jpt.jpadiagrameditor.ui/src/org/eclipse/jpt/jpadiagrameditor/ui/internal/i18n/messages.properties
@@ -186,8 +186,6 @@ JPAEditorDiagramTypeProvider_JPADiagramReadOnlyHasToAddMsg=Cannot show the selec
 
 OpenJpaDiagramActionDelegate_openJPADiagramErrorMsgTitle=Cannot Open Diagram
 OpenJpaDiagramActionDelegate_openJPADiagramErrorMsg=Cannot open the JPA diagram editor
-OpenJpaDiagramActionDelegate_jpaSupportWarningTitle=JPA Support
-OpenJpaDiagramActionDelegate_jpaSupportWarningMsg=JPA Diagram Editor has partial  JPA 2.0  support only.   When you use it with  JPA 2.0 enabled projects you should visualize JPA 1.0 compliant entities only. Otherwise, the editor behavior will become erratic. 
 OpenJpaDiagramActionDelegate_noPersistenceUnitTitle=No Persistence Unit
 OpenJpaDiagramActionDelegate_noPersistenceUnitMsg=The JPA Diagram Editor can not be open, because the persistence unit does not exist or is corrupted. 
 
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 eea1649c22..73a94a0063 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
@@ -80,19 +80,7 @@ public class OpenJpaDiagramActionDelegate implements IObjectActionDelegate {
 	public static IDiagramContainer openDiagramEditor(final Diagram diagram) {
 		
 		String diagramName = diagram.getName();
-		JpaProject jpaProject = ModelIntegrationUtil.getProjectByDiagram(diagramName);
-		if (!JPAEditorUtil.checkJPAFacetVersion(jpaProject, JPAEditorUtil.JPA_PROJECT_FACET_10) && !ModelIntegrationUtil.isDiagramOpen(diagramName)) {
-			boolean wasEnabled = OptionalMessageDialog.isDialogEnabled(JPAEditorConstants.JPA_SUPPORT_DIALOG_ID);
-			int btnIndex = OptionalMessageDialog.open(JPAEditorConstants.JPA_SUPPORT_DIALOG_ID, 
-									   Display.getDefault().getShells()[0], 
-									   JPAEditorMessages.OpenJpaDiagramActionDelegate_jpaSupportWarningTitle, 
-									   Display.getDefault().getSystemImage(SWT.ICON_WARNING),
-									   JPAEditorMessages.OpenJpaDiagramActionDelegate_jpaSupportWarningMsg, 
-									   0, 
-									   new String[] {JPAEditorMessages.BTN_OK}, 
-									   0);
-		}
-		
+		JpaProject jpaProject = ModelIntegrationUtil.getProjectByDiagram(diagramName);		
 		final JPADiagramEditorInput diagramEditorInput = JPADiagramEditorInput.createEditorInput(diagram, JPAEditorDiagramTypeProvider.ID); 
 		IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
 		final IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();