JBoss Tools SVN: r35894 - branches/jbosstools-3.3.0.M4/jsf/docs/jsf_tools_tutorial.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-10-21 06:14:25 -0400 (Fri, 21 Oct 2011)
New Revision: 35894
Removed:
branches/jbosstools-3.3.0.M4/jsf/docs/jsf_tools_tutorial/jsf_tools_tutorial
Log:
remove broken docs content
Deleted: branches/jbosstools-3.3.0.M4/jsf/docs/jsf_tools_tutorial/jsf_tools_tutorial
===================================================================
--- branches/jbosstools-3.3.0.M4/jsf/docs/jsf_tools_tutorial/jsf_tools_tutorial 2011-10-21 09:54:30 UTC (rev 35893)
+++ branches/jbosstools-3.3.0.M4/jsf/docs/jsf_tools_tutorial/jsf_tools_tutorial 2011-10-21 10:14:25 UTC (rev 35894)
@@ -1 +0,0 @@
-link /shared/JBossToolsDocs/trunk/jsf/docs/jsf_tools_tutorial/
\ No newline at end of file
14 years, 5 months
JBoss Tools SVN: r35893 - in trunk/documentation/whatsnew/vpe: images and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-10-21 05:54:30 -0400 (Fri, 21 Oct 2011)
New Revision: 35893
Added:
trunk/documentation/whatsnew/vpe/images/3.3.0.M4/
trunk/documentation/whatsnew/vpe/images/3.3.0.M4/8950.png
trunk/documentation/whatsnew/vpe/images/3.3.0.M4/9674.png
trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M4.html
Log:
https://issues.jboss.org/browse/JBIDE-9966 , N&N for VPE for 3.3.0.M4 were added.
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M4
___________________________________________________________________
Added: bugtraq:number
+ true
Added: trunk/documentation/whatsnew/vpe/images/3.3.0.M4/8950.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M4/8950.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/images/3.3.0.M4/9674.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/vpe/images/3.3.0.M4/9674.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M4.html
===================================================================
--- trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M4.html (rev 0)
+++ trunk/documentation/whatsnew/vpe/vpe-news-3.3.0.M4.html 2011-10-21 09:54:30 UTC (rev 35893)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>What's New Visual Page Editor 3.3.0.M4</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>What's New Visual Page Editor 3.3.0.M4</h1>
+
+<p align="right">
+<a href="../index.html">< Main Index</a>
+<a href="../cdi/cdi-news-3.3.0.M4.html">CDI/Seam 3 Tools ></a>
+</p>
+
+<table border="0" cellpadding="10" cellspacing="0">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>Editor</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <b><p>
+ Special characters in Externalize Strings wizard
+ <p></b>
+ </td>
+ <td valign="top">
+ <p>Displaying EOL, CR, LF and whitespae characters was updated.</p>
+ <p><img src="images/3.3.0.M4/9674.png" alt="non-ASCII characters" /></p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-9674">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <b><p>
+ RichFaces 4 are fully supported.
+ <p></b>
+ </td>
+ <td valign="top">
+ <p>Visual Page Editor now displays all the RichFaces 4 tags. Missing rich:collapsibleSubTable, rich:collapsibleSubTableToggler, rich:dragSource, rich:dropTarget, rich:hashParam, rich:treeModelAdaptor, rich:treeModelRecursiveAdaptor, rich:treeSelectionChangeListener, rich:treeToggleListener, rich:validator were added.</p>
+ <p><img src="images/3.3.0.M4/8950.png" alt="Actual Run-Time Folders" /></p>
+ <p><small>
+ <a href="https://jira.jboss.org/jira/browse/JBIDE-8950">Related Jira</a>
+ </small></p>
+ </td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
14 years, 5 months
JBoss Tools SVN: r35892 - in branches/jbosstools-3.3.0.M4/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-21 05:12:36 -0400 (Fri, 21 Oct 2011)
New Revision: 35892
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
Log:
JBIDE-9711 - osgi project deployment errors for m4
Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java 2011-10-21 08:50:05 UTC (rev 35891)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/OSGiPublisher.java 2011-10-21 09:12:36 UTC (rev 35892)
@@ -5,6 +5,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.internal.core.exports.FeatureExportInfo;
import org.eclipse.pde.internal.core.exports.PluginExportOperation;
@@ -39,6 +40,9 @@
IDeployableServer server2 = ServerConverter.getDeployableServer(server);
IPath destination = PublishUtil.getDeployPath(method, module, server2);
String remoteTempDeployRoot = getDeployRoot(module, ServerConverter.getDeployableServer(server));
+ if( new Path(remoteTempDeployRoot).toFile().exists())
+ new Path(remoteTempDeployRoot).toFile().mkdirs();
+
IPath presumedSourcePath = PublishUtil.getDeployPath(module, remoteTempDeployRoot, server2);
String name = presumedSourcePath.lastSegment();
IPath realSourcePathFolder = presumedSourcePath.removeLastSegments(1).append("plugins"); //$NON-NLS-1$
Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-21 08:50:05 UTC (rev 35891)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2011-10-21 09:12:36 UTC (rev 35892)
@@ -263,6 +263,8 @@
suffix = ""; //$NON-NLS-1$
else if( "jst.jboss.sar".equals(type)) //$NON-NLS-1$
suffix = IWTPConstants.EXT_SAR;
+ if( suffix == null )
+ suffix = IWTPConstants.EXT_JAR;
return suffix;
}
14 years, 5 months
JBoss Tools SVN: r35891 - branches/jbosstools-3.3.0.M4/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-21 04:50:05 -0400 (Fri, 21 Oct 2011)
New Revision: 35891
Modified:
branches/jbosstools-3.3.0.M4/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java
Log:
JBIDE-9991 : applied patch. Fixes NPE occuring during search for best runtime
Modified: branches/jbosstools-3.3.0.M4/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java
===================================================================
--- branches/jbosstools-3.3.0.M4/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2011-10-21 08:05:18 UTC (rev 35890)
+++ branches/jbosstools-3.3.0.M4/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2011-10-21 08:50:05 UTC (rev 35891)
@@ -201,7 +201,7 @@
for (int i = 0; i < runtimes.length; i++) {
IRuntime runtime = runtimes[i];
IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType.getId().equals(allowedType)) {
+ if (runtimeType != null && runtimeType.getId().equals(allowedType)) {
IRuntime componentPresent = isComponentPresent(fix, runtime);
if (componentPresent != null) {
return isComponentPresent(fix, runtime);
14 years, 5 months
JBoss Tools SVN: r35890 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-21 04:05:18 -0400 (Fri, 21 Oct 2011)
New Revision: 35890
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java
Log:
Removed unnecessary call to isComponentPresent(fix, runtime)
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2011-10-21 07:52:34 UTC (rev 35889)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2011-10-21 08:05:18 UTC (rev 35890)
@@ -204,7 +204,7 @@
if (runtimeType != null && runtimeType.getId().equals(allowedType)) {
IRuntime componentPresent = isComponentPresent(fix, runtime);
if (componentPresent != null) {
- return isComponentPresent(fix, runtime);
+ return componentPresent;
}
}
}
14 years, 5 months
JBoss Tools SVN: r35889 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-21 03:52:34 -0400 (Fri, 21 Oct 2011)
New Revision: 35889
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java
Log:
JBIDE-9991 : fix NPE in searching for best runtime
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2011-10-21 07:25:09 UTC (rev 35888)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/fixes/WTPRuntimeFix.java 2011-10-21 07:52:34 UTC (rev 35889)
@@ -201,7 +201,7 @@
for (int i = 0; i < runtimes.length; i++) {
IRuntime runtime = runtimes[i];
IRuntimeType runtimeType = runtime.getRuntimeType();
- if (runtimeType.getId().equals(allowedType)) {
+ if (runtimeType != null && runtimeType.getId().equals(allowedType)) {
IRuntime componentPresent = isComponentPresent(fix, runtime);
if (componentPresent != null) {
return isComponentPresent(fix, runtime);
14 years, 5 months
JBoss Tools SVN: r35888 - branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-21 03:25:09 -0400 (Fri, 21 Oct 2011)
New Revision: 35888
Modified:
branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-9953 - updating count and messages for commit and push openshift publish
Modified: branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-21 07:21:28 UTC (rev 35887)
+++ branches/jbosstools-3.3.0.M4/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-21 07:25:09 UTC (rev 35888)
@@ -45,31 +45,34 @@
IProject p = module[module.length-1].getProject();
int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
if( changed == 0 || (kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL)) {
- if( changed != 0 && requestCommitAndPushApproval(module)) {
+ if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
monitor.beginTask("Publishing " + p.getName(), 200);
EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
monitor.done();
+ return IServer.PUBLISH_STATE_NONE;
} else if( changed == 0 && requestPushApproval(module)) {
monitor.beginTask("Publishing " + p.getName(), 100);
EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
monitor.done();
+ return IServer.PUBLISH_STATE_NONE;
}
- return IServer.PUBLISH_STATE_NONE;
}
return IServer.PUBLISH_STATE_INCREMENTAL;
}
- private boolean requestCommitAndPushApproval(final IModule[] module) {
+ private boolean requestCommitAndPushApproval(final IModule[] module, int changed) {
String projName = module[module.length-1].getProject().getName();
- String msg = "Do you wish to publish \"" + projName + "\" to OpenShift by commiting and pushing its git repository?";
+ String msg = "There are " + changed + " local changes in \"" + projName + "\". " +
+ "Do you want to publish to OpenShift by commiting the changes and pushing its Git repository?";
String title = "Publish " + projName + "?";
return requestApproval(module, msg, title);
}
private boolean requestPushApproval(final IModule[] module) {
String projName = module[module.length-1].getProject().getName();
- String msg = "Do you wish to publish \"" + projName + "\" to OpenShift by pushing its git repository?";
+ String msg = "The are no local changes in \"" + projName + "\". " +
+ "Do you want to publish to OpenShift by pushing its Git repository?";
String title = "Publish " + projName + "?";
return requestApproval(module, msg, title);
}
14 years, 5 months
JBoss Tools SVN: r35887 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-21 03:21:28 -0400 (Fri, 21 Oct 2011)
New Revision: 35887
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-9953 - to trunk - clarifies dialog message for push and commit
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-21 07:17:16 UTC (rev 35886)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-21 07:21:28 UTC (rev 35887)
@@ -63,15 +63,16 @@
private boolean requestCommitAndPushApproval(final IModule[] module, int changed) {
String projName = module[module.length-1].getProject().getName();
- String msg = "Do you wish to publish \"" + projName + "\" to OpenShift by commiting " +
- changed + " changed file(s) and pushing its git repository?";
+ String msg = "There are " + changed + " local changes in \"" + projName + "\". " +
+ "Do you want to publish to OpenShift by commiting the changes and pushing its Git repository?";
String title = "Publish " + projName + "?";
return requestApproval(module, msg, title);
}
private boolean requestPushApproval(final IModule[] module) {
String projName = module[module.length-1].getProject().getName();
- String msg = "Do you wish to publish \"" + projName + "\" to OpenShift by pushing its git repository?";
+ String msg = "The are no local changes in \"" + projName + "\". " +
+ "Do you want to publish to OpenShift by pushing its Git repository?";
String title = "Publish " + projName + "?";
return requestApproval(module, msg, title);
}
14 years, 5 months
JBoss Tools SVN: r35886 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-21 03:17:16 -0400 (Fri, 21 Oct 2011)
New Revision: 35886
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIPlugin.java
Log:
JBIDE-9693 - hyperlink to show the rse view
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-10-21 06:21:31 UTC (rev 35885)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-10-21 07:17:16 UTC (rev 35886)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.wizard.WizardDialog;
@@ -42,8 +43,15 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IViewPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
@@ -58,6 +66,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
+import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.DeploymentModuleOptionCompositeAssistant;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
@@ -284,6 +293,42 @@
combo.setLayoutData(UIUtil.createFormData2(0, 0, null, 0, l, 5, newHost, -5));
refreshConnections();
combo.addModifyListener(this);
+
+ Link openRSEView = new Link(this, SWT.NONE);
+ openRSEView.setText("<a>Open Remote System Explorer View...</a>");
+ openRSEView.setLayoutData(UIUtil.createFormData2(combo, 5, null, 0, null, 0, 100, -5));
+ openRSEView.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ String viewId = "org.eclipse.rse.ui.view.systemView";
+ IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow() ;
+ if (window != null) {
+ IWorkbenchPage page = window.getActivePage();
+ if (page != null) {
+ IWorkbenchPart part = page.findView(viewId);
+ if (part == null) {
+ try {
+ part = page.showView(viewId);
+ } catch (PartInitException pie) {
+ // I like pie
+ IStatus status = new Status(IStatus.ERROR, RSEUIPlugin.PLUGIN_ID, pie.getMessage(), pie);
+ JBossServerUIPlugin.getDefault().getLog().log(status);
+ }
+ } else /* if( part != null ) */ {
+ final IViewPart view = (IViewPart) part.getAdapter(IViewPart.class);
+ if (view != null) {
+ PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow()
+ .getActivePage()
+ .activate(view);
+ view.setFocus();
+ }
+ }
+ }
+ }
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
}
protected void newHostClicked() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIPlugin.java 2011-10-21 06:21:31 UTC (rev 35885)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEUIPlugin.java 2011-10-21 07:17:16 UTC (rev 35886)
@@ -9,7 +9,7 @@
import org.osgi.framework.BundleContext;
public class RSEUIPlugin implements BundleActivator {
-
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.rse.ui";
private static BundleContext context;
private JBASConsoleWriter consoleWriter;
14 years, 5 months
JBoss Tools SVN: r35885 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-10-21 02:21:31 -0400 (Fri, 21 Oct 2011)
New Revision: 35885
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-9953 - to trunk - adds file count for commit
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-21 06:09:16 UTC (rev 35884)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2011-10-21 06:21:31 UTC (rev 35885)
@@ -45,24 +45,26 @@
IProject p = module[module.length-1].getProject();
int changed = EGitUtils.countCommitableChanges(p, new NullProgressMonitor() );
if( changed == 0 || (kind == IServer.PUBLISH_FULL || state == IServer.PUBLISH_STATE_FULL)) {
- if( changed != 0 && requestCommitAndPushApproval(module)) {
+ if( changed != 0 && requestCommitAndPushApproval(module, changed)) {
monitor.beginTask("Publishing " + p.getName(), 200);
EGitUtils.commit(p, new SubProgressMonitor(monitor, 100));
EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
monitor.done();
+ return IServer.PUBLISH_STATE_NONE;
} else if( changed == 0 && requestPushApproval(module)) {
monitor.beginTask("Publishing " + p.getName(), 100);
EGitUtils.push(EGitUtils.getRepository(p), new SubProgressMonitor(monitor, 100));
monitor.done();
+ return IServer.PUBLISH_STATE_NONE;
}
- return IServer.PUBLISH_STATE_NONE;
}
return IServer.PUBLISH_STATE_INCREMENTAL;
}
- private boolean requestCommitAndPushApproval(final IModule[] module) {
+ private boolean requestCommitAndPushApproval(final IModule[] module, int changed) {
String projName = module[module.length-1].getProject().getName();
- String msg = "Do you wish to publish \"" + projName + "\" to OpenShift by commiting and pushing its git repository?";
+ String msg = "Do you wish to publish \"" + projName + "\" to OpenShift by commiting " +
+ changed + " changed file(s) and pushing its git repository?";
String title = "Publish " + projName + "?";
return requestApproval(module, msg, title);
}
14 years, 5 months