Author: mculpepper(a)jboss.com
Date: 2007-06-18 18:11:18 -0400 (Mon, 18 Jun 2007)
New Revision: 2148
Modified:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java
branches/before-eclipse-3.3/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/.classpath
branches/before-eclipse-3.3/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30ArtifactAdapter.java
Log:
rolling back 3.3 changes (this should've been "before" 3.3, not after)
Modified:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2007-06-18
22:11:18 UTC (rev 2148)
@@ -22,13 +22,11 @@
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:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/ArchivesBuildListener.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/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)
@@ -99,7 +99,7 @@
}
protected static IModule[] getModule(IArchive node) {
ModuleFactory factory =
ServerPlugin.findModuleFactory("org.jboss.ide.eclipse.as.core.PackageModuleFactory");
- IModule mod = factory.findModule(PackageModuleFactory.getID(node), new
NullProgressMonitor());
+ IModule mod = factory.getModule(PackageModuleFactory.getID(node));
return new IModule[] { mod };
}
protected static PackagedModuleDelegate getModuleDelegate(IArchive node) {
Modified:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/packages/types/J2EEArchiveType.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/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)
@@ -62,11 +62,8 @@
}
protected IModule getModule(String projectName) {
- IModuleArtifact moduleArtifacts[] =
ServerPlugin.getModuleArtifacts(getProject(projectName));
-
- if (moduleArtifacts != null && moduleArtifacts.length > 0)
- return moduleArtifacts[0].getModule();
- else return null;
+ IModuleArtifact moduleArtifact =
ServerPlugin.loadModuleArtifact(getProject(projectName));
+ return moduleArtifact == null ? null : moduleArtifact.getModule();
}
protected IProject getProject(String projectName) {
Modified:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs 2007-06-18
22:11:18 UTC (rev 2148)
@@ -1,8 +1,12 @@
-#Mon Jun 18 09:58:51 CDT 2007
+#Wed Aug 30 12:03:55 EDT 2006
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:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PreviewPage.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/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)
@@ -96,8 +96,8 @@
fillWidgets(wizard.getArchive());
// if it's already a module type project, hide the meta inf stuff
- IModuleArtifact moduleArtifacts[] =
ServerPlugin.getModuleArtifacts(wizard.getProject());
- if( moduleArtifacts != null && moduleArtifacts.length > 0) {
+ IModuleArtifact moduleArtifact = ServerPlugin.loadModuleArtifact(wizard.getProject());
+ if( moduleArtifact != null && moduleArtifact.getModule() != null ) {
FormData d = (FormData)previewGroup.getLayoutData();
d.top = new FormAttachment(0,5);
previewGroup.setLayoutData(d);
Modified:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/packages/PublishAction.java 2007-06-18
22:11:18 UTC (rev 2148)
@@ -41,10 +41,12 @@
{
IArchive pkg = (IArchive)node;
String servers = node.getProperty(ArchivesBuildListener.DEPLOY_SERVERS);
- if( !new
Boolean(pkg.getProperty(ArchivesBuildListener.DEPLOY_AFTER_BUILD)).booleanValue() ||
- servers == null || "".equals(servers) || anyServerDoesntExist(servers)){
+
+ if (servers == null || "".equals(servers) || anyServerDoesntExist(servers))
+ {
servers = showSelectServersDialog(pkg);
}
+
ArchivesBuildListener.publish(pkg, servers, IServer.PUBLISH_FULL);
}
}
Modified:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/preferencepages/ViewPreferencePage.java 2007-06-18
22:11:18 UTC (rev 2148)
@@ -170,12 +170,12 @@
}
protected void addEnablementComposite(Composite parent) {
- mainDescriptionLabel = new Label(parent, SWT.WRAP);
- FormData labelData = new FormData();
- labelData.left = new FormAttachment(0,5);
- labelData.right = new FormAttachment(100, -5);
- labelData.top = new FormAttachment(0,5);
- mainDescriptionLabel.setLayoutData(labelData);
+// mainDescriptionLabel = new Label(parent, SWT.WRAP);
+// FormData labelData = new FormData();
+// labelData.left = new FormAttachment(0,5);
+// labelData.right = new FormAttachment(100, -5);
+// labelData.top = new FormAttachment(0,5);
+// mainDescriptionLabel.setLayoutData(labelData);
// mainDescriptionLabel.setText(Messages.ViewExtensionEnablementDescription);
@@ -190,23 +190,17 @@
table = new Table(c, SWT.BORDER);
- FormData tableData = new FormData();
- tableData.left = new FormAttachment(10,5);
- tableData.right = new FormAttachment(100, -5);
- tableData.top = new FormAttachment(0,5);
- tableData.bottom = new FormAttachment(100,0);
- table.setLayoutData(tableData);
-
table.setHeaderVisible(true);
table.setLinesVisible(false);
+
TableColumn column0 = new TableColumn(table, SWT.NONE);
- column0.setText(Messages.ViewPreferencePageName);
+ column0.setText(Messages.ViewPreferencePageEnabled);
TableColumn column1 = new TableColumn(table, SWT.NONE);
- column1.setText(Messages.ViewPreferencePageEnabled);
+ column1.setText(Messages.ViewPreferencePageName);
// TableColumn column2 = new TableColumn(table, SWT.NONE);
// column2.setText(Messages.ViewPreferencePageWeight);
- TableColumn column3 = new TableColumn(table, SWT.NONE);
- column3.setText(Messages.ViewPreferencePageDescription);
+// TableColumn column3 = new TableColumn(table, SWT.NONE);
+// column3.setText(Messages.ViewPreferencePageDescription);
providers = JBossServerUIPlugin.getDefault().getAllServerViewProviders();
int minWidth = 0;
@@ -219,8 +213,8 @@
item.setData(providers[i]);
- item.setText(new String[] {providers[i].getName(), "",
providers[i].getDescription()});
- item.setImage(providers[i].getImage());
+ item.setText(new String[] {"", providers[i].getName()});
+ item.setImage(1, providers[i].getImage());
final Button b = new Button(table, SWT.CHECK);
enabledButtons.add(b);
@@ -233,7 +227,7 @@
editor.minimumHeight = size.y;
editor.horizontalAlignment = SWT.CENTER;
editor.verticalAlignment = SWT.CENTER;
- editor.setEditor(b, item , 1);
+ editor.setEditor(b, item , 0);
b.addSelectionListener(new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
}
@@ -271,26 +265,31 @@
column1.setWidth(column1.getWidth() + minWidth);
// column2.pack();
// column2.setWidth(column2.getWidth() + minWidth);
- column3.pack();
- column3.setWidth(column3.getWidth() + minWidth);
-
-
-
+// column3.pack();
+// column3.setWidth(column3.getWidth() + minWidth);
+
moveUp = new Button(c, SWT.PUSH);
moveDown = new Button(c, SWT.PUSH);
moveUp.setText("Move Up");
moveDown.setText("Move Down");
+ FormData tableData = new FormData();
+ tableData.left = new FormAttachment(0,5);
+ tableData.right = new FormAttachment(moveDown, -5);
+ tableData.top = new FormAttachment(0,5);
+ tableData.bottom = new FormAttachment(100,0);
+ table.setLayoutData(tableData);
+
FormData moveUpData = new FormData();
- moveUpData.left = new FormAttachment(0,0);
- moveUpData.right = new FormAttachment(table, -5);
- moveUpData.top = new FormAttachment(30,0);
+ moveUpData.left = new FormAttachment(table, 5);
+ moveUpData.right = new FormAttachment(100, -5);
+ moveUpData.top = new FormAttachment(0,5);
+
moveUp.setLayoutData(moveUpData);
FormData moveDownData = new FormData();
- moveDownData.left = new FormAttachment(0,0);
- moveDownData.right = new FormAttachment(table, -5);
+ moveDownData.right = new FormAttachment(100, -5);
moveDownData.top = new FormAttachment(moveUp, 5);
moveDown.setLayoutData(moveDownData);
@@ -327,6 +326,7 @@
}
});
}
+
protected void enableMoveButtons() {
int index = table.getSelectionIndex();
int length = table.getItemCount();
@@ -341,6 +341,7 @@
moveDown.setEnabled(true);
}
}
+
protected void move(int selectedIndex, int swapIndex) {
TableItem selected = table.getItem(selectedIndex);
TableItem above = table.getItem(swapIndex);
@@ -371,6 +372,7 @@
table.setSelection(swapIndex);
}
+
protected void addExtensionPreferencePages(Composite parent) {
preferenceCompositeDescriptionLabel = new Label(parent, SWT.WRAP);
@@ -390,16 +392,13 @@
scData.bottom = new FormAttachment(100, -5);
sc.setLayoutData(scData);
-
Composite sub = new Composite(sc, SWT.NONE);
sc.setContent(sub);
sub.setLayout(new FillLayout());
book = new PageBook(sub, SWT.NONE);
-
-
- ServerViewProvider[] providers =
JBossServerUIPlugin.getDefault().getAllServerViewProviders();
+ ServerViewProvider[] providers =
JBossServerUIPlugin.getDefault().getAllServerViewProviders();
for( int i = 0; i < providers.length; i++ ) {
Group g = new Group(book, SWT.NONE);
@@ -411,8 +410,6 @@
providerToGroup.put(providers[i], g);
}
-
-
// force a layout
sub.pack();
//sub.layout();
@@ -422,8 +419,7 @@
int sY = sub.getSize().y;
int sX = sub.getSize().x;
-
- sc.setExpandHorizontal(true);
+ sc.setExpandHorizontal(true);
sc.setExpandVertical(true);
sc.setMinHeight(locY + sY);
sc.setMinWidth(locX + sX);
@@ -439,14 +435,8 @@
Button enabled = new Button(this, SWT.CHECK);
enabled.setText(Messages.ViewPreferencePageEnabled);
enabled.setSelection(provider.isEnabled());
-
-
-
}
-
}
- public void init(IWorkbench workbench) {
- }
-
+ public void init(IWorkbench workbench) {}
}
Modified:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerView.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/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)
@@ -15,7 +15,6 @@
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;
@@ -73,8 +72,6 @@
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:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/StrippedServerView.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/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)
@@ -10,6 +10,7 @@
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;
@@ -17,6 +18,7 @@
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;
@@ -33,14 +35,17 @@
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.PublishCleanAction;
+import org.eclipse.wst.server.ui.internal.view.servers.RestartAction;
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";
@@ -175,123 +180,105 @@
*/
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));
- 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);
+ // 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);
+ 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
- actions[3] = new StopAction(shell, provider);
+ 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 publish actions
- actions[4] = new PublishAction(shell, provider);
- actions[5] = new PublishCleanAction(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));
+ 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:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/DescriptorXPathViewProvider.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/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)
@@ -27,10 +27,9 @@
import java.util.Arrays;
import java.util.HashMap;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
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;
@@ -86,7 +85,7 @@
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.internal.editors.text.JavaFileEditorInput;
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;
@@ -326,15 +325,12 @@
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( eclipseFile != null ) {
- IEditorInput input = new FileEditorInput(eclipseFile);
+ IFileStore fileStore= EFS.getLocalFileSystem().fromLocalFile(file);
+ if( fileStore != null ) {
+ IEditorInput input = new JavaFileEditorInput(fileStore);
IEditorDescriptor desc = PlatformUI.getWorkbench().
getEditorRegistry().getDefaultEditor(file.getName());
page.openEditor(input, desc.getId());
Modified:
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java
===================================================================
---
branches/before-eclipse-3.3/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/FilesetViewProvider.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/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)
@@ -9,8 +9,6 @@
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;
@@ -51,8 +49,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;
@@ -146,14 +144,12 @@
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( eclipseFile != null ) {
- IEditorInput input = new FileEditorInput(eclipseFile);
+ IFileStore fileStore= EFS.getLocalFileSystem().fromLocalFile(file);
+ if( fileStore != null ) {
+ IEditorInput input = new JavaFileEditorInput(fileStore);
IEditorDescriptor desc = PlatformUI.getWorkbench().
getEditorRegistry().getDefaultEditor(file.getName());
if( desc != null )
@@ -464,11 +460,10 @@
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( eclipseFile != null ) {
- IEditorInput input = new FileEditorInput(eclipseFile);
+ if( fileStore != null ) {
+ IEditorInput input = new JavaFileEditorInput(fileStore);
IEditorDescriptor desc = PlatformUI.getWorkbench().
getEditorRegistry().getDefaultEditor(file.getName());
if( input != null && desc != null )
Modified:
branches/before-eclipse-3.3/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/.classpath
===================================================================
---
branches/before-eclipse-3.3/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/.classpath 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/.classpath 2007-06-18
22:11:18 UTC (rev 2148)
@@ -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:
branches/before-eclipse-3.3/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30ArtifactAdapter.java
===================================================================
---
branches/before-eclipse-3.3/ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/core/module/Ejb30ArtifactAdapter.java 2007-06-18
16:34:15 UTC (rev 2147)
+++
branches/before-eclipse-3.3/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)
@@ -22,7 +22,6 @@
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;
@@ -59,7 +58,7 @@
if( jp != null ) {
ModuleFactory mf = getModuleFactory();
- IModule mod = mf.findModule(jp.getElementName(), new NullProgressMonitor());
+ IModule mod = mf.getModule(jp.getElementName());
if( mod != null ) {
return wrap(mod);
}