TEIIDDES-3044 (cntd)

* fixed new object actions to properly set the target model resource
Teiid-Designer · Jun 8, 2017 · 268d276 · 268d276
1 parent 60e21e2
commit 268d276
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/...lational.ui/src/org/teiid/designer/relational/ui/actions/CreateRelationalIndexAction.java b/...lational.ui/src/org/teiid/designer/relational/ui/actions/CreateRelationalIndexAction.java
@@ -137,7 +137,7 @@ public void run(ModelResource mr) {
         RelationalIndex index = new RelationalIndex();
 
         // Hand the table off to the generic edit dialog
-        RelationalDialogModel dialogModel = new RelationalDialogModel(index, selectedModel);
+        RelationalDialogModel dialogModel = new RelationalDialogModel(index, (IFile)ModelUtilities.getIResource(mr));
         EditRelationalObjectDialog dialog = new EditRelationalObjectDialog(shell, dialogModel);
 
         dialog.open();

diff --git a/...onal.ui/src/org/teiid/designer/relational/ui/actions/CreateRelationalProcedureAction.java b/...onal.ui/src/org/teiid/designer/relational/ui/actions/CreateRelationalProcedureAction.java
@@ -184,7 +184,7 @@ public void run(ModelResource mr) {
 	        }
 
 	        // Hand the table off to the generic edit dialog
-            RelationalDialogModel dialogModel = new RelationalDialogModel(procedure, selectedModel);
+            RelationalDialogModel dialogModel = new RelationalDialogModel(procedure, (IFile)ModelUtilities.getIResource(mr));
             EditRelationalObjectDialog dialog = new EditRelationalObjectDialog(shell, dialogModel);
 
 	        dialog.open();

diff --git a/...lational.ui/src/org/teiid/designer/relational/ui/actions/CreateRelationalTableAction.java b/...lational.ui/src/org/teiid/designer/relational/ui/actions/CreateRelationalTableAction.java
@@ -160,7 +160,7 @@ public void run(ModelResource mr) {
         table.setSupportsUpdate(true);
 
         // Hand the table off to the generic edit dialog
-        RelationalDialogModel dialogModel = new RelationalDialogModel(table, selectedModel);
+        RelationalDialogModel dialogModel = new RelationalDialogModel(table, (IFile)ModelUtilities.getIResource(mr));
         EditRelationalObjectDialog dialog = new EditRelationalObjectDialog(shell, dialogModel);
 
         dialog.open();

diff --git a/...elational.ui/src/org/teiid/designer/relational/ui/actions/CreateRelationalViewAction.java b/...elational.ui/src/org/teiid/designer/relational/ui/actions/CreateRelationalViewAction.java
@@ -158,7 +158,7 @@ public void run(ModelResource mr) {
         table.setSupportsUpdate(true);
 
         // Hand the table off to the generic edit dialog
-        RelationalDialogModel dialogModel = new RelationalDialogModel(table, selectedModel);
+        RelationalDialogModel dialogModel = new RelationalDialogModel(table, (IFile)ModelUtilities.getIResource(mr));
         EditRelationalObjectDialog dialog = new EditRelationalObjectDialog(shell, dialogModel);
 
         dialog.open();

diff --git a/...sformation.ui/src/org/teiid/designer/transformation/ui/actions/CreateViewIndexAction.java b/...sformation.ui/src/org/teiid/designer/transformation/ui/actions/CreateViewIndexAction.java
@@ -168,7 +168,7 @@ public void run(ModelResource mr) {
         relationalViewIndex = new RelationalViewIndex();
 
         // Hand the table off to the generic edit dialog
-        TransformationDialogModel dialogModel = new TransformationDialogModel(relationalViewIndex, selectedModel);
+        TransformationDialogModel dialogModel = new TransformationDialogModel(relationalViewIndex, (IFile)ModelUtilities.getIResource(mr));
         EditRelationalObjectDialog dialog = new EditRelationalObjectDialog(shell, dialogModel);
 
         dialog.open();

diff --git a/...mation.ui/src/org/teiid/designer/transformation/ui/actions/CreateViewProcedureAction.java b/...mation.ui/src/org/teiid/designer/transformation/ui/actions/CreateViewProcedureAction.java
@@ -184,7 +184,7 @@ public void run(ModelResource mr) {
         procedureTypeDialog.open();
 
         if (procedureTypeDialog.getReturnCode() == Window.OK) {
-            TransformationDialogModel dialogModel = new TransformationDialogModel(relationalViewProcedure, selectedModel);
+            TransformationDialogModel dialogModel = new TransformationDialogModel(relationalViewProcedure, (IFile)ModelUtilities.getIResource(mr));
             EditRelationalObjectDialog dialog = new EditRelationalObjectDialog(shell, dialogModel);
 
 	        dialog.open();

diff --git a/...sformation.ui/src/org/teiid/designer/transformation/ui/actions/CreateViewTableAction.java b/...sformation.ui/src/org/teiid/designer/transformation/ui/actions/CreateViewTableAction.java
@@ -183,7 +183,7 @@ public void run(ModelResource mr) {
             relationalViewTable.setSupportsUpdate(true);
 
 	        // Hand the table off to the generic edit dialog
-            TransformationDialogModel dialogModel = new TransformationDialogModel(relationalViewTable, selectedModel);
+            TransformationDialogModel dialogModel = new TransformationDialogModel(relationalViewTable, (IFile)ModelUtilities.getIResource(mr));
             EditRelationalObjectDialog editDialog = new EditRelationalObjectDialog(shell, dialogModel);
 
             editDialog.open();

diff --git a/plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/viewsupport/ModelUtilities.java b/plugins/org.teiid.designer.ui/src/org/teiid/designer/ui/viewsupport/ModelUtilities.java
@@ -492,6 +492,19 @@ public static ModelResource getModelResource( Object object ) {
         return null;
     }
 
+    public static IResource getIResource(ModelResource modelResource) {
+    	IResource resource = null;
+
+    	try {
+			resource = modelResource.getUnderlyingResource();
+		} catch (ModelWorkspaceException ex) {
+			String message = "[ModelUtilities.getIResource()] ERROR: exception finding Resource for model"; //$NON-NLS-1$
+            UiConstants.Util.log(IStatus.ERROR, ex, message);
+		}
+
+    	return resource;
+    }
+
     public static IProject getProject(Object object) {
     	ModelResource mr = getModelResource(object);