[jbosstools-commits] JBoss Tools SVN: r8006 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules and 28 other directories.

Author: max.andersen(a)jboss.com Date: 2008-05-08 12:39:33 -0400 (Thu, 08 May 2008) New Revision: 8006 Removed: trunk/core/plugins/org.jboss.ide.eclipse.jdt.core/plugin.xml trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/plugin.xml Modified: trunk/ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/PackageModuleFactory.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerFrame.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/FieldWizardPage.java trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/MethodWizardPage.java trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizard.java trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizardPage.java trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/dialogs/ContextValueDialog.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFContextMenuProvider.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageContributor.java trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesContextMenuProvider.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup/WebServerSourceLocator.java trunk/legacy/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/META-INF/MANIFEST.MF trunk/legacy/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.ui/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/StrutsContextMenuProvider.java trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteDragSourceListener.java trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/xpl/DrawerAnimationController.java Log: Merged revisions 7798-8005 via svnmerge from https://svn.jboss.org/repos/jbosstools/branches/ganymede/trunk ........ r7798 | max.andersen(a)jboss.com | 2008-04-25 13:29:17 +0200 (Fri, 25 Apr 2008) | 1 line ........ r7803 | max.andersen(a)jboss.com | 2008-04-25 15:48:03 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2132 [Ganymede] Bundle 'org.eclipse.wst.common.ui.properties' cannot be resolved ........ r7804 | max.andersen(a)jboss.com | 2008-04-25 15:48:07 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2132 [Ganymede] Bundle 'org.eclipse.wst.common.ui.properties' cannot be resolved ........ r7806 | max.andersen(a)jboss.com | 2008-04-25 15:58:26 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2133 [Ganymede] Cannot reduce the visibility of the inherited method from MenuManager ........ r7807 | max.andersen(a)jboss.com | 2008-04-25 16:14:32 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2134 [Ganymede] ClosableWizardDialog cannot be resolved to a type ........ r7808 | max.andersen(a)jboss.com | 2008-04-25 16:19:42 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2134 [Ganymede] ClosableWizardDialog cannot be resolved to a type ........ r7809 | max.andersen(a)jboss.com | 2008-04-25 16:21:08 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2135 [Ganymede] The type StatusLineContributionItem is ambiguous ........ r7810 | max.andersen(a)jboss.com | 2008-04-25 16:25:13 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2136 [Ganymede] ICommandImageService cannot be resolved to a type ........ r7812 | max.andersen(a)jboss.com | 2008-04-25 16:33:21 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2137 [Ganymede] JavaMoveRefactoring cannot be resolved to a type ........ r7815 | max.andersen(a)jboss.com | 2008-04-25 16:37:07 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2137 [Ganymede] JavaRenameRefactoring cannot be resolved to a type ........ r7817 | max.andersen(a)jboss.com | 2008-04-25 16:55:19 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2138 [Ganymede] PaletteEditPart cannot be resolved to a type ........ r7819 | max.andersen(a)jboss.com | 2008-04-25 17:20:11 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2142 [Ganymede] The method setDestination(IReorgDestination) in the type JavaMoveProcessor is not applicable for the arguments (IResource) ........ r7820 | max.andersen(a)jboss.com | 2008-04-25 17:28:29 +0200 (Fri, 25 Apr 2008) | 3 lines JBIDE-2139 [Ganymede] Plug-ins declaring extensions or extension points must set the singleton directive to true Fixed this incorrect error/warning by removing the empty plugin.xml ........ r7821 | max.andersen(a)jboss.com | 2008-04-25 17:50:08 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2143 [Ganymede] The method getFullyQualifiedName(IType) is undefined for the type JavaModelUtil ........ r7822 | max.andersen(a)jboss.com | 2008-04-25 17:51:33 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2135 [Ganymede] The type StatusLineContributionItem is ambiguous ........ r7825 | max.andersen(a)jboss.com | 2008-04-25 18:22:44 +0200 (Fri, 25 Apr 2008) | 1 line JBIDE-2134 [Ganymede] ClosableWizardDialog cannot be resolved to a type ........ r7831 | max.andersen(a)jboss.com | 2008-04-26 18:00:21 +0200 (Sat, 26 Apr 2008) | 1 line JBIDE-2146 [Ganymede] The field ModuleFile.name|path is not visible ........ r7832 | max.andersen(a)jboss.com | 2008-04-26 18:25:08 +0200 (Sat, 26 Apr 2008) | 1 line JBIDE-2147 [Ganymede] ResourceTransferDragAdapter cannot be resolved to a type ........ r7833 | max.andersen(a)jboss.com | 2008-04-26 18:47:53 +0200 (Sat, 26 Apr 2008) | 3 lines JBIDE-2149 [Ganymede] The method open(IWorkbenchPage, IFile, boolean) in the type EditorOpener is not applicable for the arguments (IFile, boolean) JBIDE-2148 [Ganymede] SearchMessages.FileSearchPage_limited_format cannot be resolved ........ r7834 | max.andersen(a)jboss.com | 2008-04-26 18:57:47 +0200 (Sat, 26 Apr 2008) | 1 line JBIDE-2150 [Ganymede] JavaProjectWizardSecondPage cannot be resolved to a type ........ r7835 | max.andersen(a)jboss.com | 2008-04-26 19:06:25 +0200 (Sat, 26 Apr 2008) | 1 line JBIDE-2151 [Ganymede] NewWizardMessages.JavaProjectWizard* cannot be resolved ........ r7836 | max.andersen(a)jboss.com | 2008-04-27 09:50:42 +0200 (Sun, 27 Apr 2008) | 1 line JBIDE-2152 [Ganymede]The type Memento must implement the inherited abstract method IMemento.* ........ r7837 | max.andersen(a)jboss.com | 2008-04-27 20:37:21 +0200 (Sun, 27 Apr 2008) | 1 line [JBIDE-2153] [Ganymede] The method activate(RefactoringWizard, Shell, String, int) in the type RefactoringStarter is not applicable for the arguments (Refactoring, RefactoringWizard, Shell, String, int) ........ r7838 | max.andersen(a)jboss.com | 2008-04-27 20:43:13 +0200 (Sun, 27 Apr 2008) | 1 line [JBIDE-2154] [Ganymede] The type * must implement the inherited abstract method ILaunchConfiguration.hasAttribute(String)/removeAttribute ........ r7839 | max.andersen(a)jboss.com | 2008-04-27 21:11:00 +0200 (Sun, 27 Apr 2008) | 1 line [JBIDE-2155] [Ganymede] JavaSourceLocator started throwing CoreException instead of JavaModelException ........ r7840 | max.andersen(a)jboss.com | 2008-04-27 22:50:20 +0200 (Sun, 27 Apr 2008) | 1 line [JBIDE-2156] [Ganymede] EditorUtility.openInEditor stopped throwing JavaModelException ........ r7879 | rob.stryker(a)jboss.com | 2008-04-29 00:56:27 +0200 (Tue, 29 Apr 2008) | 1 line ganymede compile fixes ........ r7894 | snjeza | 2008-04-29 21:49:13 +0200 (Tue, 29 Apr 2008) | 1 line JBIDE-2152 Removing the @Override annotation because of the compatibility with Java 5 ........ r7895 | snjeza | 2008-04-29 22:06:25 +0200 (Tue, 29 Apr 2008) | 1 line JBIDE-2131 [WTP-Ganymede] ActionDefinitionIds.INFORMATION cannot be resolved ........ r7896 | snjeza | 2008-04-29 22:08:35 +0200 (Tue, 29 Apr 2008) | 1 line JBIDE-2158 [Ganymede] The constructor FileMatch(IFile, int, int) is undefined FileMatch last= (FileMatch) fCache ........ r7897 | max.andersen(a)jboss.com | 2008-04-29 22:49:31 +0200 (Tue, 29 Apr 2008) | 1 line [JBIDE-2157] [Ganymede] The method serializeDocument(Document) is undefined for the type LaunchingPlugin ........ r7898 | rob.stryker(a)jboss.com | 2008-04-30 01:33:38 +0200 (Wed, 30 Apr 2008) | 1 line JBIDE-2171 I'm committing this even though upstream is wrong. Upstream is promised to be fixed in m7, and I already saw Tim DeBoer's commit. This will fix itself in the next milestone. ........ Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /branches/ganymede:1-7797 /branches/ganymede/trunk:1-7797 /branches/jbosstools-2.1.x:1-7998 + /branches/ganymede:1-7797 /branches/ganymede/trunk:1-8005 /branches/jbosstools-2.1.x:1-7998 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/PackageModuleFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/PackageModuleFactory.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/PackageModuleFactory.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -362,13 +362,13 @@ this.node = fs; } public int hashCode() { - return name.hashCode() * 37 + path.hashCode(); + return getName().hashCode() * 37 + getPath().hashCode(); } public IPath getPath() { return srcPath; } public IArchiveNode getNode() { return node; } public IPath getDeepDestination() { - return node.getRootArchive().getGlobalDestinationPath().append(node.getRootArchiveRelativePath(path)); + return node.getRootArchive().getGlobalDestinationPath().append(node.getRootArchiveRelativePath(getModuleRelativePath())); } public IPath getSourcePath() { return this.srcPath; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerFrame.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerFrame.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerFrame.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -27,10 +27,12 @@ import org.eclipse.debug.ui.DebugUITools; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; +import org.eclipse.jface.action.IContributionManager; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; +import org.eclipse.jface.bindings.TriggerSequence; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; @@ -44,10 +46,14 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.ui.IActionBars; import org.eclipse.ui.IViewSite; +import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPartSite; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.actions.ActionFactory; +import org.eclipse.ui.keys.IBindingService; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.core.internal.Trace; @@ -55,10 +61,17 @@ import org.eclipse.wst.server.ui.internal.Messages; import org.eclipse.wst.server.ui.internal.ServerUIPlugin; import org.eclipse.wst.server.ui.internal.actions.NewServerWizardAction; +import org.eclipse.wst.server.ui.internal.view.servers.CopyAction; import org.eclipse.wst.server.ui.internal.view.servers.DeleteAction; import org.eclipse.wst.server.ui.internal.view.servers.ModuleSloshAction; +import org.eclipse.wst.server.ui.internal.view.servers.OpenAction; +import org.eclipse.wst.server.ui.internal.view.servers.PasteAction; +import org.eclipse.wst.server.ui.internal.view.servers.PropertiesAction; import org.eclipse.wst.server.ui.internal.view.servers.PublishAction; import org.eclipse.wst.server.ui.internal.view.servers.PublishCleanAction; +import org.eclipse.wst.server.ui.internal.view.servers.RenameAction; +import org.eclipse.wst.server.ui.internal.view.servers.ShowInConsoleAction; +import org.eclipse.wst.server.ui.internal.view.servers.ShowInDebugAction; import org.eclipse.wst.server.ui.internal.view.servers.StartAction; import org.eclipse.wst.server.ui.internal.view.servers.StopAction; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; @@ -78,10 +91,15 @@ protected IViewSite viewSite; protected Tree treeTable; protected ServerTableViewer tableViewer; - protected Action editLaunchConfigAction; - protected Action twiddleAction; - protected Action newServerAction; + + // custom + protected Action editLaunchConfigAction, twiddleAction, newServerAction; + // wtp + protected Action actionModifyModules; + protected Action openAction, showInConsoleAction, showInDebugAction, propertiesAction; + protected Action copyAction, pasteAction, deleteAction, renameAction; + public ServerFrame(Composite parent, JBossServerView view) { super(parent, SWT.BORDER); setLayout(new FillLayout()); @@ -149,55 +167,111 @@ } protected void fillContextMenu(Shell shell, IMenuManager menu) { - menu.add(newServerAction); if( getSelectedServer() != null ) { - menu.add(new Separator()); - menu.add(new DeleteAction(new Shell(), getSelectedServer())); - menu.add(new Separator()); - menu.add(actions[1]); - menu.add(actions[0]); - menu.add(actions[3]); - menu.add(actions[4]); - menu.add(actions[5]); - menu.add(new Separator()); - menu.add(twiddleAction); - menu.add(editLaunchConfigAction); - menu.add(actions[6]); - menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); - twiddleAction.setEnabled(true); - editLaunchConfigAction.setEnabled(true); - } else { - menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS)); + cloneFill(shell, menu); } } + protected void cloneFill(Shell shell, IMenuManager menu) { + + /* Show in ... */ + String text = Messages.actionShowIn; + final IWorkbench workbench = PlatformUI.getWorkbench(); + final IBindingService bindingService = (IBindingService) workbench + .getAdapter(IBindingService.class); + final TriggerSequence[] activeBindings = bindingService + .getActiveBindingsFor("org.eclipse.ui.navigate.showInQuickMenu"); + if (activeBindings.length > 0) { + text += "\t" + activeBindings[0].format(); + } + + menu.add(newServerAction); + menu.add(openAction); + + MenuManager showInMenu = new MenuManager(text); + showInMenu.add(showInConsoleAction); + showInMenu.add(showInDebugAction); + menu.add(showInMenu); + menu.add(new Separator()); + + menu.add(copyAction); + menu.add(pasteAction); + menu.add(deleteAction); + menu.add(renameAction); + + menu.add(new Separator()); + + // server actions + for (int i = 0; i < actions.length; i++) + menu.add(actions[i]); + + menu.add(new Separator()); +// menu.add(actionModifyModules); + + menu.add(twiddleAction); + menu.add(editLaunchConfigAction); + menu.add(actionModifyModules); + twiddleAction.setEnabled(true); + editLaunchConfigAction.setEnabled(true); + + } + public IServer getSelectedServer() { Object o = ((IStructuredSelection)tableViewer.getSelection()).getFirstElement(); return (IServer)o; } public void initializeActions(ISelectionProvider provider) { - Shell shell = site.getShell(); - - createActions(); + createWTPActions(provider); + createCustomActions(); + } + + protected void createWTPActions(ISelectionProvider provider) { + Shell shell = viewSite.getShell(); + IActionBars actionBars = viewSite.getActionBars(); - actions = new Action[] { - // create the start actions - new StartAction(shell, provider, ILaunchManager.DEBUG_MODE), - new StartAction(shell, provider, ILaunchManager.RUN_MODE), - new StartAction(shell, provider, ILaunchManager.PROFILE_MODE), + actions = new Action[6]; + // create the start actions + actions[0] = new StartAction(shell, provider, ILaunchManager.DEBUG_MODE); + actionBars.setGlobalActionHandler("org.eclipse.wst.server.debug", actions[0]); + actions[1] = new StartAction(shell, provider, ILaunchManager.RUN_MODE); + actionBars.setGlobalActionHandler("org.eclipse.wst.server.run", actions[1]); + actions[2] = new StartAction(shell, provider, ILaunchManager.PROFILE_MODE); - // create the stop action - new StopAction(shell, provider), + // create the stop action + actions[3] = new StopAction(shell, provider); + actionBars.setGlobalActionHandler("org.eclipse.wst.server.stop", actions[3]); - // create the publish actions - new PublishAction(shell, provider), - new PublishCleanAction(shell, provider), - new ModuleSloshAction(shell, provider) - }; + // create the publish actions + actions[4] = new PublishAction(shell, provider); + actionBars.setGlobalActionHandler("org.eclipse.wst.server.publish", actions[4]); + actions[5] = new PublishCleanAction(shell, provider); + + // create the open action + openAction = new OpenAction(provider); + actionBars.setGlobalActionHandler("org.eclipse.ui.navigator.Open", openAction); + + // create copy, paste, and delete actions + pasteAction = new PasteAction(shell, provider, tableViewer.clipboard); + copyAction = new CopyAction(provider, tableViewer.clipboard, pasteAction); + deleteAction = new DeleteAction(shell, provider); + renameAction = new RenameAction(shell, tableViewer, provider); + actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction); + actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), pasteAction); + actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), deleteAction); + actionBars.setGlobalActionHandler(ActionFactory.RENAME.getId(), renameAction); + + // create the other actions + actionModifyModules = new ModuleSloshAction(shell, provider); + showInConsoleAction = new ShowInConsoleAction(provider); + showInDebugAction = new ShowInDebugAction(provider); + + // create the properties action + propertiesAction = new PropertiesAction(shell, provider); + actionBars.setGlobalActionHandler(ActionFactory.PROPERTIES.getId(), propertiesAction); } - protected void createActions() { + protected void createCustomActions() { newServerAction = new Action() { public void run() { IAction newServerAction = new NewServerWizardAction(); @@ -260,7 +334,7 @@ } public IAction[] getActionBarActions() { - return new IAction[] { actions[0], actions[1], actions[2], actions[3], actions[4], actions[5] }; + return actions; } public int getDefaultSize() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/ServerTableViewer.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -44,13 +44,12 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; +import org.eclipse.swt.dnd.Clipboard; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Tree; -import org.eclipse.ui.IActionBars; import org.eclipse.ui.IViewSite; -import org.eclipse.ui.actions.ActionFactory; import org.eclipse.wst.server.core.IPublishListener; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerLifecycleListener; @@ -62,8 +61,6 @@ import org.eclipse.wst.server.core.util.PublishAdapter; import org.eclipse.wst.server.ui.internal.Trace; import org.eclipse.wst.server.ui.internal.provisional.UIDecoratorManager; -import org.eclipse.wst.server.ui.internal.view.servers.ServerAction; -import org.eclipse.wst.server.ui.internal.view.servers.ServerActionHelper; import org.eclipse.wst.server.ui.internal.view.servers.ServerTableLabelProvider; /** * Tree view showing servers and their associations. @@ -85,7 +82,7 @@ protected static List starting = new ArrayList(); protected ServerTableLabelProvider2 labelProvider; - //protected ISelectionListener dsListener; + protected Clipboard clipboard; protected IViewSite viewSite; @@ -176,7 +173,8 @@ public ServerTableViewer(final IViewSite site, final Tree tree) { super(tree); this.viewSite = site; - + clipboard = new Clipboard(tree.getDisplay()); + setContentProvider(new TrimmedServerContentProvider()); labelProvider = new ServerTableLabelProvider2(); labelProvider.addListener(new ILabelProviderListener() { @@ -197,11 +195,7 @@ }); setInput(ROOT); - addListeners(); - - IActionBars actionBars = viewSite.getActionBars(); - actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), new ServerAction(getControl().getShell(), this, "Delete it!", ServerActionHelper.ACTION_DELETE)); } protected void addListeners() { @@ -312,7 +306,8 @@ ((Server) servers[i]).removePublishListener(publishListener); } } - + + clipboard.dispose(); super.handleDispose(event); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -687,10 +687,7 @@ } catch (PartInitException e) { IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Unable to display element in editor.", e); Activator.getDefault().getLog().log(status); - } catch( JavaModelException e ) { - IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Unable to display element in editor.", e); - Activator.getDefault().getLog().log(status); - } + } } } Modified: trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java =================================================================== --- trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -30,8 +30,8 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.internal.ui.util.CoreUtility; -import org.eclipse.jdt.internal.ui.wizards.JavaProjectWizardSecondPage; import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jdt.ui.wizards.NewJavaProjectWizardPageTwo; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -160,7 +160,7 @@ IProject project = page.getProjectHandle(); - JavaProjectWizardSecondPage.createProject(project, page.getLocationPath(), monitor); + NewJavaProjectWizardPageTwo.createProject(project, page.getLocationPath(), monitor); monitor.worked(1); IJavaProject javaProject = JavaCore.create(project); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/ModelImages.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -17,7 +17,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.internal.commands.ICommandImageService; +import org.eclipse.ui.commands.ICommandImageService; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.osgi.framework.Bundle; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -36,14 +36,18 @@ private String id; private HashMap map = new HashMap(); + final private String type; private static final String TEXT_DATA = "org.jboss.tools.common.model.ui.forms.Memento.textData.id"; - private Memento() {} + private Memento() { + type = null; + } - public Memento(String id) { + public Memento(String type, String id) { ModelUIPlugin.getPluginLog().logInfo("new Memento("+id+")"); this.id = id; + this.type = type; } /* (non-Javadoc) @@ -57,7 +61,7 @@ * @see org.eclipse.ui.IMemento#createChild(java.lang.String, java.lang.String) */ public IMemento createChild(String type, String id) { - Memento newMemento = new Memento(id); + Memento newMemento = new Memento(type, id); ArrayList list = (ArrayList)map.get(type); if (list==null) { list = new ArrayList(); @@ -219,4 +223,20 @@ } public void store(IResource resource) { } + + public String[] getAttributeKeys() { + return (String[]) map.keySet().toArray(new String[0]); + } + + public Boolean getBoolean(String key) { + return (Boolean)map.get(key); + } + + public void putBoolean(String key, boolean value) { + map.put(key, value); + } + + public String getType() { + return type; + } } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -14,7 +14,9 @@ import java.util.Hashtable; import org.eclipse.ui.IMemento; +import org.w3c.dom.Attr; import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -174,4 +176,34 @@ private Element getElement() { return element; } + + public String[] getAttributeKeys() { + NamedNodeMap map = element.getAttributes(); + int size = map.getLength(); + String[] attributes = new String[size]; + for (int i = 0; i < size; i++) { + Node node = map.item(i); + attributes[i] = node.getNodeName(); + } + return attributes; + + } + + public Boolean getBoolean(String key) { + String attr = getString(key); + if (attr == null) { + return null; + } + return Boolean.valueOf(attr); + } + + public void putBoolean(String key, boolean value) { + putString(key, value ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$ + } + + public String getType() { + return getString(TYPE); + } + + } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/AbstractMultiPageContributor.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -23,6 +23,7 @@ import org.eclipse.ui.ide.IDEActionFactory; import org.eclipse.ui.part.MultiPageEditorActionBarContributor; import org.eclipse.ui.texteditor.*; +import org.eclipse.ui.texteditor.StatusLineContributionItem; import org.eclipse.jface.action.Separator; import org.eclipse.jface.commands.ActionHandler; import org.eclipse.jface.text.IRegion; Deleted: trunk/core/plugins/org.jboss.ide.eclipse.jdt.core/plugin.xml =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.jdt.core/plugin.xml 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/core/plugins/org.jboss.ide.eclipse.jdt.core/plugin.xml 2008-05-08 16:39:33 UTC (rev 8006) @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - - -</plugin> Modified: trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/FieldWizardPage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/FieldWizardPage.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/FieldWizardPage.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -130,7 +130,7 @@ IType type = chooseType(getFragmentType()); if (type != null) { - typeDialogField.setText(JavaModelUtil.getFullyQualifiedName(type)); + typeDialogField.setText(type.getFullyQualifiedName('.')); } } } Modified: trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/MethodWizardPage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/MethodWizardPage.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/MethodWizardPage.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -169,7 +169,7 @@ IType type = chooseType(this.getReturnType()); if (type != null) { - this.typeDialogField.setText(JavaModelUtil.getFullyQualifiedName(type)); + this.typeDialogField.setText(type.getFullyQualifiedName('.')); } } } Modified: trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizard.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizard.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizard.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -67,8 +67,8 @@ { super.addPages(); this.fMainPage = new WizardNewProjectCreationPage("NewProjectCreationWizard");//$NON-NLS-1$ - this.fMainPage.setTitle(NewWizardMessages.JavaProjectWizardFirstPage_page_title);//$NON-NLS-1$ - this.fMainPage.setDescription(NewWizardMessages.JavaProjectWizardFirstPage_page_description);//$NON-NLS-1$ + this.fMainPage.setTitle(NewWizardMessages.NewJavaProjectWizardPageOne_page_title);//$NON-NLS-1$ + this.fMainPage.setDescription(NewWizardMessages.NewJavaProjectWizardPageOne_page_description);//$NON-NLS-1$ this.addPage(fMainPage); this.fJavaPage = this.createProjectWizardPage(fMainPage); Modified: trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizardPage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizardPage.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizardPage.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -92,7 +92,7 @@ { try { - monitor.beginTask(NewWizardMessages.JavaProjectWizardSecondPage_operation_create, 3);//$NON-NLS-1$ + monitor.beginTask(NewWizardMessages.NewJavaProjectWizardPageTwo_operation_create, 3);//$NON-NLS-1$ if (fCurrProject == null) { this.updateProject(true, new SubProgressMonitor(monitor, 1)); @@ -201,7 +201,7 @@ { monitor = new NullProgressMonitor(); } - monitor.beginTask(NewWizardMessages.JavaProjectWizardSecondPage_operation_remove, 3);//$NON-NLS-1$ + monitor.beginTask(NewWizardMessages.NewJavaProjectWizardPageTwo_operation_remove, 3);//$NON-NLS-1$ try { @@ -226,8 +226,8 @@ } catch (InvocationTargetException e) { - String title = NewWizardMessages.JavaProjectWizardSecondPage_error_remove_title;//$NON-NLS-1$ - String message = NewWizardMessages.JavaProjectWizardSecondPage_error_remove_message;//$NON-NLS-1$ + String title = NewWizardMessages.NewJavaProjectWizardPageTwo_error_remove_title;//$NON-NLS-1$ + String message = NewWizardMessages.NewJavaProjectWizardPageTwo_error_remove_message;//$NON-NLS-1$ ExceptionHandler.handle(e, getShell(), title, message); } catch (InterruptedException e) @@ -257,7 +257,7 @@ } try { - monitor.beginTask(NewWizardMessages.JavaProjectWizardSecondPage_operation_initialize, 2);//$NON-NLS-1$ + monitor.beginTask(NewWizardMessages.NewJavaProjectWizardPageTwo_operation_initialize, 2);//$NON-NLS-1$ createProject(fCurrProject, fCurrProjectLocation, new SubProgressMonitor(monitor, 1)); Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/dialogs/ContextValueDialog.java =================================================================== --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/dialogs/ContextValueDialog.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/src/org/jboss/ide/eclipse/freemarker/dialogs/ContextValueDialog.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -120,7 +120,7 @@ if(objects != null && objects.length > 0) { IType type = (IType)objects[0]; - String fullyQualifiedName = JavaModelUtil.getFullyQualifiedName(type); + String fullyQualifiedName = type.getFullyQualifiedName('.'); valueText.setText(type.getFullyQualifiedName()); String[] interfaces = type.getSuperInterfaceNames(); boolean isList = false; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/core/refactoring/HibernateRefactoringUtil.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -251,7 +251,8 @@ transformer = tf.newTransformer(); transformer.transform(domSource, result); return writer.toString();*/ - String newMemento = LaunchingPlugin.serializeDocument(doc); + + String newMemento = DebugPlugin.serializeDocument(doc); return newMemento; } catch (ParserConfigurationException e) { IStatus status = new Status(IStatus.ERROR, HibernateConsolePlugin.ID, error_mess, e); Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -193,19 +193,15 @@ wizard.setDefaultPageTitle(wizard_title); IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - try { - if ( new RefactoringStarter().activate(ref, wizard, win.getShell(), wizard_title, RefactoringSaveHelper.SAVE_ALL)){ //$NON-NLS-1$ - query = newQuery; - position.y = query.length(); - fromEditorPart.doSave(null); - } else { - if (editor.getDocumentProvider() instanceof TextFileDocumentProvider){ - ((TextFileDocumentProvider)editor.getDocumentProvider()).setCanSaveDocument(editor.getEditorInput()); - } - } - } catch (JavaModelException e) { - HibernateConsolePlugin.getDefault().log(e); - } + if ( new RefactoringStarter().activate(wizard, win.getShell(), wizard_title, RefactoringSaveHelper.SAVE_ALL)){ //$NON-NLS-1$ + query = newQuery; + position.y = query.length(); + fromEditorPart.doSave(null); + } else { + if (editor.getDocumentProvider() instanceof TextFileDocumentProvider){ + ((TextFileDocumentProvider)editor.getDocumentProvider()).setCanSaveDocument(editor.getEditorInput()); + } + } } } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -58,9 +58,6 @@ if(part!=null) { EditorUtility.revealInEditor(part, element); } - } catch (JavaModelException e) { - // ignore...TODO? - e.printStackTrace(); } catch (PartInitException e) { // TODO Auto-generated catch block e.printStackTrace(); Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -285,6 +285,18 @@ return parent; } + @Override + public boolean hasAttribute(String attributeName) + throws CoreException { + fail("Method doesn't tested"); + return false; + } + + @Override + public Object removeAttribute(String attributeName) { + fail("Method doesn't tested"); + return null; + } public ILaunchConfiguration getOriginal() { return parent; } @@ -506,6 +518,12 @@ } } + @Override + public boolean hasAttribute(String attributeName) + throws CoreException { + return attributes.containsKey(attributeName); + } + public int getAttribute(String attributeName, int defaultValue) throws CoreException { if (attributes.containsKey(attributeName)){ @@ -630,7 +648,10 @@ public Object getAdapter(Class adapter) { return null; - }}; + } + + + }; } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFContextMenuProvider.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFContextMenuProvider.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/JSFContextMenuProvider.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -55,11 +55,7 @@ private void setActionRegistry(ActionRegistry registry) { actionRegistry = registry; } - - private boolean menuExist() { - return getMenu() != null && !getMenu().isDisposed(); - } - + protected void update(boolean force, boolean recursive) { if(!isDirty() && !force) return; if(!menuExist()) return; Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageContributor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageContributor.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageContributor.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -67,10 +67,9 @@ if(fContentAssistTip == null) { fContentAssistTip = new RetargetTextEditorAction(resourceBundle, - StructuredTextEditorActionConstants.ACTION_NAME_INFORMATION - + StructuredTextEditorActionConstants.UNDERSCORE); + ITextEditorActionConstants.SHOW_INFORMATION); fContentAssistTip - .setActionDefinitionId(ActionDefinitionIds.INFORMATION); + .setActionDefinitionId(ITextEditorActionDefinitionIds.SHOW_INFORMATION); } } @@ -184,7 +183,7 @@ fContentAssistTip .setAction(getAction( textEditor, - StructuredTextEditorActionConstants.ACTION_NAME_INFORMATION)); + ITextEditorActionConstants.SHOW_INFORMATION)); } if (fActiveEditorPart instanceof ITextEditorExtension) { ITextEditorExtension extension = (ITextEditorExtension) fActiveEditorPart; Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/browser/wtp/RunOnServerContext.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -132,7 +132,7 @@ Object launchable = new HttpLaunchable(new URL(lastRunUrl)); IClient[] clients = getClients(server, launchable, launchMode); IClient client = clients[0]; - client.launch(server, launchable, launchMode, ((Server)server).getExistingLaunch()); + client.launch(server, launchable, launchMode, server.getLaunch()); } catch (Exception e) { WebModelPlugin.getPluginLog().logError(e); runJustUrl(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup/WebServerSourceLocator.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup/WebServerSourceLocator.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup/WebServerSourceLocator.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -13,6 +13,7 @@ import java.util.ArrayList; import java.util.List; +import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.debug.core.model.IStackFrame; import org.eclipse.jdt.core.IJavaProject; @@ -29,7 +30,7 @@ */ public class WebServerSourceLocator extends JavaSourceLocator { - public WebServerSourceLocator(IJavaProject[] projects, boolean includeRequired) throws JavaModelException { + public WebServerSourceLocator(IJavaProject[] projects, boolean includeRequired) throws CoreException { super(projects, includeRequired); } Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesContextMenuProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesContextMenuProvider.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/TilesContextMenuProvider.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -57,10 +57,7 @@ actionRegistry = registry; } - private boolean menuExist() { - return getMenu() != null && !getMenu().isDisposed(); - } - + protected void update(boolean force, boolean recursive) { if(!isDirty() && !force) return; if(!menuExist()) return; Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/action/server/SelectServerActionDelegate.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -16,6 +16,7 @@ import org.eclipse.jface.resource.*; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.window.Window; +import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.Image; @@ -24,7 +25,6 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.TaskModel; -import org.eclipse.wst.server.ui.internal.wizard.ClosableWizardDialog; import org.eclipse.wst.server.ui.internal.wizard.NewServerWizard; import org.jboss.tools.common.model.ui.ModelUIImages; import org.jboss.tools.jst.web.server.*; @@ -129,7 +129,7 @@ private void newServer() { NewServerWizard wizard = new NewServerWizard(); - ClosableWizardDialog dialog = new ClosableWizardDialog(window.getShell(), wizard); + WizardDialog dialog = new WizardDialog(window.getShell(), wizard); if (dialog.open() != Window.CANCEL) { IServer server = (IServer)wizard.getRootFragment().getTaskModel().getObject(TaskModel.TASK_SERVER); if(server != null) { Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/appregister/AppRegisterComponent.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -32,7 +32,9 @@ import org.jboss.tools.common.model.ui.attribute.editor.MutableComboBoxFieldEditor; import org.jboss.tools.common.model.ui.attribute.editor.MutableMultipleChoiceFieldEditor; import org.eclipse.jface.window.Window; +import org.eclipse.jface.wizard.WizardDialog; + import org.jboss.tools.common.meta.action.SpecialWizard; import org.jboss.tools.common.meta.action.XEntityData; import org.jboss.tools.common.meta.action.impl.XEntityDataImpl; @@ -357,7 +359,8 @@ private IServer newServer(Shell shell) { NewServerWizard wizard = new NewServerWizard(); - ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wizard); + WizardDialog dialog = new WizardDialog(shell, wizard); + if (dialog.open() == Window.CANCEL) { return null; } @@ -396,7 +399,7 @@ }; TaskWizard wizard = new TaskWizard(title, fragment); wizard.setForcePreviousAndNextButtons(true); - ClosableWizardDialog dialog = new ClosableWizardDialog(shell, wizard); + WizardDialog dialog = new WizardDialog(shell, wizard); int result = dialog.open(); if(Window.OK != result) return null; return (IRuntime)wizard.getRootFragment().getTaskModel().getObject(TaskModel.TASK_RUNTIME); Modified: trunk/legacy/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/META-INF/MANIFEST.MF =================================================================== --- trunk/legacy/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/META-INF/MANIFEST.MF 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/legacy/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/META-INF/MANIFEST.MF 2008-05-08 16:39:33 UTC (rev 8006) @@ -29,7 +29,6 @@ org.eclipse.jst.common.project.facet.core, org.eclipse.wst.common.core, org.eclipse.wst.common.ui, - org.eclipse.wst.common.ui.properties, org.eclipse.emf.ecore, org.eclipse.wst.web, org.eclipse.jst.common.frameworks, Modified: trunk/legacy/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/legacy/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.ui/META-INF/MANIFEST.MF 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/legacy/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.ui/META-INF/MANIFEST.MF 2008-05-08 16:39:33 UTC (rev 8006) @@ -29,7 +29,6 @@ org.eclipse.jst.common.project.facet.core, org.eclipse.wst.common.core, org.eclipse.wst.common.ui, - org.eclipse.wst.common.ui.properties, org.eclipse.emf.ecore, org.eclipse.wst.web, org.eclipse.jst.common.frameworks, Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchQuery.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -27,6 +27,7 @@ import org.eclipse.search.internal.core.text.PatternConstructor; import org.eclipse.search.internal.ui.Messages; import org.eclipse.search.internal.ui.text.FileMatch; +import org.eclipse.search.internal.ui.text.LineElement; import org.eclipse.search.internal.ui.text.SearchResultUpdater; import org.eclipse.search.ui.ISearchQuery; import org.eclipse.search.ui.ISearchResult; @@ -76,10 +77,67 @@ } public boolean acceptPatternMatch(TextSearchMatchAccess matchRequestor) throws CoreException { - fCachedMatches.add(new FileMatch(matchRequestor.getFile(), matchRequestor.getMatchOffset(), matchRequestor.getMatchLength())); + int matchOffset= matchRequestor.getMatchOffset(); + + LineElement lineElement= getLineElement(matchOffset, matchRequestor); + if (lineElement != null) + fCachedMatches.add(new FileMatch(matchRequestor.getFile(), matchRequestor.getMatchOffset(), matchRequestor.getMatchLength(),lineElement)); return true; } + private LineElement getLineElement(int offset, TextSearchMatchAccess matchRequestor) { + int lineNumber= 1; + int lineStart= 0; + if (!fCachedMatches.isEmpty()) { + // match on same line as last? + FileMatch last= (FileMatch) fCachedMatches.get(fCachedMatches.size() - 1); + LineElement lineElement= last.getLineElement(); + if (lineElement.contains(offset)) { + return lineElement; + } + // start with the offset and line information from the last match + lineStart= lineElement.getOffset() + lineElement.getLength(); + lineNumber= lineElement.getLine() + 1; + } + if (offset < lineStart) { + return null; // offset before the last line + } + + int i= lineStart; + int contentLength= matchRequestor.getFileContentLength(); + while (i < contentLength) { + char ch= matchRequestor.getFileContentChar(i++); + if (ch == '\n' || ch == '\r') { + if (ch == '\r' && i < contentLength && matchRequestor.getFileContentChar(i) == '\n') { + i++; + } + if (offset < i) { + String lineContent= getContents(matchRequestor, lineStart, i); // include line delimiter + return new LineElement(matchRequestor.getFile(), lineNumber, lineStart, lineContent); + } + lineNumber++; + lineStart= i; + } + } + if (offset < i) { + String lineContent= getContents(matchRequestor, lineStart, i); // until end of file + return new LineElement(matchRequestor.getFile(), lineNumber, lineStart, lineContent); + } + return null; // offset outside of range + } + + private static String getContents(TextSearchMatchAccess matchRequestor, int start, int end) { + StringBuffer buf= new StringBuffer(); + for (int i= start; i < end; i++) { + char ch= matchRequestor.getFileContentChar(i); + if (Character.isWhitespace(ch) || Character.isISOControl(ch)) { + buf.append(' '); + } else { + buf.append(ch); + } + } + return buf.toString(); + } public boolean acceptSeamDeclarationSourceReferenceMatch(ISeamJavaSourceReference element) throws CoreException { fCachedMatches.add(new SeamElementMatch(element)); return true; Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/search/SeamSearchResultPage.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -11,11 +11,17 @@ package org.jboss.tools.seam.ui.search; +import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.core.IJavaElement; @@ -23,9 +29,13 @@ import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.util.TransferDragSourceListener; import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.IStructuredContentProvider; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; @@ -38,7 +48,7 @@ import org.eclipse.search.internal.ui.text.FileSearchQuery; import org.eclipse.search.internal.ui.text.IFileSearchContentProvider; import org.eclipse.search.internal.ui.text.NewTextSearchActionGroup; -import org.eclipse.search.internal.ui.text.ResourceTransferDragAdapter; + import org.eclipse.search.ui.IContextMenuConstants; import org.eclipse.search.ui.ISearchResultViewPart; import org.eclipse.search.ui.NewSearchUI; @@ -47,6 +57,8 @@ import org.eclipse.search.ui.text.Match; import org.eclipse.search2.internal.ui.OpenSearchPreferencesAction; import org.eclipse.swt.dnd.DND; +import org.eclipse.swt.dnd.DragSourceAdapter; +import org.eclipse.swt.dnd.DragSourceEvent; import org.eclipse.swt.dnd.Transfer; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IMemento; @@ -202,7 +214,7 @@ ((IOpenableElement)match.getElement()).open(); } else if (match.getElement() instanceof IFile) { IFile file= (IFile) match.getElement(); - IEditorPart editor= fEditorOpener.open(file, activate); + IEditorPart editor= fEditorOpener.open(getSite().getPage(),file, activate); offset = match.getOffset(); length = match.getLength(); if (offset != 0 && length != 0) { @@ -388,8 +400,8 @@ if (result != null) { int itemCount= ((IStructuredContentProvider) tv.getContentProvider()).getElements(getInput()).length; int fileCount= getInput().getElements().length; - if (itemCount < fileCount) { - String format= SearchMessages.FileSearchPage_limited_format; + if (itemCount < fileCount) { + String format= SearchMessages.FileSearchPage_limited_format_files; return Messages.format(format, new Object[]{label, new Integer(itemCount), new Integer(fileCount)}); } } @@ -397,4 +409,55 @@ return label; } + /** copy from Eclipse 3.3 org.eclipse.search.internal.ui.text.ResourceTransferDragAdapter */ + /** Maybe NavigatorDragAdopter would be a better alternative. */ + static public class ResourceTransferDragAdapter extends DragSourceAdapter implements TransferDragSourceListener { + + private ISelectionProvider fProvider; + + /** + * Creates a new ResourceTransferDragAdapter for the given selection + * provider. + * + * @param provider the selection provider to access the viewer's selection + */ + public ResourceTransferDragAdapter(ISelectionProvider provider) { + fProvider= provider; + Assert.isNotNull(fProvider); + } + + public Transfer getTransfer() { + return ResourceTransfer.getInstance(); + } + + public void dragStart(DragSourceEvent event) { + event.doit= convertSelection().size() > 0; + } + + public void dragSetData(DragSourceEvent event) { + List resources= convertSelection(); + event.data= resources.toArray(new IResource[resources.size()]); + } + + public void dragFinished(DragSourceEvent event) { + if (!event.doit) + return; + } + + private List convertSelection() { + ISelection s= fProvider.getSelection(); + if (!(s instanceof IStructuredSelection)) + return Collections.EMPTY_LIST; + IStructuredSelection selection= (IStructuredSelection) s; + List result= new ArrayList(selection.size()); + for (Iterator iter= selection.iterator(); iter.hasNext();) { + Object element= iter.next(); + if (element instanceof IResource) { + result.add(element); + } + } + return result; + } + } + } Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring/SeamPropertyRefactoringTest.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -28,16 +28,15 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.internal.corext.refactoring.rename.JavaRenameRefactoring; -import org.eclipse.jdt.internal.corext.refactoring.rename.RenameResourceProcessor; +import org.eclipse.ltk.internal.core.refactoring.resource.RenameResourceProcessor; import org.eclipse.jdt.internal.corext.refactoring.reorg.IConfirmQuery; import org.eclipse.jdt.internal.corext.refactoring.reorg.ICreateTargetQueries; import org.eclipse.jdt.internal.corext.refactoring.reorg.ICreateTargetQuery; import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgQueries; import org.eclipse.jdt.internal.corext.refactoring.reorg.JavaMoveProcessor; +import org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgDestinationFactory; import org.eclipse.jdt.internal.corext.refactoring.reorg.ReorgPolicyFactory; import org.eclipse.jdt.internal.corext.refactoring.reorg.IReorgPolicy.IMovePolicy; -import org.eclipse.jdt.internal.corext.refactoring.structure.JavaMoveRefactoring; import org.eclipse.jdt.internal.corext.refactoring.tagging.INameUpdating; import org.eclipse.jdt.internal.corext.refactoring.tagging.IReferenceUpdating; import org.eclipse.jdt.internal.corext.refactoring.tagging.ITextUpdating; @@ -46,6 +45,8 @@ import org.eclipse.jdt.internal.ui.refactoring.reorg.RenameSelectionState; import org.eclipse.jdt.ui.refactoring.RenameSupport; import org.eclipse.ltk.core.refactoring.RefactoringCore; +import org.eclipse.ltk.core.refactoring.participants.MoveRefactoring; +import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -273,7 +274,7 @@ // init refactoring RenameResourceProcessor processor = new RenameResourceProcessor(resource); - JavaRenameRefactoring refactoring = new JavaRenameRefactoring(processor); + RenameRefactoring refactoring = new RenameRefactoring(processor); ((INameUpdating)refactoring.getAdapter(INameUpdating.class)).setNewElementName(newFolderName); IReferenceUpdating reference = (IReferenceUpdating)refactoring.getAdapter(IReferenceUpdating.class); if(reference != null) { @@ -388,11 +389,12 @@ try { policy = ReorgPolicyFactory.createMovePolicy(new IResource[]{resource}, new IJavaElement[0]); processor = new JavaMoveProcessor(policy); - processor.setDestination(destination); + + processor.setDestination(ReorgDestinationFactory.createDestination(destination)); } catch (JavaModelException e) { JUnitUtils.fail("Exception during perform folder moving: " + folderPath, e); } - JavaMoveRefactoring refactoring = new JavaMoveRefactoring(processor); + MoveRefactoring refactoring = new MoveRefactoring(processor); processor.setCreateTargetQueries(new ICreateTargetQueries(){ public ICreateTargetQuery createNewPackageQuery() { return null; Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/StrutsContextMenuProvider.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/StrutsContextMenuProvider.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/src/org/jboss/tools/struts/ui/editor/StrutsContextMenuProvider.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -59,11 +59,7 @@ private void setActionRegistry(ActionRegistry registry) { // actionRegistry = registry; } - - private boolean menuExist() { - return getMenu() != null && !getMenu().isDisposed(); - } - + protected void update(boolean force, boolean recursive) { if(!isDirty() && !force) return; if(!menuExist()) return; Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/plugin.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/plugin.xml 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/plugin.xml 2008-05-08 16:39:33 UTC (rev 8006) @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - -</plugin> \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteDragSourceListener.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteDragSourceListener.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/PaletteDragSourceListener.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -14,6 +14,7 @@ import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.internal.ui.palette.editparts.*; +import org.eclipse.gef.ui.palette.editparts.PaletteEditPart; import org.eclipse.swt.dnd.*; import org.eclipse.swt.widgets.Display; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/xpl/DrawerAnimationController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/xpl/DrawerAnimationController.java 2008-05-08 16:15:06 UTC (rev 8005) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/src/org/jboss/tools/vpe/ui/palette/xpl/DrawerAnimationController.java 2008-05-08 16:39:33 UTC (rev 8006) @@ -19,7 +19,7 @@ import org.eclipse.gef.internal.ui.palette.editparts.DrawerEditPart; import org.eclipse.gef.internal.ui.palette.editparts.DrawerFigure; -import org.eclipse.gef.internal.ui.palette.editparts.PaletteEditPart; +import org.eclipse.gef.ui.palette.editparts.PaletteEditPart; import org.eclipse.gef.ui.palette.PaletteViewerPreferences; /**