[jbosstools-commits] JBoss Tools SVN: r11847 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages: src/org/jboss/tools/seam/ui/pages/editor/edit and 1 other directory.

Author: dazarov Date: 2008-11-17 12:00:26 -0500 (Mon, 17 Nov 2008) New Revision: 11847 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java Log: https://jira.jboss.org/jira/browse/JBIDE-2575 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF 2008-11-17 15:41:48 UTC (rev 11846) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/META-INF/MANIFEST.MF 2008-11-17 17:00:26 UTC (rev 11847) @@ -48,6 +48,7 @@ org.jboss.tools.jst.web.ui, org.jboss.tools.seam.pages.xml, org.eclipse.emf;bundle-version="2.4.0", - org.eclipse.emf.ecore;bundle-version="2.4.0" + org.eclipse.emf.ecore;bundle-version="2.4.0", + org.eclipse.pde.ui;bundle-version="3.4.0" Bundle-Version: 2.0.0 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java 2008-11-17 15:41:48 UTC (rev 11846) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java 2008-11-17 17:00:26 UTC (rev 11847) @@ -12,7 +12,6 @@ import java.util.Properties; -import org.eclipse.core.runtime.CoreException; import org.eclipse.gef.commands.Command; import org.eclipse.gef.editpolicies.DirectEditPolicy; import org.eclipse.gef.requests.DirectEditRequest; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-11-17 15:41:48 UTC (rev 11846) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-11-17 17:00:26 UTC (rev 11847) @@ -12,6 +12,7 @@ import java.text.MessageFormat; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.Assert; import org.eclipse.draw2d.ColorConstants; import org.eclipse.gef.GraphicalEditPart; @@ -20,10 +21,12 @@ import org.eclipse.gef.requests.DirectEditRequest; import org.eclipse.gef.tools.CellEditorLocator; import org.eclipse.gef.tools.DirectEditManager; +import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.ICellEditorValidator; import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.pde.internal.ui.util.PDEJavaHelperUI; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.graphics.Font; @@ -37,7 +40,9 @@ import org.eclipse.ui.internal.Workbench; import org.eclipse.ui.internal.WorkbenchWindow; import org.eclipse.ui.part.CellEditorActionHandler; +import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.ui.attribute.AttributeContentProposalProviderFactory; import org.jboss.tools.seam.pages.xml.SeamPagesXMLMessages; import org.jboss.tools.seam.pages.xml.model.handlers.AddViewSupport; import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper; @@ -190,6 +195,15 @@ actionHandler.addCellEditor(getCellEditor()); actionBars.updateActionBars(); getCellEditor().setValidator(new ViewIDValidator(target)); + if (figure instanceof PageFigure){ + XAttribute attr = target.getModel().getMetaData().getEntity("SeamPage21").getAttribute("view id"); + AttributeContentProposalProviderFactory.registerContentAssist(target, attr, getCellEditor().getControl()); + }else if(figure instanceof ExceptionFigure){ + IProject project = (IProject)target.getModel().getProperties().get("project"); + + PDEJavaHelperUI.addTypeFieldAssistToText((Text)getCellEditor().getControl(), project, IJavaSearchConstants.CLASS); + } + } private void restoreSavedActions(IActionBars actionBars) {