JBoss Tools SVN: r26617 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-16 09:34:34 -0500 (Tue, 16 Nov 2010)
New Revision: 26617
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
Log:
[JBIDE-7603] moved (duplicate) instance state waiting code to delta cloud and removed duplication
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-16 14:33:51 UTC (rev 26616)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-16 14:34:34 UTC (rev 26617)
@@ -17,6 +17,7 @@
(removeInstanceJob):
[JBIDE-7603] renamed instance job related methods from action job to instance job (since jobs are not only used for actions)
(waitWhilePending):
+ (waitForState):
[JBIDE-7603] moved (duplicate) instance state waiting code to delta cloud and removed duplication
2010-11-11 André Dietisheim <adietish(a)redhat.com>
15 years, 5 months
JBoss Tools SVN: r26616 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-16 09:33:51 -0500 (Tue, 16 Nov 2010)
New Revision: 26616
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java
Log:
[JBIDE-7603] moved (duplicate) instance state waiting code to delta cloud and removed duplication
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-16 14:18:39 UTC (rev 26615)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-16 14:33:51 UTC (rev 26616)
@@ -58,6 +58,10 @@
ListenerList instanceListeners = new ListenerList();
ListenerList imageListeners = new ListenerList();
+ public static interface IInstanceStateMatcher {
+ public boolean matchesState(DeltaCloudInstance instance, String instanceState);
+ }
+
public DeltaCloud(String name, String url, String username, String passwd) throws MalformedURLException {
this(name, url, username, passwd, null, false, IImageFilter.ALL_STRING, IInstanceFilter.ALL_STRING);
}
@@ -276,17 +280,40 @@
}
public DeltaCloudInstance waitWhilePending(String instanceId, IProgressMonitor pm) throws InterruptedException {
- DeltaCloudInstance instance = null;
- while (!pm.isCanceled()) {
- instance = refreshInstance(instanceId);
- if (instance != null && !instance.getState().equals(DeltaCloudInstance.PENDING)) {
- return instance;
- }
- Thread.sleep(400);
+ IInstanceStateMatcher differsFromPending = new IInstanceStateMatcher() {
+
+ @Override
+ public boolean matchesState(DeltaCloudInstance instance, String instanceState) {
+ return !DeltaCloudInstance.PENDING.equals(instanceState);
}
- return instance;
+ };
+ return waitForState(instanceId, differsFromPending , pm);
}
+ public DeltaCloudInstance waitForState(String instanceId, final String expectedState, IProgressMonitor pm) throws InterruptedException {
+ IInstanceStateMatcher stateMatcher = new IInstanceStateMatcher() {
+
+ @Override
+ public boolean matchesState(DeltaCloudInstance instance, String instanceState) {
+ return expectedState != null && expectedState.equals(instanceState);
+ }
+ };
+ return waitForState(instanceId, stateMatcher, pm);
+ }
+
+ public DeltaCloudInstance waitForState(String instanceId, IInstanceStateMatcher stateMatcher, IProgressMonitor pm) throws InterruptedException {
+ DeltaCloudInstance instance = getInstance(instanceId);
+ while(!pm.isCanceled()) {
+ if (stateMatcher.matchesState(instance, instance.getState())
+ || instance.getState().equals(DeltaCloudInstance.TERMINATED)) {
+ return instance;
+ }
+ Thread.sleep(400);
+ instance = refreshInstance(instance.getId());
+ }
+ return instance;
+ }
+
public void removeInstanceJob(String id, Job j) {
synchronized (actionLock) {
if (actionJobs != null && actionJobs.get(id) == j)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java 2010-11-16 14:18:39 UTC (rev 26615)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java 2010-11-16 14:33:51 UTC (rev 26616)
@@ -18,7 +18,6 @@
import org.eclipse.swt.widgets.Display;
import org.jboss.tools.common.log.StatusFactory;
import org.jboss.tools.deltacloud.core.DeltaCloud;
-import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
@@ -55,8 +54,8 @@
// cancel the previous job and then go on performing this action
cancelPreviousJob(id);
cloud.performInstanceAction(id, action);
- waitForInstanceState(id);
- } catch (DeltaCloudException e) {
+ cloud.waitForState(id, expectedState, pm);
+ } catch (Exception e) {
final IStatus status = StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage(), e);
Activator.log(status);
Display.getDefault().syncExec(new Runnable() {
@@ -88,17 +87,4 @@
}
}
}
-
- private void waitForInstanceState(String id) {
- while (instance != null && expectedState != null
- && !(instance.getState().equals(expectedState))
- && !(instance.getState().equals(DeltaCloudInstance.TERMINATED))) {
- instance = cloud.refreshInstance(id);
- try {
- Thread.sleep(300);
- } catch (InterruptedException e) {
- break;
- }
- }
- }
}
15 years, 5 months
JBoss Tools SVN: r26615 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-16 09:18:39 -0500 (Tue, 16 Nov 2010)
New Revision: 26615
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
[JBIDE-7603] removed duplicate RSE related code
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-16 13:49:06 UTC (rev 26614)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-16 14:18:39 UTC (rev 26615)
@@ -1,5 +1,9 @@
2010-11-16 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/RSEUtils.java (createHostName):
+ [JBIDE-7603] added null check
+ * src/org/jboss/tools/deltacloud/ui/views/PerformInstanceActionThread.java (run):
+ [JBIDE-7365] moved state waiting to delta cloud, removed duplilcate code
* src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (refreshToolbarCommandStates):
* src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java (test):
[JBIDE-7365] changed property tester to test available actions (tested state and guessed the available actions from it),
@@ -10,6 +14,8 @@
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java (WatchCreateJob.run):
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java (WatchCreateJob.run):
[JBIDE-7603] moved (duplicate) instance state waiting code to delta cloud and removed duplication
+ (WatchCreateJob.run):
+ [JBIDE-7603] removed duplicate RSE related code
* src/org/jboss/tools/deltacloud/ui/commands/ShowInRemoteSystemExplorerHandler.java (execute):
[JBIDE-7603] unified RSE related (duplicate) code with code in NewConnectionHandler2
* src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java:
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java 2010-11-16 13:49:06 UTC (rev 26614)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java 2010-11-16 14:18:39 UTC (rev 26615)
@@ -52,6 +52,9 @@
}
public static String createHostName(DeltaCloudInstance instance) {
+ if (instance == null) {
+ return null;
+ }
return instance.getHostName();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-16 13:49:06 UTC (rev 26614)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-16 14:18:39 UTC (rev 26615)
@@ -22,20 +22,15 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialogWithToggle;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.rse.core.IRSECoreRegistry;
-import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost;
-import org.eclipse.rse.core.model.ISystemRegistry;
-import org.eclipse.rse.core.model.SystemStartHere;
-import org.eclipse.rse.core.subsystems.IConnectorService;
import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudException;
import org.jboss.tools.deltacloud.core.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.ui.Activator;
+import org.jboss.tools.deltacloud.ui.ErrorUtils;
import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
-import org.jboss.tools.deltacloud.ui.views.CVMessages;
+import org.jboss.tools.deltacloud.ui.RSEUtils;
import org.osgi.service.prefs.Preferences;
/**
@@ -51,7 +46,6 @@
private final static String DONT_SHOW_THIS_AGAIN_MSG = "DontShowThisAgain.msg"; //$NON-NLS-1$
private final static String STARTING_INSTANCE_MSG = "StartingInstance.msg"; //$NON-NLS-1$
private final static String STARTING_INSTANCE_TITLE = "StartingInstance.title"; //$NON-NLS-1$
- private final static String RSE_CONNECTING_MSG = "ConnectingRSE.msg"; //$NON-NLS-1$
private NewInstancePage mainPage;
@@ -103,45 +97,17 @@
} finally {
cloud.replaceInstance(instance);
cloud.removeInstanceJob(instanceId, this);
- String hostname = instance.getHostName();
+ String hostname = RSEUtils.createHostName(instance);
Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
boolean autoConnect = prefs.getBoolean(IDeltaCloudPreferenceConstants.AUTO_CONNECT_INSTANCE, true);
if (hostname != null && hostname.length() > 0 && autoConnect) {
- ISystemRegistry registry = SystemStartHere.getSystemRegistry();
- RSECorePlugin rsep = RSECorePlugin.getDefault();
- IRSECoreRegistry coreRegistry = rsep.getCoreRegistry();
- IRSESystemType[] sysTypes = coreRegistry.getSystemTypes();
- IRSESystemType sshType = null;
- for (IRSESystemType sysType : sysTypes) {
- if (sysType.getId().equals(IRSESystemType.SYSTEMTYPE_SSH_ONLY_ID))
- sshType = sysType;
- }
- String connectionName = instance.getName() + " [" + instance.getId() + "]"; //$NON-NLS-1$ //$NON-NLS-2$
try {
- IHost host = registry.createHost(sshType, connectionName, hostname, null);
- if (host != null) {
- host.setDefaultUserId("root"); //$NON-NLS-1$
- IConnectorService[] services = host.getConnectorServices();
- if (services.length > 0) {
- final IConnectorService service = services[0];
- Job connect = new Job(CVMessages.getFormattedString(RSE_CONNECTING_MSG, connectionName)) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- service.connect(monitor);
- return Status.OK_STATUS;
- } catch(Exception e) {
- return Status.CANCEL_STATUS;
- }
- }
- };
- connect.setUser(true);
- connect.schedule();
- }
- }
+ String connectionName = RSEUtils.createConnectionName(instance);
+ IHost host = RSEUtils.createHost(connectionName, RSEUtils.createHostName(instance));
+ RSEUtils.launchRemoteSystemExplorer(instance.getName(), connectionName, host);
} catch (Exception e) {
- // TODO Auto-generated catch block
- Activator.log(e);
+ ErrorUtils.openErrorDialog("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell());
+ return Status.OK_STATUS;
}
}
pm.done();
15 years, 5 months
JBoss Tools SVN: r26614 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-16 08:49:06 -0500 (Tue, 16 Nov 2010)
New Revision: 26614
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
Log:
[JBIDE-7365] replace property tester isStopped by testers against available actions
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-16 12:15:53 UTC (rev 26613)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-16 13:49:06 UTC (rev 26614)
@@ -183,19 +183,19 @@
}
public boolean canStart() {
- return actions.contains(InstanceAction.START);
+ return getAction(InstanceAction.START) != null;
}
public boolean canStop() {
- return actions.contains(InstanceAction.STOP);
+ return getAction(InstanceAction.STOP) != null;
}
public boolean canReboot() {
- return actions.contains(InstanceAction.REBOOT);
+ return getAction(InstanceAction.REBOOT) != null;
}
public boolean canDestroy() {
- return actions.contains(InstanceAction.DESTROY);
+ return getAction(InstanceAction.DESTROY) != null;
}
public List<String> getPublicAddresses() {
15 years, 5 months
JBoss Tools SVN: r26613 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-16 07:15:53 -0500 (Tue, 16 Nov 2010)
New Revision: 26613
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
Log:
[JBIDE-7365] changed property tester to test available actions (tested state and guessed the available actions from it), added methods to deltacloud instance classes
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-16 11:47:43 UTC (rev 26612)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-16 12:15:53 UTC (rev 26613)
@@ -1,6 +1,17 @@
2010-11-16 André Dietisheim <adietish(a)redhat.com>
- * src/org/jboss/tools/deltacloud/core/DeltaCloud.java (registerInstanceJob):
+ * src/org/jboss/tools/deltacloud/core/client/Instance.java
+ (canStart):
+ (canStop):
+ (canReboot):
+ (canDestroy):
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
+ (canStart):
+ (canStop):
+ (canReboot):
+ (canDestroy):
+ * src/org/jboss/tools/deltacloud/core/DeltaCloud.java
+ (registerInstanceJob):
(getInstanceJob):
(registerInstanceJob):
(removeInstanceJob):
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-16 11:47:43 UTC (rev 26612)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2010-11-16 12:15:53 UTC (rev 26613)
@@ -92,6 +92,23 @@
return instance.getState() == State.STOPPED;
}
+ public boolean canStart() {
+ return instance.canStart();
+ }
+
+ public boolean canStop() {
+ return instance.canStop();
+ }
+
+ public boolean canReboot() {
+ return instance.canReboot();
+ }
+
+ public boolean canDestroy() {
+ return instance.canDestroy();
+ }
+
+
public String getHostName() {
List<String> hostNames = getHostNames();
if (hostNames != null && hostNames.size() > 0)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-16 11:47:43 UTC (rev 26612)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/Instance.java 2010-11-16 12:15:53 UTC (rev 26613)
@@ -182,6 +182,22 @@
return null;
}
+ public boolean canStart() {
+ return actions.contains(InstanceAction.START);
+ }
+
+ public boolean canStop() {
+ return actions.contains(InstanceAction.STOP);
+ }
+
+ public boolean canReboot() {
+ return actions.contains(InstanceAction.REBOOT);
+ }
+
+ public boolean canDestroy() {
+ return actions.contains(InstanceAction.DESTROY);
+ }
+
public List<String> getPublicAddresses() {
return publicAddresses.getAddress();
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-16 11:47:43 UTC (rev 26612)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-11-16 12:15:53 UTC (rev 26613)
@@ -1,5 +1,9 @@
2010-11-16 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/deltacloud/ui/views/InstanceView.java (refreshToolbarCommandStates):
+ * src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java (test):
+ [JBIDE-7365] changed property tester to test available actions (tested state and guessed the available actions from it),
+ added methods to deltacloud instance classes
* plugin.xml:
[JBIDE-7599] switched refresh for image- and instance-view to be available as soon as the view is active
(and not only when an item is selected)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-16 11:47:43 UTC (rev 26612)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/plugin.xml 2010-11-16 12:15:53 UTC (rev 26613)
@@ -211,7 +211,7 @@
<and>
<adapt
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
- <test property="org.jboss.tools.deltacloud.ui.commands.isStopped"
+ <test property="org.jboss.tools.deltacloud.ui.commands.canStart"
value="true"/>
</adapt>
</and>
@@ -235,8 +235,8 @@
<and>
<adapt
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
- <test property="org.jboss.tools.deltacloud.ui.commands.isStopped"
- value="false"/>
+ <test property="org.jboss.tools.deltacloud.ui.commands.canStop"
+ value="true"/>
</adapt>
</and>
</iterate>
@@ -259,8 +259,8 @@
<and>
<adapt
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
- <test property="org.jboss.tools.deltacloud.ui.commands.isStopped"
- value="false"/>
+ <test property="org.jboss.tools.deltacloud.ui.commands.canReboot"
+ value="true"/>
</adapt>
</and>
</iterate>
@@ -283,7 +283,7 @@
<and>
<adapt
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
- <test property="org.jboss.tools.deltacloud.ui.commands.isStopped"
+ <test property="org.jboss.tools.deltacloud.ui.commands.canDestroy"
value="true"/>
</adapt>
</and>
@@ -833,7 +833,7 @@
class="org.jboss.tools.deltacloud.ui.commands.InstancePropertyTester"
id="org.jboss.tools.deltacloud.ui.commands.instancepropertytester"
namespace="org.jboss.tools.deltacloud.ui.commands"
- properties="isStopped,isStarted"
+ properties="canStart,canStop,canReboot,canDestroy"
type="org.jboss.tools.deltacloud.core.DeltaCloudInstance">
</propertyTester>
</extension>
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java 2010-11-16 11:47:43 UTC (rev 26612)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/InstancePropertyTester.java 2010-11-16 12:15:53 UTC (rev 26613)
@@ -23,24 +23,37 @@
*/
public class InstancePropertyTester extends PropertyTester {
- private static final String PROPERTY_STATE_STOPPED = "isStopped";
-
+ private static final String PROPERTY_ACTION_CANSTART = "canStart";
+ private static final String PROPERTY_ACTION_CANSTOP = "canStop";
+ private static final String PROPERTY_ACTION_CANREBOOT = "canReboot";
+ private static final String PROPERTY_ACTION_CANDESTROY = "canDestroy";
+
@Override
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
DeltaCloudInstance instance = UIUtils.adapt(receiver, DeltaCloudInstance.class);
if (instance == null) {
return false;
}
- if (PROPERTY_STATE_STOPPED.equals(property)) {
- return isStopped(instance, expectedValue);
+
+ if (PROPERTY_ACTION_CANSTART.equals(property)) {
+ return equalsExpectedValue(instance.canStart(), expectedValue);
}
+ if (PROPERTY_ACTION_CANSTOP.equals(property)) {
+ return equalsExpectedValue(instance.canStop(), expectedValue);
+ }
+ if (PROPERTY_ACTION_CANREBOOT.equals(property)) {
+ return equalsExpectedValue(instance.canReboot(), expectedValue);
+ }
+ if (PROPERTY_ACTION_CANDESTROY.equals(property)) {
+ return equalsExpectedValue(instance.canDestroy(), expectedValue);
+ }
return false;
}
- private boolean isStopped(DeltaCloudInstance instance, Object expectedValue) {
+ private boolean equalsExpectedValue(boolean propertyValue, Object expectedValue) {
Assert.isTrue(expectedValue instanceof Boolean);
Boolean expectedBoolean = (Boolean) expectedValue;
- Object propertyValue = instance.isStopped();
return expectedBoolean.equals(propertyValue);
}
+
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-16 11:47:43 UTC (rev 26612)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-16 12:15:53 UTC (rev 26613)
@@ -332,7 +332,10 @@
private void refreshToolbarCommandStates() {
IEvaluationService evaluationService = (IEvaluationService) PlatformUI.getWorkbench().getService(
IEvaluationService.class);
- evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.isStopped");
+ evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.canStart");
+ evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.canStop");
+ evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.canReboot");
+ evaluationService.requestEvaluation("org.jboss.tools.deltacloud.ui.commands.canDestroy");
}
@Override
15 years, 5 months
JBoss Tools SVN: r26612 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-11-16 06:47:43 -0500 (Tue, 16 Nov 2010)
New Revision: 26612
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java
Log:
https://jira.jboss.org/browse/JBIDE-7601 : Show XULRunner exception only once
- resolved. now SWTErrors fired during the XULRunner initialization process are wrapped in XulRunnerException, which prevents Eclipse to show the pop-ups.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-11-16 10:32:34 UTC (rev 26611)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-11-16 11:47:43 UTC (rev 26612)
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -31,13 +32,9 @@
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
import org.eclipse.swt.browser.ProgressEvent;
import org.eclipse.swt.browser.ProgressListener;
import org.eclipse.swt.custom.BusyIndicator;
@@ -63,12 +60,8 @@
import org.eclipse.ui.editors.text.ILocationProvider;
import org.eclipse.ui.internal.part.StatusPart;
import org.eclipse.ui.part.EditorPart;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
+import org.eclipse.ui.statushandlers.StatusAdapter;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
-import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsDialog;
-import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsUtils;
-import org.jboss.tools.jst.jsp.i18n.ExternalizeStringsWizard;
-import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.VpeController;
@@ -81,12 +74,12 @@
import org.jboss.tools.vpe.editor.toolbar.VpeToolBarManager;
import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager;
import org.jboss.tools.vpe.editor.toolbar.format.TextFormattingToolBar;
-import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.DocTypeUtil;
import org.jboss.tools.vpe.editor.util.FileUtil;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.resref.core.VpeResourcesDialog;
+import org.jboss.tools.vpe.xulrunner.XulRunnerException;
import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
import org.jboss.tools.vpe.xulrunner.util.XPCOM;
import org.mozilla.interfaces.nsIDOMDocument;
@@ -102,10 +95,11 @@
import org.mozilla.interfaces.nsIHTMLInlineTableEditor;
import org.mozilla.interfaces.nsIHTMLObjectResizer;
import org.mozilla.interfaces.nsIPlaintextEditor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
public class MozillaEditor extends EditorPart implements IReusableEditor {
+ /**
+ *
+ */
protected static final File INIT_FILE = new File(VpePlugin.getDefault().getResourcePath("ve"), "init.html"); //$NON-NLS-1$ //$NON-NLS-2$
public static final String CONTENT_AREA_ID = "__content__area__"; //$NON-NLS-1$
@@ -127,9 +121,7 @@
public static final String ICON_NON_VISUAL_TAGS = "icons/non-visusal-tags.gif"; //$NON-NLS-1$
public static final String ICON_TEXT_FORMATTING = "icons/text-formatting.gif"; //$NON-NLS-1$
public static final String ICON_BUNDLE_AS_EL= "icons/bundle-as-el.gif"; //$NON-NLS-1$
-// public static final String ICON_EXTERNALIZE_STRINGS= "icons/externalize.png"; //$NON-NLS-1$
-
- //static String SELECT_BAR = "SELECT_LBAR"; //$NON-NLS-1$
+//static String SELECT_BAR = "SELECT_LBAR"; //$NON-NLS-1$
private XulRunnerEditor xulRunnerEditor;
private nsIDOMElement contentArea;
private nsIDOMNode headNode;
@@ -643,7 +635,7 @@
/*
* Show the exception
*/
- showXulRunnerException(cmpEd, t);
+ showXulRunnerError(cmpEd, t);
}
/*
@@ -704,14 +696,14 @@
}
/**
- * Logs given {@code throwable} and shows error message in
+ * Logs given {@code throwable} (may be wrapped) and shows error message in
* the {@code parent} composite.
*/
- protected void showXulRunnerException(Composite parent,
- Throwable throwable) {
+ protected void showXulRunnerError(Composite parent,
+ Throwable originalThrowable) {
+ Throwable throwable = wrapIfItIsXulRunnerError(originalThrowable);
String errorMessage = MessageFormat.format(
VpeUIMessages.MOZILLA_LOADING_ERROR, throwable.getMessage());
-
VpePlugin.getPluginLog().logError(errorMessage, throwable);
parent.setLayout(new GridLayout());
@@ -762,6 +754,34 @@
}
});
}
+
+ /**
+ * This is a workaround method for JBIDE-7601 (Show XULRunner exception only once).
+ * <P>
+ * The problem is that the method {@code VpePlugin.getPluginLog().logError(...)}
+ * shows pop-ups for instances of {@code SWTError} because it considers
+ * them as {@code fatal}. To workaround of it, these errors are wrapped
+ * to an {@code Exception}.
+ *
+ * @see org.eclipse.ui.internal.ide.IDEWorkbenchErrorHandler#isFatal(StatusAdapter)
+ * @see org.eclipse.swt.browser.Mozilla
+ */
+ private Throwable wrapIfItIsXulRunnerError(Throwable originalThrowable) {
+ Throwable throwable = originalThrowable;
+ if (throwable instanceof SWTError && throwable.getMessage() != null) {
+ String message = throwable.getMessage();
+ if(message.contains("XPCOM error ") //$NON-NLS-1$
+ || message.contains(" [Failed to use detected XULRunner: ") //$NON-NLS-1$
+ || message.contains(" [Could not detect registered XULRunner to use]") //$NON-NLS-1$
+ || message.contains(" [Unknown Mozilla path (MOZILLA_FIVE_HOME not set)]") //$NON-NLS-1$
+ || message.contains(" [Mozilla GTK2 required (GTK1.2 detected)]") //$NON-NLS-1$
+ || message.contains(" [MOZILLA_FIVE_HOME='") //$NON-NLS-1$
+ || message.contains(" [MOZILLA_FIVE_HOME may not point at an embeddable GRE] [NS_InitEmbedding ")) { //$NON-NLS-1$
+ throwable = new XulRunnerException(originalThrowable);
+ }
+ }
+ return throwable;
+ }
public void setFocus() {
if(xulRunnerEditor!=null) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2010-11-16 10:32:34 UTC (rev 26611)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaPreview.java 2010-11-16 11:47:43 UTC (rev 26612)
@@ -80,7 +80,7 @@
setInitialContent();
getXulRunnerEditor().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
} catch (Throwable e) {
- showXulRunnerException(parent, e);
+ showXulRunnerError(parent, e);
}
}
15 years, 5 months
JBoss Tools SVN: r26611 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-16 05:32:34 -0500 (Tue, 16 Nov 2010)
New Revision: 26611
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
Log:
JBIDE-7612
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-11-16 10:21:45 UTC (rev 26610)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-11-16 10:32:34 UTC (rev 26611)
@@ -108,7 +108,8 @@
String loc = modPrefs.getProperty(moduleProperty);
if( loc != null && !loc.equals("") ) { //$NON-NLS-1$
if( !new Path(loc).isAbsolute()) {
- folder = server.getServer().getRuntime().getLocation().append(loc).toString();
+ IPath p = new Path(server.getDeployFolder());
+ folder = p.append(loc).toOSString();
} else {
folder = loc;
}
@@ -274,7 +275,7 @@
public static IStatus[] packModuleIntoJar(String moduleName, IModuleResource[] resources, IPath destination)throws CoreException {
- String dest = destination.toString();
+ String dest = destination.toOSString();
ModulePackager packager = null;
try {
packager = new ModulePackager(dest, false);
15 years, 5 months
JBoss Tools SVN: r26610 - trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-11-16 05:21:45 -0500 (Tue, 16 Nov 2010)
New Revision: 26610
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
Log:
Update hibernate-tools.jar to the latest version
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar
===================================================================
(Binary files differ)
15 years, 5 months
JBoss Tools SVN: r26609 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-16 04:55:50 -0500 (Tue, 16 Nov 2010)
New Revision: 26609
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
Log:
JBIDE-7611 - if basedir doesn't exist, it blows away stack
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2010-11-16 09:30:52 UTC (rev 26608)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2010-11-16 09:55:50 UTC (rev 26609)
@@ -15,7 +15,9 @@
import java.util.HashMap;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.asf.DirectoryScanner;
import org.jboss.ide.eclipse.archives.core.util.PathUtils;
@@ -56,7 +58,12 @@
fs.version = version;
DirectoryScannerExtension scanner = new DirectoryScannerExtension(fs);
if (scan) {
- scanner.scan();
+ try {
+ scanner.scan();
+ } catch(IllegalStateException ise) {
+ IStatus status = new Status(IStatus.WARNING, ArchivesCore.PLUGIN_ID, ise.getMessage(), ise);
+ ArchivesCore.getInstance().getLogger().log(status);
+ }
}
return scanner;
}
15 years, 5 months
JBoss Tools SVN: r26608 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-11-16 04:30:52 -0500 (Tue, 16 Nov 2010)
New Revision: 26608
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
Log:
Max pointed out NPE in irc 2010.11.16
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2010-11-16 09:29:21 UTC (rev 26607)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2010-11-16 09:30:52 UTC (rev 26608)
@@ -54,7 +54,7 @@
} catch( SystemMessageException sme ) {
System.err.println("failed to copy to " + remotePath.toString()); //$NON-NLS-1$
}
- return null;
+ return new IStatus[]{};
}
public IStatus[] deleteResource(IPath path, IProgressMonitor monitor)
@@ -65,7 +65,7 @@
} catch( SystemMessageException sme ) {
System.err.println("failed to delete " + remotePath.toString()); //$NON-NLS-1$
}
- return null;
+ return new IStatus[]{};
}
public IStatus[] makeDirectoryIfRequired(IPath dir,
@@ -86,7 +86,7 @@
}
createdFolders.add(toMake);
monitor.done();
- return null;
+ return new IStatus[]{};
}
public IStatus[] touchResource(IPath path) {
@@ -99,7 +99,7 @@
method.getFileServiceSubSystem().setLastModified(rf, new Date().getTime(), null);
} catch(SystemMessageException sme) {
}
- return null;
+ return new IStatus[]{};
}
}
15 years, 5 months