JBoss Tools SVN: r26748 - trunk/seam/plugins/org.jboss.tools.seam.base.test.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-11-19 05:56:03 -0500 (Fri, 19 Nov 2010)
New Revision: 26748
Modified:
trunk/seam/plugins/org.jboss.tools.seam.base.test/
Log:
Added target to svn:ignore
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.base.test
___________________________________________________________________
Name: svn:ignore
+ target
15 years, 5 months
JBoss Tools SVN: r26747 - trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-11-19 05:50:42 -0500 (Fri, 19 Nov 2010)
New Revision: 26747
Modified:
trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF
Log:
Removed bundles versions
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF 2010-11-19 10:50:28 UTC (rev 26746)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF 2010-11-19 10:50:42 UTC (rev 26747)
@@ -4,29 +4,29 @@
Bundle-SymbolicName: org.jboss.tools.seam.base.test
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.jst.common.project.facet.core;bundle-version="1.4.100",
- org.eclipse.wst.common.project.facet.core;bundle-version="1.4.100",
- org.eclipse.wst.common.modulecore;bundle-version="1.2.0",
- org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
- org.jboss.tools.seam.core;bundle-version="3.2.0",
- org.jboss.tools.tests;bundle-version="3.1.0",
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime,
+ org.eclipse.jst.common.project.facet.core,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.wst.common.modulecore,
+ org.eclipse.wst.common.frameworks,
+ org.jboss.tools.seam.core,
+ org.jboss.tools.tests,
org.junit,
- org.jboss.tools.seam.ui;bundle-version="3.2.0",
- org.eclipse.ui;bundle-version="3.6.0",
- org.jboss.tools.common;bundle-version="3.2.0",
- org.eclipse.debug.core;bundle-version="3.6.0",
- org.eclipse.ui.ide;bundle-version="3.6.0",
- org.jboss.tools.common.ui;bundle-version="3.2.0",
- org.jboss.tools.common.model;bundle-version="3.2.0",
- org.eclipse.jst.j2ee;bundle-version="1.1.400",
- org.eclipse.jst.j2ee.core;bundle-version="1.2.2",
- org.eclipse.jst.j2ee.ejb;bundle-version="1.1.400",
- org.eclipse.jst.j2ee.web;bundle-version="1.1.400",
- org.eclipse.jst.jee;bundle-version="1.0.300",
- org.eclipse.jst.jee.ejb;bundle-version="1.0.300",
- org.eclipse.jst.jee.ui;bundle-version="1.0.300",
- org.eclipse.jst.jee.web;bundle-version="1.0.300"
+ org.jboss.tools.seam.ui,
+ org.eclipse.ui,
+ org.jboss.tools.common,
+ org.eclipse.debug.core,
+ org.eclipse.ui.ide,
+ org.jboss.tools.common.ui,
+ org.jboss.tools.common.model,
+ org.eclipse.jst.j2ee,
+ org.eclipse.jst.j2ee.core,
+ org.eclipse.jst.j2ee.ejb,
+ org.eclipse.jst.j2ee.web,
+ org.eclipse.jst.jee,
+ org.eclipse.jst.jee.ejb,
+ org.eclipse.jst.jee.ui,
+ org.eclipse.jst.jee.web
Export-Package: org.jboss.tools.seam.core.test.project.facet,
org.jboss.tools.seam.ui.test.wizard
15 years, 5 months
JBoss Tools SVN: r26746 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-11-19 05:50:28 -0500 (Fri, 19 Nov 2010)
New Revision: 26746
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java
Log:
add test for 'Show non-visual tags' button on vpe toolbar
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2010-11-19 10:28:35 UTC (rev 26745)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2010-11-19 10:50:28 UTC (rev 26746)
@@ -176,6 +176,12 @@
boolean newToogleState = ((Boolean) state.getValue()).booleanValue();
assertEquals(!oldToogleState, newToogleState);
+
+ IPreferenceStore prefStore = JspEditorPlugin.getDefault()
+ .getPreferenceStore();
+ boolean prefBorderVisibility = prefStore
+ .getBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS);
+ assertEquals(!oldToogleState, prefBorderVisibility);
VpeController vpeController = (VpeController) multiPageEditor
.getVisualEditor().getController();
@@ -183,12 +189,39 @@
boolean uiBorderVisibility = visualDomBuilder
.isShowBorderForUnknownTags();
assertEquals(!oldToogleState, uiBorderVisibility);
+ }
+
+ /**
+ * Test 'Show non-visual tags' toolbar button
+ *
+ * @throws Throwable
+ */
+ public void testShowNonVisualTags() throws Throwable {
+
+ JSPMultiPageEditor multiPageEditor = openInputUserNameJsp();
+ Command command = getCommandById(ShowNonVisualTagsHandler.COMMAND_ID);
+ State state = command.getState(RegistryToggleState.STATE_ID);
+ boolean oldToogleState = ((Boolean) state.getValue()).booleanValue();
+
+ handlerService.executeCommand(ShowNonVisualTagsHandler.COMMAND_ID, null);
+ TestUtil.delay(500);
+
+ boolean newToogleState = ((Boolean) state.getValue()).booleanValue();
+ assertEquals(!oldToogleState, newToogleState);
+
IPreferenceStore prefStore = JspEditorPlugin.getDefault()
.getPreferenceStore();
- boolean prefBorderVisibility = prefStore
- .getBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS);
- assertEquals(!oldToogleState, prefBorderVisibility);
+ boolean prefNonVisualTagsVisibility = prefStore
+ .getBoolean(IVpePreferencesPage.SHOW_NON_VISUAL_TAGS);
+ assertEquals(!oldToogleState, prefNonVisualTagsVisibility);
+
+ VpeController vpeController = (VpeController) multiPageEditor
+ .getVisualEditor().getController();
+ VpeVisualDomBuilder visualDomBuilder = vpeController.getVisualBuilder();
+ boolean uiNonVisualTagsVisibility = visualDomBuilder
+ .isShowInvisibleTags();
+ assertEquals(!oldToogleState, uiNonVisualTagsVisibility);
}
private JSPMultiPageEditor openInputUserNameJsp() throws CoreException,
15 years, 5 months
JBoss Tools SVN: r26745 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-11-19 05:28:35 -0500 (Fri, 19 Nov 2010)
New Revision: 26745
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java
Log:
add test for 'Show border for unknown tags' button on vpe toolbar
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2010-11-19 10:25:53 UTC (rev 26744)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2010-11-19 10:28:35 UTC (rev 26745)
@@ -15,6 +15,7 @@
import java.lang.reflect.Method;
import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.State;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -26,6 +27,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
import org.eclipse.ui.handlers.IHandlerService;
+import org.eclipse.ui.handlers.RegistryToggleState;
import org.eclipse.ui.part.FileEditorInput;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
@@ -33,6 +35,7 @@
import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.VpeEditorPart;
+import org.jboss.tools.vpe.editor.VpeVisualDomBuilder;
import org.jboss.tools.vpe.handlers.PageDesignOptionsHandler;
import org.jboss.tools.vpe.handlers.PreferencesHandler;
import org.jboss.tools.vpe.handlers.RefreshHandler;
@@ -109,7 +112,7 @@
}
/**
- * Test rotate editors toolbar button
+ * Test 'Rotate editors' toolbar button
*
* @throws Throwable
*/
@@ -155,6 +158,39 @@
}
}
+ /**
+ * Test 'Show border for unknown tags' toolbar button
+ *
+ * @throws Throwable
+ */
+ public void testShowBorderForUnknownTags() throws Throwable {
+
+ JSPMultiPageEditor multiPageEditor = openInputUserNameJsp();
+
+ Command command = getCommandById(ShowBorderHandler.COMMAND_ID);
+ State state = command.getState(RegistryToggleState.STATE_ID);
+ boolean oldToogleState = ((Boolean) state.getValue()).booleanValue();
+
+ handlerService.executeCommand(ShowBorderHandler.COMMAND_ID, null);
+ TestUtil.delay(500);
+
+ boolean newToogleState = ((Boolean) state.getValue()).booleanValue();
+ assertEquals(!oldToogleState, newToogleState);
+
+ VpeController vpeController = (VpeController) multiPageEditor
+ .getVisualEditor().getController();
+ VpeVisualDomBuilder visualDomBuilder = vpeController.getVisualBuilder();
+ boolean uiBorderVisibility = visualDomBuilder
+ .isShowBorderForUnknownTags();
+ assertEquals(!oldToogleState, uiBorderVisibility);
+
+ IPreferenceStore prefStore = JspEditorPlugin.getDefault()
+ .getPreferenceStore();
+ boolean prefBorderVisibility = prefStore
+ .getBoolean(IVpePreferencesPage.SHOW_BORDER_FOR_UNKNOWN_TAGS);
+ assertEquals(!oldToogleState, prefBorderVisibility);
+ }
+
private JSPMultiPageEditor openInputUserNameJsp() throws CoreException,
IOException, SecurityException, IllegalArgumentException,
NoSuchMethodException, IllegalAccessException,
@@ -197,4 +233,15 @@
expected, vpeCommand.isEnabled());
}
}
+
+ private Command getCommandById(String commandId) throws Exception {
+
+ for (Command vpeCommand : commands) {
+ if (vpeCommand.getId().equals(commandId)) {
+ return vpeCommand;
+ }
+ }
+ throw new IllegalArgumentException("There is no commands with id " //$NON-NLS-1$
+ + commandId);
+ }
}
15 years, 5 months
JBoss Tools SVN: r26744 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-19 05:25:53 -0500 (Fri, 19 Nov 2010)
New Revision: 26744
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java
Log:
[JBIDE-7642] cleanup, corrected method call
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-19 10:03:12 UTC (rev 26743)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/RSEUtils.java 2010-11-19 10:25:53 UTC (rev 26744)
@@ -102,7 +102,7 @@
public static void launchRemoteSystemExplorer(String instanceName, String connectionName, IHost host) throws Exception {
if (host != null) {
IConnectorService service = RSEUtils.getConnectorService(host);
- RSEUtils.connect(instanceName, service, connectionName);
+ connect(instanceName, service, connectionName);
} else {
// Assume failure is due to name already in use
Display.getDefault().asyncExec(new ShowRSEViewRunnable(instanceName));
15 years, 5 months
JBoss Tools SVN: r26743 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-11-19 05:03:12 -0500 (Fri, 19 Nov 2010)
New Revision: 26743
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
Log:
[JBIDE-7663] removed loading images and instances on startup (is now done lazyly as soon as they're requested from the user)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-19 09:58:49 UTC (rev 26742)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-19 10:03:12 UTC (rev 26743)
@@ -73,9 +73,9 @@
}
private DeltaCloud loadCloud(Node n, List<DeltaCloud> clouds) throws DeltaCloudException {
- DeltaCloud cloud = null;
- String name = "";
+ String name = "<UNKNOWN>";
try {
+ DeltaCloud cloud = null;
NamedNodeMap attrs = n.getAttributes();
name = attrs.getNamedItem("name").getNodeValue(); // $NON-NLS-1$
String url = attrs.getNamedItem("url").getNodeValue(); // $NON-NLS-1$
@@ -90,13 +90,13 @@
cloud.setLastImageId(lastImageId);
cloud.setLastKeyname(lastKeyName);
// cloud.loadChildren();
+ return cloud;
} catch (DeltaCloudException e) {
throw e;
} catch (Exception e) {
// TODO: internationalize strings
throw new DeltaCloudException(MessageFormat.format("Could not load cloud {0}", name), e);
}
- return cloud;
}
private String getLastKeyName(Node lastKeyNameNode) {
15 years, 5 months
JBoss Tools SVN: r26742 - 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-19 04:58:49 -0500 (Fri, 19 Nov 2010)
New Revision: 26742
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
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/DeltaCloudManager.java
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/commands/DisconnectCloudHandler.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
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/InstanceViewLabelAndContentProvider.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java
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/NewInstancePage2.java
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/NewInstanceWizard2.java
Log:
[JBIDE-7663] removed loading images and instances on startup (is now done lazyly as soon as they're requested from the user)
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-19 09:58:49 UTC (rev 26742)
@@ -1,3 +1,8 @@
+2010-11-19 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (loadCloud):
+ [JBIDE-7663] removed loading of images and instances on startup
+
2010-11-18 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/ICloudManagerListener.java (cloudsChanged):
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-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -228,7 +228,7 @@
this.imageFilter = createImageFilter(ruleString);
if (!rules.equals(ruleString)) {
// save();
- notifyImageListListeners(getCurrImages());
+ notifyImageListListeners(getImages());
}
}
@@ -422,7 +422,7 @@
}
}
- public DeltaCloudInstance[] getCurrInstances() throws DeltaCloudException {
+ public DeltaCloudInstance[] getInstances() throws DeltaCloudException {
synchronized (instanceLock) {
if (instances == null) {
return loadInstances();
@@ -595,7 +595,7 @@
return deltaCloudImage;
}
- public DeltaCloudImage[] getCurrImages() throws DeltaCloudException {
+ public DeltaCloudImage[] getImages() throws DeltaCloudException {
synchronized (imageLock) {
if (images == null) {
return loadImages();
@@ -656,7 +656,7 @@
if (instance != null) {
DeltaCloudInstance newInstance = new DeltaCloudInstance(this, instance);
newInstance.setGivenName(name);
- getCurrInstances(); // make sure instances are initialized
+ getInstances(); // make sure instances are initialized
instances.add(newInstance);
notifyInstanceListListeners();
return newInstance;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -41,9 +41,9 @@
private DeltaCloudManager() {
}
- private List<DeltaCloud> loadClouds() throws DeltaCloudException {
- List<DeltaCloud> clouds = new ArrayList<DeltaCloud>(); // clear present clouds
- DeltaCloudMultiException connectionException = new DeltaCloudMultiException("Errors occurred while loading clouds from the preferences");
+ private void loadClouds() throws DeltaCloudException {
+ this.clouds = new ArrayList<DeltaCloud>(); // clear present clouds
+ DeltaCloudMultiException connectionException = new DeltaCloudMultiException("Could not load some clouds");
IPath stateLocation = Activator.getDefault().getStateLocation();
File cloudFile = stateLocation.append(CLOUDFILE_NAME).toFile();
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
@@ -70,30 +70,31 @@
if (!connectionException.isEmpty()) {
throw connectionException;
}
- return clouds;
}
private DeltaCloud loadCloud(Node n, List<DeltaCloud> clouds) throws DeltaCloudException {
- NamedNodeMap attrs = n.getAttributes();
- String name = attrs.getNamedItem("name").getNodeValue(); // $NON-NLS-1$
- String url = attrs.getNamedItem("url").getNodeValue(); // $NON-NLS-1$
- String username = attrs.getNamedItem("username").getNodeValue(); // $NON-NLS-1$
- String type = attrs.getNamedItem("type").getNodeValue(); // $NON-NLS-1$
- String imageFilterRules = getImageFilterRules(attrs.getNamedItem("imagefilter")); // $NON-NLS-1$
- String instanceFilterRules = getInstanceFilterRules(attrs.getNamedItem("instancefilter")); // $NON-NLS-1$
- String lastKeyName = getLastKeyName(attrs.getNamedItem("lastkeyname")); // $NON-NLS-1$
- String lastImageId = getLastKeyName(attrs.getNamedItem("lastimage")); // $NON-NLS-1$
- DeltaCloud cloud = new DeltaCloud(name, url, username, type, imageFilterRules, instanceFilterRules);
- clouds.add(cloud);
- cloud.setLastImageId(lastImageId);
- cloud.setLastKeyname(lastKeyName);
+ DeltaCloud cloud = null;
+ String name = "";
try {
- cloud.loadChildren();
+ NamedNodeMap attrs = n.getAttributes();
+ name = attrs.getNamedItem("name").getNodeValue(); // $NON-NLS-1$
+ String url = attrs.getNamedItem("url").getNodeValue(); // $NON-NLS-1$
+ String username = attrs.getNamedItem("username").getNodeValue(); // $NON-NLS-1$
+ String type = attrs.getNamedItem("type").getNodeValue(); // $NON-NLS-1$
+ String imageFilterRules = getImageFilterRules(attrs.getNamedItem("imagefilter")); // $NON-NLS-1$
+ String instanceFilterRules = getInstanceFilterRules(attrs.getNamedItem("instancefilter")); // $NON-NLS-1$
+ String lastKeyName = getLastKeyName(attrs.getNamedItem("lastkeyname")); // $NON-NLS-1$
+ String lastImageId = getLastKeyName(attrs.getNamedItem("lastimage")); // $NON-NLS-1$
+ cloud = new DeltaCloud(name, url, username, type, imageFilterRules, instanceFilterRules);
+ clouds.add(cloud);
+ cloud.setLastImageId(lastImageId);
+ cloud.setLastKeyname(lastKeyName);
+ // cloud.loadChildren();
} catch (DeltaCloudException e) {
throw e;
} catch (Exception e) {
// TODO: internationalize strings
- throw new DeltaCloudException(MessageFormat.format("Could not load cloud {0} from preferences", name), e);
+ throw new DeltaCloudException(MessageFormat.format("Could not load cloud {0}", name), e);
}
return cloud;
}
@@ -172,11 +173,11 @@
private List<DeltaCloud> doGetClouds() throws DeltaCloudException {
if (clouds == null) {
- clouds = loadClouds();
+ loadClouds();
}
return clouds;
}
-
+
public DeltaCloud findCloud(String name) throws DeltaCloudException {
for (DeltaCloud cloud : getClouds()) {
if (cloud.getName().equals(name))
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 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -24,7 +24,7 @@
* @author Andre Dietisheim
*/
public class ErrorUtils {
- public static IStatus openErrorDialog(final String title, final String message, Throwable e, final Shell shell) {
+ public static IStatus handleError(final String title, final String message, Throwable e, final Shell shell) {
IStatus status = createStatus(e);
openErrorDialog(title, status, shell);
return status;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -101,7 +101,7 @@
}
} catch (DeltaCloudException e) {
// TODO internationalize strings
- ErrorUtils.openErrorDialog("Error",
+ ErrorUtils.handleError("Error",
MessageFormat.format("Could not disconnect cloud {0}", deltaCloud.getName()), e, shell);
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -12,16 +12,12 @@
import java.util.ArrayList;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.TreeViewer;
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.DeltaCloudImage;
import org.jboss.tools.deltacloud.core.IImageFilter;
import org.jboss.tools.deltacloud.core.IImageListListener;
-import org.jboss.tools.deltacloud.ui.Activator;
import org.jboss.tools.deltacloud.ui.ErrorUtils;
public class CVImagesCategoryElement extends CVCategoryElement implements IImageListListener {
@@ -74,13 +70,13 @@
if (!initialized) {
DeltaCloud cloud = (DeltaCloud)getElement();
try {
- DeltaCloudImage[] images = filter(cloud.getCurrImages());
+ DeltaCloudImage[] images = filter(cloud.getImages());
cloud.removeImageListListener(this);
addImages(images);
initialized = true;
cloud.addImageListListener(this);
} catch (Exception e) {
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Colud not get images from cloud " + cloud.getName(),
e, Display.getDefault().getActiveShell());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -71,13 +71,13 @@
DeltaCloud cloud = (DeltaCloud) getElement();
try {
cloud.removeInstanceListListener(this);
- DeltaCloudInstance[] instances = filter(cloud.getCurrInstances());
+ DeltaCloudInstance[] instances = filter(cloud.getInstances());
addInstances(instances);
initialized = true;
cloud.addInstanceListListener(this);
} catch (Exception e) {
// TODO: internationalize strings
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Colud not get instances from cloud " + cloud.getName(),
e, Display.getDefault().getActiveShell());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -40,22 +40,23 @@
if (!initialized) {
DeltaCloudManager m = DeltaCloudManager.getDefault();
m.removeCloudManagerListener(this);
+ DeltaCloud[] clouds = new DeltaCloud[] {};
try {
- DeltaCloud[] clouds = m.getClouds();
- for (int i = 0; i < clouds.length; ++i) {
- DeltaCloud cloud = clouds[i];
- CVCloudElement e = new CVCloudElement(cloud, cloud.getName(), viewer);
- addChild(e);
- }
- m.addCloudManagerListener(this);
- initialized = true;
+ clouds = m.getClouds();
} catch (DeltaCloudException e) {
// TODO: internationalize strings
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Could not get all clouds",
e, Display.getDefault().getActiveShell());
}
+ for (int i = 0; i < clouds.length; ++i) {
+ DeltaCloud cloud = clouds[i];
+ CVCloudElement e = new CVCloudElement(cloud, cloud.getName(), viewer);
+ addChild(e);
+ }
+ m.addCloudManagerListener(this);
+ initialized = true;
}
return super.getChildren();
}
@@ -86,7 +87,7 @@
});
} catch (DeltaCloudException e) {
// TODO: internationalize strings
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Could not get all clouds",
e, Display.getDefault().getActiveShell());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -337,7 +337,7 @@
clouds = DeltaCloudManager.getDefault().getClouds();
} catch (DeltaCloudException e) {
// TODO: internationalize strings
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Could not get all clouds",
e, Display.getDefault().getActiveShell());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -90,9 +90,9 @@
} else {
cloud = (DeltaCloud) newInput;
try {
- images = filter(cloud.getCurrImages());
+ images = filter(cloud.getImages());
} catch (Exception e) {
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Could not get images for cloud " + cloud.getName(),
e, Display.getDefault().getActiveShell());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -144,7 +144,7 @@
}
}
} catch (DeltaCloudException e) {
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error", "Could not get key for instance " + instance.getName(),
e, Display.getDefault().getActiveShell());
}
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-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -205,7 +205,7 @@
clouds = DeltaCloudManager.getDefault().getClouds();
} catch (DeltaCloudException e) {
// TODO: internationalize strings
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Could not get all clouds",
e, Display.getDefault().getActiveShell());
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -86,13 +86,13 @@
} else {
cloud = (DeltaCloud) newInput;
try {
- instances = filter(cloud.getCurrInstances());
+ instances = filter(cloud.getInstances());
} catch (Exception e) {
if (instances == null) {
instances = new DeltaCloudInstance[]{};
}
// TODO internationalize strings
- ErrorUtils.openErrorDialog("Instance View Error", "Could not display instances for cloud " + cloud.getName(),
+ ErrorUtils.handleError("Instance View Error", "Could not display instances for cloud " + cloud.getName(),
e, Display.getDefault().getActiveShell());
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -50,7 +50,7 @@
try {
cloud.destroyInstance(instance.getId());
} catch (DeltaCloudException e) {
- ErrorUtils.openErrorDialog("Error",
+ ErrorUtils.handleError("Error",
MessageFormat.format("Could not destroy instance {0}", instance.getName()), e,
Display.getDefault().getActiveShell());
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -51,7 +51,7 @@
cloud.getType(), this);
addPage(mainPage);
} catch (MalformedURLException e) {
- ErrorUtils.openErrorDialog(WizardMessages.getString("EditCloudConnectionError.title"),
+ ErrorUtils.handleError(WizardMessages.getString("EditCloudConnectionError.title"),
WizardMessages.getString("EditCloudConnectionError.message"), e, getShell());
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -150,7 +150,7 @@
public void run() {
try {
contentProvider.setFilter(filter);
- viewer.setInput(cloud.getCurrImages());
+ viewer.setInput(cloud.getImages());
viewer.refresh();
} catch (Exception e) {
IStatus status = StatusFactory.getInstance(
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -41,7 +41,7 @@
DeltaCloudManager.getDefault().saveClouds();
} catch (Exception e) {
// TODO: internationalize strings
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Cloud not get update filters on cloud " + cloud.getName(), e, getShell());
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -48,7 +48,7 @@
DeltaCloudManager.getDefault().saveClouds();
} catch (Exception e) {
// TODO: internationalize strings
- ErrorUtils.openErrorDialog(
+ ErrorUtils.handleError(
"Error",
"Could not update filters", e, Display.getDefault().getActiveShell());
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -55,7 +55,7 @@
return newCloud.testConnection();
} catch (DeltaCloudException e) {
ErrorUtils
- .openErrorDialog(WizardMessages.getString("CloudConnectionAuthError.title"),
+ .handleError(WizardMessages.getString("CloudConnectionAuthError.title"),
WizardMessages.getFormattedString("CloudConnectionAuthError.message", url), e, getShell());
return true;
}
@@ -75,7 +75,7 @@
} catch (Exception e) {
// TODO internationalize strings
ErrorUtils
- .openErrorDialog("Error", MessageFormat.format("Could not create cloud {0}", name), e, getShell());
+ .handleError("Error", MessageFormat.format("Could not create cloud {0}", name), e, getShell());
}
return true;
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -87,7 +87,7 @@
}
private DeltaCloudImage getImage(String imageId, String arch) throws DeltaCloudException {
- DeltaCloudImage image = getFromcachedImage(imageId, cloud.getCurrImages());
+ DeltaCloudImage image = getFromcachedImage(imageId, cloud.getImages());
if (image == null) {
image = cloud.loadImage(imageId);
}
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 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -205,7 +205,7 @@
}
} catch (DeltaCloudException e) {
// TODO internationalize strings
- ErrorUtils.openErrorDialog("Error",
+ ErrorUtils.handleError("Error",
MessageFormat.format("Could not get profiles from cloud {0}", cloud.getName()), e, getShell());
}
}
@@ -409,7 +409,7 @@
try {
realms = Arrays.asList(cloud.getRealms());
} catch (DeltaCloudException e) {
- ErrorUtils.openErrorDialog("Error",
+ ErrorUtils.handleError("Error",
MessageFormat.format("Could not get realms from cloud {0}", cloud.getName()), e, getShell());
}
return realms;
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -220,7 +220,7 @@
}
} catch (DeltaCloudException e) {
// TODO internationalize strings
- ErrorUtils.openErrorDialog("Error",
+ ErrorUtils.handleError("Error",
MessageFormat.format("Could not get profiles from cloud {0}", cloud.getName()), e, getShell());
}
return profiles.toArray(new DeltaCloudHardwareProfile[profiles.size()]);
@@ -557,7 +557,7 @@
try {
realms = Arrays.asList(cloud.getRealms());
} catch (DeltaCloudException e) {
- ErrorUtils.openErrorDialog("Error",
+ ErrorUtils.handleError("Error",
MessageFormat.format("Could not get realms from cloud {0}", cloud.getName()), e, getShell());
}
return realms;
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-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -106,7 +106,7 @@
IHost host = RSEUtils.createHost(connectionName, RSEUtils.createHostName(instance));
RSEUtils.launchRemoteSystemExplorer(instance.getName(), connectionName, host);
} catch (Exception e) {
- ErrorUtils.openErrorDialog("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell());
+ ErrorUtils.handleError("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell());
return Status.OK_STATUS;
}
}
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-11-19 08:46:16 UTC (rev 26741)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-11-19 09:58:49 UTC (rev 26742)
@@ -102,7 +102,7 @@
IHost host = RSEUtils.createHost(connectionName, RSEUtils.createHostName(instance));
RSEUtils.launchRemoteSystemExplorer(instance.getName(), connectionName, host);
} catch (Exception e) {
- ErrorUtils.openErrorDialog("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell());
+ ErrorUtils.handleError("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell());
return Status.OK_STATUS;
}
}
15 years, 5 months
JBoss Tools SVN: r26741 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-11-19 03:46:16 -0500 (Fri, 19 Nov 2010)
New Revision: 26741
Modified:
trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
Log:
Increased timeout because of running on Hudson.
Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java
===================================================================
--- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-11-19 08:38:10 UTC (rev 26740)
+++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-11-19 08:46:16 UTC (rev 26741)
@@ -26,6 +26,7 @@
import org.jboss.tools.drools.ui.bot.test.smoke.RuleFlowTest;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.ext.types.PerspectiveType;
import org.junit.AfterClass;
@@ -113,6 +114,7 @@
} catch (WidgetNotFoundException wnfe){
// Do nothing ignore this error
}
+ bot.sleep(Timing.time5S());
eclipse.openPerspective(PerspectiveType.JAVA);
eclipse.maximizeActiveShell();
}
15 years, 5 months
JBoss Tools SVN: r26740 - in trunk/vpe: tests/org.jboss.tools.vpe.ui.test/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dvinnichek
Date: 2010-11-19 03:38:10 -0500 (Fri, 19 Nov 2010)
New Revision: 26740
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java
Log:
add test for 'Rotate Editors' button on vpe toolbar
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-11-19 01:24:34 UTC (rev 26739)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-11-19 08:38:10 UTC (rev 26740)
@@ -27,8 +27,6 @@
import org.eclipse.swt.events.ControlListener;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
import org.eclipse.swt.events.ShellAdapter;
import org.eclipse.swt.events.ShellEvent;
import org.eclipse.swt.graphics.Point;
@@ -1246,4 +1244,7 @@
}
}
+ public CustomSashForm getContainer() {
+ return container;
+ }
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-11-19 01:24:34 UTC (rev 26739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-11-19 08:38:10 UTC (rev 26740)
@@ -11,6 +11,7 @@
org.eclipse.core.resources,
org.eclipse.ui.ide,
org.jboss.tools.jst.jsp,
+ org.jboss.tools.common.el.core,
org.jboss.tools.jst.css,
org.jboss.tools.vpe.xulrunner,
org.mozilla.xpcom,
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2010-11-19 01:24:34 UTC (rev 26739)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/handlers/VpeCommandsTests.java 2010-11-19 08:38:10 UTC (rev 26740)
@@ -10,19 +10,29 @@
******************************************************************************/
package org.jboss.tools.vpe.ui.test.handlers;
+import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+
import org.eclipse.core.commands.Command;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.swt.SWT;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IViewReference;
import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.handlers.IHandlerService;
import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditorPart;
+import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.VpeEditorPart;
import org.jboss.tools.vpe.handlers.PageDesignOptionsHandler;
import org.jboss.tools.vpe.handlers.PreferencesHandler;
import org.jboss.tools.vpe.handlers.RefreshHandler;
@@ -36,89 +46,155 @@
import org.jboss.tools.vpe.ui.test.VpeUiTests;
/**
- * Class which created for testing VPE commands behavior,
- * see https://jira.jboss.org/browse/JBIDE-7383
+ * Class which created for testing VPE commands behavior, see
+ * https://jira.jboss.org/browse/JBIDE-7383
*
* @author mareshkau
- *
+ *
*/
-public class VpeCommandsTests extends VpeTest{
+public class VpeCommandsTests extends VpeTest {
private static String[] VPE_COMMAND_ID;
private Command[] commands;
-
+ private IHandlerService handlerService;
+
+ private static final int ROTATION_NUM = 4;
+
static {
- VPE_COMMAND_ID = new String[]{
- PageDesignOptionsHandler.COMMAND_ID,
- PreferencesHandler.COMMAND_ID,
- RefreshHandler.COMMAND_ID,
- RotateEditorsHandler.COMMAND_ID,
- ShowBorderHandler.COMMAND_ID,
+ VPE_COMMAND_ID = new String[] { PageDesignOptionsHandler.COMMAND_ID,
+ PreferencesHandler.COMMAND_ID, RefreshHandler.COMMAND_ID,
+ RotateEditorsHandler.COMMAND_ID, ShowBorderHandler.COMMAND_ID,
ShowBundleAsELHandler.COMMAND_ID,
ShowNonVisualTagsHandler.COMMAND_ID,
- ShowTextFormattingHandler.COMMAND_ID
- };
+ ShowTextFormattingHandler.COMMAND_ID };
}
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
- ICommandService commandService =
- (ICommandService) PlatformUI.getWorkbench()
- .getService(ICommandService.class);
+ ICommandService commandService = (ICommandService) PlatformUI
+ .getWorkbench().getService(ICommandService.class);
commands = new Command[VPE_COMMAND_ID.length];
- for(int i=0;i<commands.length;i++){
+ for (int i = 0; i < commands.length; i++) {
commands[i] = commandService.getCommand(VPE_COMMAND_ID[i]);
}
IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
+ .getActiveWorkbenchWindow().getActivePage();
IViewReference[] views = page.getViewReferences();
for (IViewReference iViewReference : views) {
page.hideView(iViewReference);
}
+ handlerService = (IHandlerService) PlatformUI.getWorkbench()
+ .getService(IHandlerService.class);
}
public VpeCommandsTests(String name) {
super(name);
}
-
+
/**
* Test VPE command state
+ *
* @throws Throwable
*/
- public void testCommandState() throws Throwable {
- //initially all commands should be disabled
- IFile vpeFile = (IFile) TestUtil.getComponentPath("inputUserName.jsp",
- VpeUiTests.IMPORT_PROJECT_NAME);
-
- /*
- * Open file in the VPE
- */
- IEditorInput input = new FileEditorInput(vpeFile);
- JSPMultiPageEditor multiPageEditor = openEditor(input);
- TestUtil.delay(500);
- pageChange(multiPageEditor, 0);
- checkCommadState(true);
- pageChange(multiPageEditor, 1);
- checkCommadState(false);
- pageChange(multiPageEditor, multiPageEditor.getPreviewIndex());
- checkCommadState(false);
- pageChange(multiPageEditor,0);
- checkCommadState(true);
- }
-
- private void pageChange(JSPMultiPageEditor multiPageEditor, int index) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
- Method pageChange;
- pageChange = JSPMultiPageEditorPart.class.getDeclaredMethod("setActivePage", new Class[]{int.class});
- pageChange.setAccessible(true);
- pageChange.invoke(multiPageEditor, index);
- multiPageEditor.pageChange(index);
- TestUtil.delay(1500);
- }
- //checks command state
- private void checkCommadState(boolean expected){
- for (Command vpeCommand : commands) {
- assertEquals("Command "+vpeCommand.getId()+" should be active",expected,vpeCommand.isEnabled());
+ public void testCommandState() throws Throwable {
+ JSPMultiPageEditor multiPageEditor = openInputUserNameJsp();
+ checkCommandState(true);
+ pageChange(multiPageEditor, 1);
+ checkCommandState(false);
+ pageChange(multiPageEditor, multiPageEditor.getPreviewIndex());
+ checkCommandState(false);
+ pageChange(multiPageEditor, 0);
+ checkCommandState(true);
+ }
+
+ /**
+ * Test rotate editors toolbar button
+ *
+ * @throws Throwable
+ */
+ public void testRotateEditors() throws Throwable {
+
+ JSPMultiPageEditor multiPageEditor = openInputUserNameJsp();
+ VpeController vpeController = (VpeController) multiPageEditor
+ .getVisualEditor().getController();
+ VpeEditorPart editPart = vpeController.getPageContext().getEditPart();
+ int oldVisualOrientation = editPart.getContainer().getOrientation();
+ int prevVisualOrientation = oldVisualOrientation;
+
+ IPreferenceStore preferences = JspEditorPlugin.getDefault()
+ .getPreferenceStore();
+ String oldPrefOrientation = preferences
+ .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING);
+
+ for (int i = 0; i < ROTATION_NUM; i++) {
+
+ handlerService
+ .executeCommand(RotateEditorsHandler.COMMAND_ID, null);
+ TestUtil.delay(500);
+
+ int newVisualOrientation = editPart.getContainer().getOrientation();
+ String newPrefOrientation = preferences
+ .getString(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING);
+
+ if (i != ROTATION_NUM - 1) {
+ assertNotSame(oldPrefOrientation, newPrefOrientation);
+ assertNotSame(prevVisualOrientation, newVisualOrientation);
+ } else {
+ assertEquals(oldPrefOrientation, newPrefOrientation);
+ assertEquals(oldVisualOrientation, newVisualOrientation);
}
- }
+
+ if (prevVisualOrientation == SWT.HORIZONTAL) {
+ assertEquals(SWT.VERTICAL, newVisualOrientation);
+ } else {
+ assertEquals(SWT.HORIZONTAL, newVisualOrientation);
+ }
+
+ prevVisualOrientation = newVisualOrientation;
+ }
+ }
+
+ private JSPMultiPageEditor openInputUserNameJsp() throws CoreException,
+ IOException, SecurityException, IllegalArgumentException,
+ NoSuchMethodException, IllegalAccessException,
+ InvocationTargetException {
+ IFile vpeFile = (IFile) TestUtil.getComponentPath("inputUserName.jsp", //$NON-NLS-1$
+ VpeUiTests.IMPORT_PROJECT_NAME);
+ return openFileInVpe(vpeFile);
+ }
+
+ private JSPMultiPageEditor openFileInVpe(IFile fileToOpen)
+ throws PartInitException, SecurityException,
+ IllegalArgumentException, NoSuchMethodException,
+ IllegalAccessException, InvocationTargetException {
+ // Open file in the VPE
+ IEditorInput input = new FileEditorInput(fileToOpen);
+ JSPMultiPageEditor multiPageEditor = openEditor(input);
+ TestUtil.delay(500);
+ // Open the 'Visual/Source' tab
+ pageChange(multiPageEditor, 0);
+ return multiPageEditor;
+ }
+
+ private void pageChange(JSPMultiPageEditor multiPageEditor, int index)
+ throws SecurityException, NoSuchMethodException,
+ IllegalArgumentException, IllegalAccessException,
+ InvocationTargetException {
+ Method pageChange;
+ pageChange = JSPMultiPageEditorPart.class.getDeclaredMethod(
+ "setActivePage", new Class[] { int.class });
+ pageChange.setAccessible(true);
+ pageChange.invoke(multiPageEditor, index);
+ multiPageEditor.pageChange(index);
+ TestUtil.delay(1500);
+ }
+
+ // checks command state
+ private void checkCommandState(boolean expected) {
+ for (Command vpeCommand : commands) {
+ assertEquals("Command " + vpeCommand.getId() + " should be active",
+ expected, vpeCommand.isEnabled());
+ }
+ }
}
15 years, 5 months
JBoss Tools SVN: r26739 - in trunk/ws/docs: Web_Service_Test_View_deprecated and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2010-11-18 20:24:34 -0500 (Thu, 18 Nov 2010)
New Revision: 26739
Added:
trunk/ws/docs/Web_Service_Test_View_deprecated/
trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/
Removed:
trunk/ws/docs/Web_Service_Test_View/
trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/
Modified:
trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Book_Info.xml
trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Revision_History.xml
trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/publican.cfg
Log:
renaming the Web Service Test View book written by BClare as "deprecated" since this book is now included in the main WS guide. Some information (such as the Intoriduction) was not carried over and so this book will remain here in a "deprecated" state until after GA. This is to ensure the information truly is not needed
Copied: trunk/ws/docs/Web_Service_Test_View_deprecated (from rev 26734, trunk/ws/docs/Web_Service_Test_View)
Copied: trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide (from rev 26736, trunk/ws/docs/Web_Service_Test_View/JBoss_Web_Services_User_Guide)
Modified: trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Book_Info.xml
===================================================================
--- trunk/ws/docs/Web_Service_Test_View/JBoss_Web_Services_User_Guide/en-US/Book_Info.xml 2010-11-18 20:20:47 UTC (rev 26736)
+++ trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Book_Info.xml 2010-11-19 01:24:34 UTC (rev 26739)
@@ -6,9 +6,9 @@
<bookinfo id="book-JBoss_Web_Services_User_Guide-JBoss_Web_Services_User_Guide">
<title>JBoss Web Services User Guide</title>
<subtitle>short description</subtitle>
- <productname>Documentation</productname>
- <productnumber>0.1</productnumber>
- <edition>0</edition>
+ <productname>JBoss Developer Studio</productname>
+ <productnumber>4.0</productnumber>
+ <edition>1</edition>
<pubsnumber>0</pubsnumber>
<abstract>
<para>
Modified: trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Revision_History.xml
===================================================================
--- trunk/ws/docs/Web_Service_Test_View/JBoss_Web_Services_User_Guide/en-US/Revision_History.xml 2010-11-18 20:20:47 UTC (rev 26736)
+++ trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/en-US/Revision_History.xml 2010-11-19 01:24:34 UTC (rev 26739)
@@ -8,12 +8,12 @@
<simpara>
<revhistory>
<revision>
- <revnumber>0</revnumber>
+ <revnumber>0.0</revnumber>
<date>Tue Sep 7 2010</date>
<author>
- <firstname>Dude</firstname>
- <surname>McPants</surname>
- <email>Dude.McPants(a)example.com</email>
+ <firstname>Ben</firstname>
+ <surname>Clare</surname>
+ <email>bclare(a)redhat.com</email>
</author>
<revdescription>
<simplelist>
Modified: trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/publican.cfg
===================================================================
--- trunk/ws/docs/Web_Service_Test_View/JBoss_Web_Services_User_Guide/publican.cfg 2010-11-18 20:20:47 UTC (rev 26736)
+++ trunk/ws/docs/Web_Service_Test_View_deprecated/JBoss_Web_Services_User_Guide/publican.cfg 2010-11-19 01:24:34 UTC (rev 26739)
@@ -3,7 +3,7 @@
xml_lang: en-US
type: Book
-brand: common
+brand: JBoss
show_remarks: 1
max_image_width: 444
15 years, 5 months