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

Author: mculpepper(a)jboss.com Date: 2007-06-18 18:14:46 -0400 (Mon, 18 Jun 2007) New Revision: 2149 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java trunk/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/.classpath trunk/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30ArtifactAdapter.java Log: 3.3 changes should've been in trunk, d'oh! Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2007-06-18 22:14:46 UTC (rev 2149) @@ -22,11 +22,13 @@ org.apache.ant Eclipse-LazyStart: true Export-Package: org.jboss.ide.eclipse.as.core, + org.jboss.ide.eclipse.as.core.client, org.jboss.ide.eclipse.as.core.model, org.jboss.ide.eclipse.as.core.packages, org.jboss.ide.eclipse.as.core.packages.types, org.jboss.ide.eclipse.as.core.publishers, org.jboss.ide.eclipse.as.core.runtime, + org.jboss.ide.eclipse.as.core.runtime.internal, org.jboss.ide.eclipse.as.core.runtime.server, org.jboss.ide.eclipse.as.core.runtime.server.polling, org.jboss.ide.eclipse.as.core.server, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java 2007-06-18 22:14:46 UTC (rev 2149) @@ -99,7 +99,7 @@ } protected static IModule[] getModule(IArchive node) { ModuleFactory factory = ServerPlugin.findModuleFactory("org.jboss.ide.eclipse.as.core.PackageModuleFactory"); - IModule mod = factory.getModule(PackageModuleFactory.getID(node)); + IModule mod = factory.findModule(PackageModuleFactory.getID(node), new NullProgressMonitor()); return new IModule[] { mod }; } protected static PackagedModuleDelegate getModuleDelegate(IArchive node) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java 2007-06-18 22:14:46 UTC (rev 2149) @@ -62,8 +62,11 @@ } protected IModule getModule(String projectName) { - IModuleArtifact moduleArtifact = ServerPlugin.loadModuleArtifact(getProject(projectName)); - return moduleArtifact == null ? null : moduleArtifact.getModule(); + IModuleArtifact moduleArtifacts[] = ServerPlugin.getModuleArtifacts(getProject(projectName)); + + if (moduleArtifacts != null && moduleArtifacts.length > 0) + return moduleArtifacts[0].getModule(); + else return null; } protected IProject getProject(String projectName) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs 2007-06-18 22:14:46 UTC (rev 2149) @@ -1,12 +1,8 @@ -#Wed Aug 30 12:03:55 EDT 2006 +#Mon Jun 18 09:58:51 CDT 2007 eclipse.preferences.version=1 +instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.source=1.3 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java 2007-06-18 22:14:46 UTC (rev 2149) @@ -96,8 +96,8 @@ fillWidgets(wizard.getArchive()); // if it's already a module type project, hide the meta inf stuff - IModuleArtifact moduleArtifact = ServerPlugin.loadModuleArtifact(wizard.getProject()); - if( moduleArtifact != null && moduleArtifact.getModule() != null ) { + IModuleArtifact moduleArtifacts[] = ServerPlugin.getModuleArtifacts(wizard.getProject()); + if( moduleArtifacts != null && moduleArtifacts.length > 0) { FormData d = (FormData)previewGroup.getLayoutData(); d.top = new FormAttachment(0,5); previewGroup.setLayoutData(d); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-06-18 22:14:46 UTC (rev 2149) @@ -15,6 +15,7 @@ import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.graphics.Color; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -72,6 +73,8 @@ public void createPartControl(Composite parent) { form = new SashForm(parent, SWT.VERTICAL); + form.setBackground(new Color(parent.getDisplay(), 255, 255, 255)); + form.setLayout(new FillLayout()); addServerViewer(form); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java 2007-06-18 22:14:46 UTC (rev 2149) @@ -10,7 +10,6 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.viewers.ISelectionProvider; -import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; @@ -18,7 +17,6 @@ import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tree; @@ -35,17 +33,14 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.internal.Trace; import org.eclipse.wst.server.ui.internal.ContextIds; -import org.eclipse.wst.server.ui.internal.ImageResource; 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.ModuleSloshAction; import org.eclipse.wst.server.ui.internal.view.servers.PublishAction; -import org.eclipse.wst.server.ui.internal.view.servers.RestartAction; +import org.eclipse.wst.server.ui.internal.view.servers.PublishCleanAction; 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.ui.JBossServerUISharedImages; -import org.jboss.ide.eclipse.as.ui.dialogs.TwiddleDialog; public class StrippedServerView extends ViewPart { private static final String TAG_COLUMN_WIDTH = "columnWidth"; @@ -180,105 +175,123 @@ */ public void initializeActions(ISelectionProvider provider) { Shell shell = getSite().getShell(); - - // create the debug action - Action debugAction = new StartAction(shell, provider, "debug", ILaunchManager.DEBUG_MODE); - debugAction.setToolTipText(Messages.actionDebugToolTip); - debugAction.setText(Messages.actionDebug); - debugAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_DEBUG)); - debugAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_DEBUG)); - debugAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_DEBUG)); - - // create the start action - Action runAction = new StartAction(shell, provider, "start", ILaunchManager.RUN_MODE); - runAction.setToolTipText(Messages.actionStartToolTip); - runAction.setText(Messages.actionStart); - runAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START)); - runAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START)); - runAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START)); - // create the profile action - Action profileAction = new StartAction(shell, provider, "profile", ILaunchManager.PROFILE_MODE); - profileAction.setToolTipText(Messages.actionProfileToolTip); - profileAction.setText(Messages.actionProfile); - profileAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_PROFILE)); - profileAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_PROFILE)); - profileAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_PROFILE)); - - // create the restart menu - restartMenu = new MenuManager(Messages.actionRestart); + actions = new Action[6]; + // create the start actions + actions[0] = new StartAction(shell, provider, ILaunchManager.DEBUG_MODE); + actions[1] = new StartAction(shell, provider, ILaunchManager.RUN_MODE); + actions[2] = new StartAction(shell, provider, ILaunchManager.PROFILE_MODE); - Action restartAction = new RestartAction(shell, provider, "restartDebug", ILaunchManager.DEBUG_MODE); - restartAction.setToolTipText(Messages.actionDebugToolTip); - restartAction.setText(Messages.actionDebug); - restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_DEBUG)); - restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_DEBUG)); - restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_DEBUG)); - restartMenu.add(restartAction); - - restartAction = new RestartAction(shell, provider, "restartRun", ILaunchManager.RUN_MODE); - restartAction.setToolTipText(Messages.actionRestartToolTip); - restartAction.setText(Messages.actionStart); - restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START)); - restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START)); - restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START)); - restartMenu.add(restartAction); - - restartAction = new RestartAction(shell, provider, "restartProfile", ILaunchManager.PROFILE_MODE); - restartAction.setToolTipText(Messages.actionRestartToolTip); - restartAction.setText(Messages.actionProfile); - restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_PROFILE)); - restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_PROFILE)); - restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_PROFILE)); - restartMenu.add(restartAction); - - // create the restart action - restartAction = new RestartAction(shell, provider, "restart"); - restartAction.setToolTipText(Messages.actionRestartToolTip); - restartAction.setText(Messages.actionRestart); - restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_RESTART)); - restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_RESTART)); - restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_RESTART)); - // create the stop action - Action stopAction = new StopAction(shell, provider, "stop"); - stopAction.setToolTipText(Messages.actionStopToolTip); - stopAction.setText(Messages.actionStop); - stopAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_STOP)); - stopAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_STOP)); - stopAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_STOP)); - - // create the publish action - Action publishAction = new PublishAction(shell, provider, "publish"); - publishAction.setToolTipText(Messages.actionPublishToolTip); - publishAction.setText(Messages.actionPublish); - publishAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_PUBLISH)); - publishAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_PUBLISH)); - publishAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_PUBLISH)); + actions[3] = new StopAction(shell, provider); - // create the module slosh dialog action - Action addModuleAction = new ModuleSloshAction(shell, provider, "modules"); - addModuleAction.setToolTipText(Messages.actionModifyModulesToolTip); - addModuleAction.setText(Messages.actionModifyModules); - addModuleAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ETOOL_MODIFY_MODULES)); - addModuleAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CTOOL_MODIFY_MODULES)); - addModuleAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DTOOL_MODIFY_MODULES)); + // create the publish actions + actions[4] = new PublishAction(shell, provider); + actions[5] = new PublishCleanAction(shell, provider); - actions = new Action[7]; - actions[0] = debugAction; - actions[1] = runAction; - actions[2] = profileAction; - actions[3] = restartAction; - actions[4] = stopAction; - actions[5] = publishAction; - actions[6] = addModuleAction; - // add toolbar buttons IContributionManager cm = getViewSite().getActionBars().getToolBarManager(); - for (int i = 0; i < actions.length - 1; i++) { + for (int i = 0; i < actions.length - 1; i++) cm.add(actions[i]); - } +// // create the debug action +// Action debugAction = new StartAction(shell, provider, ILaunchManager.DEBUG_MODE); +// debugAction.setToolTipText(Messages.actionDebugToolTip); +// debugAction.setText(Messages.actionDebug); +// debugAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_DEBUG)); +// debugAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_DEBUG)); +// debugAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_DEBUG)); +// +// // create the start action +// Action runAction = new StartAction(shell, provider, ILaunchManager.RUN_MODE); +// runAction.setToolTipText(Messages.actionStartToolTip); +// runAction.setText(Messages.actionStart); +// runAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START)); +// runAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START)); +// runAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START)); +// +// // create the profile action +// Action profileAction = new StartAction(shell, provider, ILaunchManager.PROFILE_MODE); +// profileAction.setToolTipText(Messages.actionProfileToolTip); +// profileAction.setText(Messages.actionProfile); +// profileAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_PROFILE)); +// profileAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_PROFILE)); +// profileAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_PROFILE)); +// +// // create the restart menu +// restartMenu = new MenuManager(Messages.actionRestart); +// +// Action restartAction = new RestartAction(shell, provider, ILaunchManager.DEBUG_MODE); +// restartAction.setToolTipText(Messages.actionDebugToolTip); +// restartAction.setText(Messages.actionDebug); +// restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_DEBUG)); +// restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_DEBUG)); +// restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_DEBUG)); +// restartMenu.add(restartAction); +// +// restartAction = new RestartAction(shell, provider, ILaunchManager.RUN_MODE); +// restartAction.setToolTipText(Messages.actionRestartToolTip); +// restartAction.setText(Messages.actionStart); +// restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START)); +// restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START)); +// restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START)); +// restartMenu.add(restartAction); +// +// restartAction = new RestartAction(shell, provider, "restartProfile", ILaunchManager.PROFILE_MODE); +// restartAction.setToolTipText(Messages.actionRestartToolTip); +// restartAction.setText(Messages.actionProfile); +// restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_START_PROFILE)); +// restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_START_PROFILE)); +// restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_START_PROFILE)); +// restartMenu.add(restartAction); +// +// // create the restart action +// restartAction = new RestartAction(shell, provider, "restart"); +// restartAction.setToolTipText(Messages.actionRestartToolTip); +// restartAction.setText(Messages.actionRestart); +// restartAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_RESTART)); +// restartAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_RESTART)); +// restartAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_RESTART)); +// +// // create the stop action +// Action stopAction = new StopAction(shell, provider, "stop"); +// stopAction.setToolTipText(Messages.actionStopToolTip); +// stopAction.setText(Messages.actionStop); +// stopAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_STOP)); +// stopAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_STOP)); +// stopAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_STOP)); +// +// // create the publish action +// Action publishAction = new PublishAction(shell, provider, "publish"); +// publishAction.setToolTipText(Messages.actionPublishToolTip); +// publishAction.setText(Messages.actionPublish); +// publishAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ELCL_PUBLISH)); +// publishAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CLCL_PUBLISH)); +// publishAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DLCL_PUBLISH)); +// +// // create the module slosh dialog action +// Action addModuleAction = new ModuleSloshAction(shell, provider, "modules"); +// addModuleAction.setToolTipText(Messages.actionModifyModulesToolTip); +// addModuleAction.setText(Messages.actionModifyModules); +// addModuleAction.setImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_ETOOL_MODIFY_MODULES)); +// addModuleAction.setHoverImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_CTOOL_MODIFY_MODULES)); +// addModuleAction.setDisabledImageDescriptor(ImageResource.getImageDescriptor(ImageResource.IMG_DTOOL_MODIFY_MODULES)); +// +// actions = new Action[7]; +// actions[0] = debugAction; +// actions[1] = runAction; +// actions[2] = profileAction; +// actions[3] = restartAction; +// actions[4] = stopAction; +// actions[5] = publishAction; +// actions[6] = addModuleAction; +// +// // add toolbar buttons +// IContributionManager cm = getViewSite().getActionBars().getToolBarManager(); +// for (int i = 0; i < actions.length - 1; i++) { +// cm.add(actions[i]); +// } + newServerAction = new Action() { public void run() { IAction newServerAction = new NewServerWizardAction(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java 2007-06-18 22:14:46 UTC (rev 2149) @@ -27,9 +27,10 @@ import java.util.Arrays; import java.util.HashMap; -import org.eclipse.core.filesystem.EFS; -import org.eclipse.core.filesystem.IFileStore; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; @@ -85,7 +86,7 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.internal.editors.text.JavaFileEditorInput; +import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.model.DescriptorModel.ServerDescriptorModel.XPathTreeItem; @@ -325,12 +326,15 @@ try { Object o = getPropertySelection(); File file = ((XPathTreeItem)o).getFile(); + IFile eclipseFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(file.getAbsolutePath())); + IWorkbench wb = PlatformUI.getWorkbench(); IWorkbenchWindow win = wb.getActiveWorkbenchWindow(); IWorkbenchPage page = win.getActivePage(); - IFileStore fileStore= EFS.getLocalFileSystem().fromLocalFile(file); - if( fileStore != null ) { - IEditorInput input = new JavaFileEditorInput(fileStore); +// IFileStore fileStore= EFS.getLocalFileSystem().fromLocalFile(file); + + if( eclipseFile != null ) { + IEditorInput input = new FileEditorInput(eclipseFile); IEditorDescriptor desc = PlatformUI.getWorkbench(). getEditorRegistry().getDefaultEditor(file.getName()); page.openEditor(input, desc.getId()); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2007-06-18 22:14:46 UTC (rev 2149) @@ -9,6 +9,8 @@ import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; @@ -49,8 +51,8 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.internal.editors.text.JavaFileEditorInput; import org.eclipse.ui.internal.util.SWTResourceUtil; +import org.eclipse.ui.part.FileEditorInput; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.archives.core.model.ArchivesModelCore; import org.jboss.ide.eclipse.archives.ui.util.composites.FilesetPreviewComposite; @@ -144,12 +146,14 @@ try { PathWrapper wrapper = (PathWrapper)selection; File file = wrapper.getPath().toFile(); + IFile eclipseFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(file.getAbsolutePath())); + IWorkbench wb = PlatformUI.getWorkbench(); IWorkbenchWindow win = wb.getActiveWorkbenchWindow(); IWorkbenchPage page = win.getActivePage(); - IFileStore fileStore= EFS.getLocalFileSystem().fromLocalFile(file); - if( fileStore != null ) { - IEditorInput input = new JavaFileEditorInput(fileStore); +// IFileStore fileStore= EFS.getLocalFileSystem().fromLocalFile(file); + if( eclipseFile != null ) { + IEditorInput input = new FileEditorInput(eclipseFile); IEditorDescriptor desc = PlatformUI.getWorkbench(). getEditorRegistry().getDefaultEditor(file.getName()); if( desc != null ) @@ -460,10 +464,11 @@ menu.add(deleteFilter); } else if( selection instanceof PathWrapper ) { File file = ((PathWrapper)selection).getPath().toFile(); + IFile eclipseFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(file.getAbsolutePath())); IFileStore fileStore= EFS.getLocalFileSystem().fromLocalFile(file); boolean editable = false; - if( fileStore != null ) { - IEditorInput input = new JavaFileEditorInput(fileStore); + if( eclipseFile != null ) { + IEditorInput input = new FileEditorInput(eclipseFile); IEditorDescriptor desc = PlatformUI.getWorkbench(). getEditorRegistry().getDefaultEditor(file.getName()); if( input != null && desc != null ) Modified: trunk/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/.classpath =================================================================== --- trunk/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/.classpath 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/.classpath 2007-06-18 22:14:46 UTC (rev 2149) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"></classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: trunk/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30ArtifactAdapter.java =================================================================== --- trunk/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30ArtifactAdapter.java 2007-06-18 22:11:18 UTC (rev 2148) +++ trunk/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30ArtifactAdapter.java 2007-06-18 22:14:46 UTC (rev 2149) @@ -22,6 +22,7 @@ package org.jboss.ide.eclipse.ejb3.core.module; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.wst.server.core.IModule; @@ -58,7 +59,7 @@ if( jp != null ) { ModuleFactory mf = getModuleFactory(); - IModule mod = mf.getModule(jp.getElementName()); + IModule mod = mf.findModule(jp.getElementName(), new NullProgressMonitor()); if( mod != null ) { return wrap(mod); }