Index: src/com/metamatrix/modeler/mapping/ui/actions/MappingDiagramActionAdapter.java
===================================================================
--- src/com/metamatrix/modeler/mapping/ui/actions/MappingDiagramActionAdapter.java (revision 1310)
+++ src/com/metamatrix/modeler/mapping/ui/actions/MappingDiagramActionAdapter.java (working copy)
@@ -62,7 +62,6 @@
import com.metamatrix.modeler.mapping.ui.UiConstants;
import com.metamatrix.modeler.mapping.ui.editor.MappingDiagramController;
import com.metamatrix.modeler.transformation.ui.actions.AddJoinExpressionAction;
-import com.metamatrix.modeler.transformation.ui.actions.AddToSqlFromAction;
import com.metamatrix.modeler.transformation.ui.actions.AddToSqlSelectAction;
import com.metamatrix.modeler.transformation.ui.actions.AddTransformationSourceAction;
import com.metamatrix.modeler.transformation.ui.actions.AddUnionSourceAction;
@@ -74,10 +73,10 @@
import com.metamatrix.modeler.transformation.ui.actions.TransformationSourceManager;
import com.metamatrix.modeler.ui.actions.IModelObjectActionContributor;
import com.metamatrix.modeler.ui.actions.IModelerActionConstants;
+import com.metamatrix.modeler.ui.actions.IModelerActionConstants.ModelerGlobalActions;
import com.metamatrix.modeler.ui.actions.ModelerActionBarIdManager;
import com.metamatrix.modeler.ui.actions.ModelerGlobalActionsMap;
import com.metamatrix.modeler.ui.actions.ModelerSpecialActionManager;
-import com.metamatrix.modeler.ui.actions.IModelerActionConstants.ModelerGlobalActions;
import com.metamatrix.modeler.ui.editors.ModelEditorPage;
import com.metamatrix.ui.actions.AbstractAction;
import com.metamatrix.ui.actions.ControlledPopupMenuExtender;
@@ -129,7 +128,6 @@
private TransformationAction clearSourcesAction;
private TransformationAction reconcileAction;
private TransformationAction addToSqlSelectAction;
- private TransformationAction addToSqlFromAction;
private TransformationAction addJoinExpressionAction;
// overrides of global actions
@@ -173,7 +171,8 @@
if (selProvider != null) {
// Need to create a PopupMenuExtender to include any external actions here
final IEditorPart editor = ((ModelEditorSite)getEditorPage().getEditorSite()).getEditor();
- final ControlledPopupMenuExtender popupMenuExtender = new ControlledPopupMenuExtender(ContextMenu.DIAGRAM_EDITOR_PAGE,
+ final ControlledPopupMenuExtender popupMenuExtender = new ControlledPopupMenuExtender(
+ ContextMenu.DIAGRAM_EDITOR_PAGE,
(MenuManager)theMenuMgr,
selProvider, editor);
popupMenuExtender.menuAboutToShow(theMenuMgr);
@@ -463,7 +462,6 @@
theMenuMgr.add(new GroupMarker(T_MARKER));
theMenuMgr.appendToGroup(T_MARKER, this.removeSourcesAction);
theMenuMgr.appendToGroup(T_MARKER, this.clearSourcesAction);
- theMenuMgr.appendToGroup(T_MARKER, this.addToSqlFromAction);
if (selectionHelper.isVirtual()) addExternalExportedActions(theMenuMgr, selection);
theMenuMgr.add(new Separator());
@@ -722,8 +720,8 @@
}
/**
- * Gets a list of the extension for the ModelObjectActionContributor extension point. This was copied from ModelerActionService
- * and changed to only process the trasformation.ui contributor to find the showDependencyAction.
+ * Gets a list of the extension for the ModelObjectActionContributor extension point. This was copied from
+ * ModelerActionService and changed to only process the trasformation.ui contributor to find the showDependencyAction.
*
* @return the list of IModelObjectActionContributor
implementations
*/
@@ -836,13 +834,6 @@
registerAction(this.reconcileAction);
}
- // ----- AddToSqlFromAction -----//
- this.addToSqlFromAction = (TransformationAction)getRegisteredAction(AddToSqlFromAction.class.getName());
- if (this.addToSqlFromAction == null) {
- this.addToSqlFromAction = new AddToSqlFromAction(transformationEObject, currentDiagram);
- registerAction(this.addToSqlFromAction);
- }
-
// ----- AddToSqlSelectAction -----//
this.addToSqlSelectAction = (TransformationAction)getRegisteredAction(AddToSqlSelectAction.class.getName());
if (this.addToSqlSelectAction == null) {
@@ -1167,7 +1158,6 @@
this.clearSourcesAction.setTransformation(transformationEObject);
this.reconcileAction.setTransformation(transformationEObject);
this.addToSqlSelectAction.setTransformation(transformationEObject);
- this.addToSqlFromAction.setTransformation(transformationEObject);
this.addJoinExpressionAction.setTransformation(transformationEObject);
this.deleteAction.setTransformation(transformationEObject);
this.cutAction.setTransformation(transformationEObject);
@@ -1182,7 +1172,6 @@
this.clearSourcesAction.setDiagram(currentDiagram);
this.reconcileAction.setDiagram(currentDiagram);
this.addToSqlSelectAction.setDiagram(currentDiagram);
- this.addToSqlFromAction.setDiagram(currentDiagram);
this.addJoinExpressionAction.setDiagram(currentDiagram);
}
Index: pom.xml
===================================================================
--- pom.xml (revision 1310)
+++ pom.xml (working copy)
@@ -11,4 +11,19 @@
org.teiid.designer.mapping.ui
7.2.0-SNAPSHOT
eclipse-plugin
+
+
+
+ org.sonatype.tycho
+ maven-osgi-compiler-plugin
+ ${tychoVersion}
+
+
+
+ 1.6
+
+
+
+