JBoss Tools SVN: r28713 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 15:10:59 -0500 (Fri, 28 Jan 2011)
New Revision: 28713
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
Log:
[JBIDE-8253][JBIDE-8254]
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-28 18:58:45 UTC (rev 28712)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-28 20:10:59 UTC (rev 28713)
@@ -11,7 +11,6 @@
package org.jboss.tools.internal.deltacloud.ui.wizards;
import java.io.File;
-import java.io.FileNotFoundException;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -432,13 +431,18 @@
"The key is not known to cloud \"{0}\"", cloud.getName()));
}
- private boolean isKeyKnowToSsh(String keyId) {
- try {
- File file = PemFileManager.getFile(keyId, SshPrivateKeysPreferences.getSshKeyDirectory());
- return SshPrivateKeysPreferences.contains(file);
- } catch (FileNotFoundException e) {
+ private boolean isKeyKnowToSsh(String keyName) {
+ if (keyName == null) {
return false;
}
+ for (String key :SshPrivateKeysPreferences.getKeys()) {
+ File file = new File(key);
+ if (file.getName().equals(keyName)
+ || file.getName().startsWith(keyName + ".")) {
+ return true;
+ }
+ }
+ return false;
}
private boolean doesKeyExist(String keyId) {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-28 18:58:45 UTC (rev 28712)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-28 20:10:59 UTC (rev 28713)
@@ -49,33 +49,10 @@
public static void add(String keyName) {
sshPrivateKeyPreference.add(keyName);
}
-
- public static boolean contains(File key) {
- if (key == null) {
- return false;
- }
-
- String keyPath = key.getAbsolutePath();
- for (String privateKey : sshPrivateKeyPreference.get()) {
- if (keyPath.equals(getAbsoluteKeyPath(privateKey))) {
- return true;
- }
- }
- return false;
+
+ public static String[] getKeys() {
+ return sshPrivateKeyPreference.get();
}
-
- private static String getAbsoluteKeyPath(String keyName) {
- try {
- if (keyName != null && !keyName.startsWith(File.separator)) {
- StringBuilder builder = new StringBuilder(getSshKeyDirectory());
- builder.append(File.separatorChar).append(keyName);
- return builder.toString();
- }
- } catch (FileNotFoundException e) {
- // ignore
- }
- return keyName;
- }
/**
* Removes the given keyName from the ssh-preferences
13 years, 3 months
JBoss Tools SVN: r28712 - workspace/snjeza/portlet-examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-01-28 13:58:45 -0500 (Fri, 28 Jan 2011)
New Revision: 28712
Added:
workspace/snjeza/portlet-examples/JSFPortlet.zip
workspace/snjeza/portlet-examples/RichFacesPortlet.zip
workspace/snjeza/portlet-examples/SeamPortlet.zip
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-community-3...
Log:
JBIDE-7999 Create Portlet Examples for GateIn
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-community-3...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-community-3... 2011-01-28 18:09:21 UTC (rev 28711)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-community-3... 2011-01-28 18:58:45 UTC (rev 28712)
@@ -494,6 +494,72 @@
</project>
<project>
+ <category>Portlet for GateIn 3.1/EPP 5.x</category>
+ <name>JSFPortlet</name>
+ <included-projects>JSFPortlet</included-projects>
+ <shortDescription>JBoss JSF RI Portlet</shortDescription>
+
+ <description>This example demonstrates the use of JBoss JSF Portlet. It runs on JBoss EPP 5.x or on GateIn 3.1.</description>
+ <size>1372160</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">JSFPortlet</property>
+ <property name="required-components">portlet</property>
+ <property name="description">This project example requires the JBoss EPP 5.x or GateIn 3.1</property>
+ </fix>
+
+ </fixes>
+ </project>
+
+ <project>
+ <category>Portlet for GateIn 3.1/EPP 5.x</category>
+ <name>RichFacesPortlet</name>
+ <included-projects>RichfacesPortlet</included-projects>
+ <shortDescription>JBoss Portlet Bridge - RichFaces Application</shortDescription>
+
+ <description>This example demonstrates the use of JBoss JSF Portlet with RichFaces. It runs on JBoss EPP 5.x or on GateIn 3.1.</description>
+ <size>7098368</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">RichfacesPortlet</property>
+ <property name="required-components">portlet</property>
+ <property name="description">This project example requires the JBoss EPP 5.x or GateIn 3.1</property>
+ </fix>
+
+ </fixes>
+ </project>
+
+ <project>
+ <category>Portlet for GateIn 3.1/EPP 5.x</category>
+ <name>SeamPortlet</name>
+ <included-projects>seam-portlet-ear,seam-portlet-ejb,seam-portlet-web</included-projects>
+ <shortDescription>JBoss Portlet Bridge - Seam Portlet</shortDescription>
+
+ <description>This example demonstrates the use of JBoss JSF Portlet with Seam. It runs on JBoss EPP 5.x or on GateIn 3.1.</description>
+ <size>8978432</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">seam-portlet-ejb,seam-portlet-web</property>
+ <property name="required-components">portlet</property>
+ <property name="description">This project example requires the JBoss EPP 5.x or GateIn 3.1</property>
+ </fix>
+
+ </fixes>
+ </project>
+
+ <project>
<category>ESB for SOA-P 5.0</category>
<name>helloworld</name>
<included-projects> helloworld,helloworld_testclient </included-projects>
Added: workspace/snjeza/portlet-examples/JSFPortlet.zip
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/portlet-examples/JSFPortlet.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/portlet-examples/RichFacesPortlet.zip
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/portlet-examples/RichFacesPortlet.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: workspace/snjeza/portlet-examples/SeamPortlet.zip
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/portlet-examples/SeamPortlet.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
13 years, 3 months
JBoss Tools SVN: r28711 - branches/jbosstools-3.2.x/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-28 13:09:21 -0500 (Fri, 28 Jan 2011)
New Revision: 28711
Modified:
branches/jbosstools-3.2.x/build/parent/pom.xml
Log:
bump BUILD_ALIAS to CR2 for builds from 3.2.x branch
Modified: branches/jbosstools-3.2.x/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-01-28 17:46:04 UTC (rev 28710)
+++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-01-28 18:09:21 UTC (rev 28711)
@@ -15,7 +15,7 @@
<!--tychoVersion>0.10.0-SNAPSHOT</tychoVersion -->
<tychoVersion>0.10.0</tychoVersion>
<scmBranch>branches/jbosstools-3.2.x</scmBranch>
- <BUILD_ALIAS>CR1</BUILD_ALIAS>
+ <BUILD_ALIAS>CR2</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
13 years, 3 months
JBoss Tools SVN: r28710 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-01-28 12:46:04 -0500 (Fri, 28 Jan 2011)
New Revision: 28710
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
Log:
https://issues.jboss.org/browse/JBIDE-8272 fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2011-01-28 17:28:21 UTC (rev 28709)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SeamRuntimeListFieldEditor.java 2011-01-28 17:46:04 UTC (rev 28710)
@@ -806,7 +806,7 @@
}
if (added.contains(source) || changed.containsKey(source)) {
source.setName(rt.getName());
- source.setHomeDir(rt.getName());
+ source.setHomeDir(rt.getHomeDir());
source.setVersion(rt.getVersion());
} else {
changed.put(rt, source);
13 years, 3 months
JBoss Tools SVN: r28709 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 12:28:21 -0500 (Fri, 28 Jan 2011)
New Revision: 28709
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
Log:
[JBIDE-8253][JBIDE-8254]
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-28 16:46:48 UTC (rev 28708)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2011-01-28 17:28:21 UTC (rev 28709)
@@ -409,8 +409,6 @@
new MandatoryStringValidator(WizardMessages.getString(MUST_ENTER_A_KEYNAME)))
.setBeforeSetValidator(
new KeyValidator()),
- // TODO: internationalize strings
-
null);
ControlDecorationSupport.create(textBinding, SWT.LEFT | SWT.TOP);
}
@@ -425,7 +423,7 @@
if (!isKeyKnowToSsh((String) value)) {
return ValidationStatus
.warning(
- "Key is not known to the ssh subsystem (SSH2 preferenes, private keys). ");
+ "Key not found under SSH preferences, might be needed for login after launch.");
}
return ValidationStatus.ok();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-28 16:46:48 UTC (rev 28708)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/SshPrivateKeysPreferences.java 2011-01-28 17:28:21 UTC (rev 28709)
@@ -50,12 +50,6 @@
sshPrivateKeyPreference.add(keyName);
}
- /**
- * Checks if the given key is cotained in the ssh-preferences
- *
- * @param keyName
- * the name of the key to add
- */
public static boolean contains(File key) {
if (key == null) {
return false;
@@ -82,7 +76,7 @@
}
return keyName;
}
-
+
/**
* Removes the given keyName from the ssh-preferences
*
13 years, 3 months
JBoss Tools SVN: r28708 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-28 11:46:48 -0500 (Fri, 28 Jan 2011)
New Revision: 28708
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
Log:
JBIDE-8203 - trunk
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-28 16:44:19 UTC (rev 28707)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-28 16:46:48 UTC (rev 28708)
@@ -210,6 +210,8 @@
IRuntime[] rts = ServerCore.getRuntimes();
ArrayList<String> names = new ArrayList<String>();
for( int i = 0; i < rts.length; i++ ) {
+ if( rts[i].getRuntimeType() == null )
+ continue;
if( rts[i].getRuntimeType().getId().startsWith("org.jboss.")
&& !rts[i].getRuntimeType().getId().equals(IJBossToolingConstants.DEPLOY_ONLY_RUNTIME)) {
localRuntimes.add(rts[i]);
13 years, 3 months
JBoss Tools SVN: r28707 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-28 11:44:19 -0500 (Fri, 28 Jan 2011)
New Revision: 28707
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/ConvertRSEToServerWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
Log:
JBIDE-8245 - trunk
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/ConvertRSEToServerWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/ConvertRSEToServerWizard.java 2011-01-28 16:36:24 UTC (rev 28706)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/ConvertRSEToServerWizard.java 2011-01-28 16:44:19 UTC (rev 28707)
@@ -26,7 +26,7 @@
if( j != null ) {
j.schedule();
}
- return false;
+ return true;
}
public void addPages() {
page1 = new RSEandASWizardPage(host);
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-01-28 16:36:24 UTC (rev 28706)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-01-28 16:44:19 UTC (rev 28707)
@@ -225,15 +225,13 @@
}
// Handle the case in which the file doesn't exist, or home / config are null
- final IServer[] result = new IServer[]{null};
final Properties props2 = props;
final Exception ce2 = ce;
- Display.getDefault().syncExec(new Runnable(){
+ Display.getDefault().asyncExec(new Runnable(){
public void run() {
- result[0] = handleRemoteFileIncomplete(host, props2, ce2);
+ handleRemoteFileIncomplete(host, props2, ce2);
}
});
- return result[0];
}
return null;
}
13 years, 3 months
JBoss Tools SVN: r28706 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 11:36:24 -0500 (Fri, 28 Jan 2011)
New Revision: 28706
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
Log:
[JBIDE-8249] not checking for platform debug status any more & wrapping throwable into multistatus so that we log message, too
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-28 16:35:07 UTC (rev 28705)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-28 16:36:24 UTC (rev 28706)
@@ -25,15 +25,15 @@
public class ErrorUtils {
public static IStatus handleError(final String title, final String message, Throwable e, final Shell shell) {
IStatus status = createStatus(e);
+ log(message, status);
openErrorDialog(title, message, status, shell);
- log(status);
return status;
}
- private static void log(IStatus status) {
- if (Activator.getDefault().isDebugging()) {
- Activator.log(status);
- }
+ private static void log(String message, IStatus status) {
+ // need to wrap the status so that we log the message, too
+ IStatus wrapperStatus = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, message, null, status);
+ Activator.log(wrapperStatus);
}
/**
@@ -45,15 +45,13 @@
* @param shell
* @return
*/
- public static IStatus handleErrorAsync(final String title, final String message, final Throwable e,
+ public static void handleErrorAsync(final String title, final String message, final Throwable e,
final Shell shell) {
- IStatus status = createStatus(e);
shell.getDisplay().asyncExec(new Runnable() {
public void run() {
handleError(title, message, e, shell);
}
});
- return status;
}
private static IStatus createStatus(Throwable e) {
@@ -65,11 +63,6 @@
}
private static void openErrorDialog(final String title, String message, final IStatus status, final Shell shell) {
- // Display.getDefault().syncExec(new Runnable() {
- // public void run() {
- // ErrorDialog.openError(shell, title, status.getMessage(), status);
- // }
- // });
ErrorDialog.openError(shell, title, message, status);
}
13 years, 3 months
JBoss Tools SVN: r28705 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 11:35:07 -0500 (Fri, 28 Jan 2011)
New Revision: 28705
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-28 16:34:35 UTC (rev 28704)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-28 16:35:07 UTC (rev 28705)
@@ -63,11 +63,6 @@
}
private static void openErrorDialog(final String title, String message, final IStatus status, final Shell shell) {
- // Display.getDefault().syncExec(new Runnable() {
- // public void run() {
- // ErrorDialog.openError(shell, title, status.getMessage(), status);
- // }
- // });
ErrorDialog.openError(shell, title, message, status);
}
13 years, 3 months
JBoss Tools SVN: r28704 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 11:34:35 -0500 (Fri, 28 Jan 2011)
New Revision: 28704
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
Log:
[JBIDE-8249] wrapping throwable into multistatus so that we log message, too
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-28 15:44:37 UTC (rev 28703)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2011-01-28 16:34:35 UTC (rev 28704)
@@ -25,13 +25,15 @@
public class ErrorUtils {
public static IStatus handleError(final String title, final String message, Throwable e, final Shell shell) {
IStatus status = createStatus(e);
- log(status);
+ log(message, status);
openErrorDialog(title, message, status, shell);
return status;
}
- private static void log(IStatus status) {
- Activator.log(status);
+ private static void log(String message, IStatus status) {
+ // need to wrap the status so that we log the message, too
+ IStatus wrapperStatus = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, message, null, status);
+ Activator.log(wrapperStatus);
}
/**
@@ -43,15 +45,13 @@
* @param shell
* @return
*/
- public static IStatus handleErrorAsync(final String title, final String message, final Throwable e,
+ public static void handleErrorAsync(final String title, final String message, final Throwable e,
final Shell shell) {
- IStatus status = createStatus(e);
shell.getDisplay().asyncExec(new Runnable() {
public void run() {
handleError(title, message, e, shell);
}
});
- return status;
}
private static IStatus createStatus(Throwable e) {
13 years, 3 months