JBoss Tools SVN: r28103 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views/cloud and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-11 14:55:22 -0500 (Tue, 11 Jan 2011)
New Revision: 28103
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java
Log:
[JBIDE-8080] fixed bug when filtering images: returned array that is too large
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-11 19:17:03 UTC (rev 28102)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2011-01-11 19:55:22 UTC (rev 28103)
@@ -1,3 +1,8 @@
+2011-01-11 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java (filter):
+ [JBIDE-8080] fixed bug when filtering images: returned array that is too large
+
2011-01-07 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* plugin.xml:
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java 2011-01-11 19:17:03 UTC (rev 28102)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloud/ImagesCategoryItem.java 2011-01-11 19:55:22 UTC (rev 28103)
@@ -12,6 +12,7 @@
import java.beans.PropertyChangeEvent;
import java.text.MessageFormat;
+import java.util.Collection;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -90,7 +91,8 @@
protected DeltaCloudImage[] filter(DeltaCloudImage[] images) throws DeltaCloudException {
DeltaCloud cloud = getModel();
IImageFilter f = cloud.getImageFilter();
- return f.filter(images).toArray(new DeltaCloudImage[images.length]);
+ Collection<DeltaCloudImage> filteredImages = f.filter(images);
+ return filteredImages.toArray(new DeltaCloudImage[filteredImages.size()]);
}
@Override
13 years, 6 months
JBoss Tools SVN: r28102 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-11 14:17:03 -0500 (Tue, 11 Jan 2011)
New Revision: 28102
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractCloudElementFilter.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractCloudElementFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractCloudElementFilter.java 2011-01-11 16:32:09 UTC (rev 28101)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractCloudElementFilter.java 2011-01-11 19:17:03 UTC (rev 28102)
@@ -65,7 +65,7 @@
protected IFieldMatcher createRule(Iterator<String> rulesIterator) {
Assert.isLegal(rulesIterator.hasNext());
String expression = rulesIterator.next();
- if (expression.equals(ALL_MATCHER_EXPRESSION)) { //$NON-NLS-1$
+ if (expression.equals(ALL_MATCHER_EXPRESSION)) {
return new AllFieldMatcher();
} else {
return new FieldMatcher(expression);
13 years, 6 months
JBoss Tools SVN: r28101 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-11 11:32:09 -0500 (Tue, 11 Jan 2011)
New Revision: 28101
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/unified.target
Log:
add org.eclipse.tptp.trace.feature.group to TP (was in JBDS TP)
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-01-11 16:28:54 UTC (rev 28100)
+++ trunk/build/target-platform/multiple.target 2011-01-11 16:32:09 UTC (rev 28101)
@@ -247,4 +247,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-01-11 16:28:54 UTC (rev 28100)
+++ trunk/build/target-platform/unified.target 2011-01-11 16:32:09 UTC (rev 28101)
@@ -54,6 +54,7 @@
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.eclipse.tptp.trace.feature.group" version="4.3.1.v201009092123-794F9x8s73533H3I6A56"/>
<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s73533D4H6D56"/>
<unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"/>
@@ -246,4 +247,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
13 years, 6 months
JBoss Tools SVN: r28099 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-11 11:28:47 -0500 (Tue, 11 Jan 2011)
New Revision: 28099
Modified:
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/unified.target
trunk/build/target-platform/unified.target.p2mirror.xml
Log:
JBIDE-8040, JBIDE-8037, https://bugs.eclipse.org/bugs/show_bug.cgi?id=333444 - use Eclipse 3.6.2 M20110105-0951 instead of 3.6.1
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-01-11 16:28:37 UTC (rev 28098)
+++ trunk/build/target-platform/multiple.target 2011-01-11 16:28:47 UTC (rev 28099)
@@ -54,6 +54,7 @@
<repository location="http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <unit id="org.eclipse.tptp.trace.feature.group" version="4.3.1.v201009092123-794F9x8s73533H3I6A56"/>
<unit id="org.eclipse.tptp.platform.profile.server.feature.group" version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG"/>
<unit id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version="4.3.1.v201009092123-797908s73533D4H6D56"/>
<unit id="org.eclipse.tptp.platform.core.feature.group" version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t"/>
@@ -99,38 +100,39 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
- <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.0.v20100510-7K7QErDzbb9z-yqHb55T7I"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
- <unit id="org.eclipse.help.feature.group" version="1.2.0.v20100427-7e7jEQFEp4jsWcboLU9l93"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.6.1.r361_v20100714-0800-7z8XFUSFLFlmgLc5z-Bvrt8-HVkH"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_79P9K"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKt90GE5i0KBP5G_AA01911"/>
+ <unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LRkH_6-2D"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFUVFLFlmjAcz--86JeFAKTaF"/>
<unit id="org.eclipse.platform.feature.group" version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L"/>
- <unit id="org.eclipse.platform.ide" version="3.6.1.M20100909-0800"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
+ <unit id="org.eclipse.platform.ide" version="3.6.2.M20110105-0951"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20101222-7N7K7bF8zk1BAKMh0h-590miBLY"/>
<unit id="org.eclipse.platform.sdk" version="3.6.1.M20100909-0800"/>
- <unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ"/>
- <unit id="org.eclipse.sdk.feature.group" version="3.6.1.r361_v20100714-0800-7Q7m6DDaKf5o2z-L9LxPSe6ygafz-KKIqk1rr_3j4dn7J"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL1FET3dhFTug95aglL"/>
+ <unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7ED5cWkFey77Di6JhDoIOyssgHka07bnz0bo8z-Oq"/>
<unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
- <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20100909-0800"/>
+ <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110105-0951"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
<unit id="org.eclipse.sdk.ide" version="3.6.1.M20100909-0800"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
- <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.0.v20100421-7V7RFiwFLSgEt4Pctn77c7J"/>
+ <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
- <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZNFXzxlyl0CrPS8t_228D9D"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.1.R36x_v20101007-9I7VGAuG6-3q1X4grrGiDgF5HRJR"/>
<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20101216-7H7R57v9rtOsIdV8XVDKQ6wjHuKB"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
- <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.0.v20100503-7x7IFGOFQ74dz0POCNUBjA6L"/>
+ <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.1.R36x_v20101007-7x7IFGRFPd5kuz-H8NUDo15S0212"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
- <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20100909-0800"/>
+ <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20110105-0951"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.6.1.r361_v20100827-9OArFLdFjY-ThSQXmKvKz0_T"/>
- <repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFLyFkSAqhRGvl2z-fCfimiBL"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/3.6.x/M20110105-0951/"/>
+ <!-- <repository location="http://download.eclipse.org/eclipse/updates/3.6/"/> -->
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
@@ -245,4 +247,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-01-11 16:28:37 UTC (rev 28098)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-01-11 16:28:47 UTC (rev 28099)
@@ -41,7 +41,7 @@
<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6.x/M20110105-0951/"/>
<repository location="http://download.eclipse.org/releases/helios/"/>
<repository location="http://download.eclipse.org/webtools/repository/helios/"/>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
@@ -57,6 +57,7 @@
<iu id="org.jdom.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
+<iu id="org.eclipse.tptp.trace.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.profile.server.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.core.feature.group" version=""/>
Modified: trunk/build/target-platform/unified.target
===================================================================
--- trunk/build/target-platform/unified.target 2011-01-11 16:28:37 UTC (rev 28098)
+++ trunk/build/target-platform/unified.target 2011-01-11 16:28:47 UTC (rev 28099)
@@ -99,38 +99,39 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="com.ibm.icu.base.feature.group" version="1.1.0.v20090119-79318s73533B57"/>
- <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.0.v20100510-7K7QErDzbb9z-yqHb55T7I"/>
- <unit id="org.eclipse.cvs.feature.group" version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911"/>
- <unit id="org.eclipse.help.feature.group" version="1.2.0.v20100427-7e7jEQFEp4jsWcboLU9l93"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.6.1.r361_v20100714-0800-7z8XFUSFLFlmgLc5z-Bvrt8-HVkH"/>
+ <unit id="org.eclipse.equinox.server.core.feature.group" version="1.0.1.R36x_v20101007-7K7QEtDVci4YrnH_79P9K"/>
+ <unit id="org.eclipse.cvs.feature.group" version="1.2.1.r362_v20101111-7B77FKt90GE5i0KBP5G_AA01911"/>
+ <unit id="org.eclipse.help.feature.group" version="1.2.1.r362_v20101111-7e7jEVFDr6xg-LRkH_6-2D"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFUVFLFlmjAcz--86JeFAKTaF"/>
<unit id="org.eclipse.platform.feature.group" version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L"/>
- <unit id="org.eclipse.platform.ide" version="3.6.1.M20100909-0800"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi"/>
+ <unit id="org.eclipse.platform.ide" version="3.6.2.M20110105-0951"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20101222-7N7K7bF8zk1BAKMh0h-590miBLY"/>
<unit id="org.eclipse.platform.sdk" version="3.6.1.M20100909-0800"/>
- <unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ"/>
- <unit id="org.eclipse.sdk.feature.group" version="3.6.1.r361_v20100714-0800-7Q7m6DDaKf5o2z-L9LxPSe6ygafz-KKIqk1rr_3j4dn7J"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.6.1.r361_v20100727-7b7mFL1FET3dhFTug95aglL"/>
+ <unit id="org.eclipse.sdk.feature.group" version="3.6.2.r362_v20100929-7Q7m7ED5cWkFey77Di6JhDoIOyssgHka07bnz0bo8z-Oq"/>
<unit id="org.eclipse.rcp.id" version="3.6.0.M20100909-0800"/>
- <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20100909-0800"/>
+ <unit id="org.eclipse.rcp.sdk.id" version="3.6.0.M20110105-0951"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.3.0.v20100427-44A77w31211642"/>
<unit id="org.eclipse.sdk.ide" version="3.6.1.M20100909-0800"/>
<unit id="org.eclipse.sdk.examples.feature.group" version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.3.0.v20100527"/>
- <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.0.v20100421-7V7RFiwFLSgEt4Pctn77c7J"/>
+ <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J"/>
<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F"/>
<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="1.0.0.v20100510-4--9oB5855K7P"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr"/>
- <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.0.1.r361_v20100903-897HFZNFXzxlyl0CrPS8t_228D9D"/>
+ <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.6.1.R36x_v20101007-9I7VGAuG6-3q1X4grrGiDgF5HRJR"/>
<unit id="org.eclipse.equinox.serverside.sdk.feature.group" version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw"/>
- <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07"/>
+ <unit id="org.eclipse.equinox.sdk.feature.group" version="3.6.1.r361_v20101216-7H7R57v9rtOsIdV8XVDKQ6wjHuKB"/>
<unit id="org.eclipse.equinox.weaving.sdk.feature.group" version="1.0.0.v20100421-79--EVVFNFFsFc"/>
<unit id="org.eclipse.equinox.server.jetty.feature.group" version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ"/>
- <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.0.v20100503-7x7IFGOFQ74dz0POCNUBjA6L"/>
+ <unit id="org.eclipse.equinox.server.p2.feature.group" version="1.0.1.R36x_v20101007-7x7IFGRFPd5kuz-H8NUDo15S0212"/>
<unit id="org.eclipse.pde.api.tools.ee.fragments.feature.group" version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL"/>
- <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20100909-0800"/>
+ <unit id="org.eclipse.equinox.p2.ui.admin.rcp.product" version="1.1.0.M20110105-0951"/>
<unit id="org.eclipse.equinox.server.servletbridge.feature.group" version="1.0.0.v20100510-42A79oB5855K5E"/>
<unit id="org.eclipse.equinox.server.simple.feature.group" version="1.0.0.v20100510-44DF8s734C48662444"/>
- <unit id="org.eclipse.rcp.feature.group" version="3.6.1.r361_v20100827-9OArFLdFjY-ThSQXmKvKz0_T"/>
+ <unit id="org.eclipse.rcp.feature.group" version="3.6.2.r362_v20101104-9SAxFLyFkSAqhRGvl2z-fCfimiBL"/>
<repository location="http://download.jboss.org/jbosstools/updates/target-platform/latest/"/>
+ <!-- <repository location="http://download.eclipse.org/eclipse/updates/3.6/"/> -->
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.1.v20100709a-9iF7A8FGLY4z0pxX3ORrsdrp6JXb"/>
@@ -245,4 +246,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/unified.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/unified.target.p2mirror.xml 2011-01-11 16:28:37 UTC (rev 28098)
+++ trunk/build/target-platform/unified.target.p2mirror.xml 2011-01-11 16:28:47 UTC (rev 28099)
@@ -57,6 +57,7 @@
<iu id="org.jdom.feature.feature.group" version=""/>
<iu id="org.mozilla.xulrunner.feature.feature.group" version=""/>
<iu id="org.mozilla.xpcom.feature.feature.group" version=""/>
+<iu id="org.eclipse.tptp.trace.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.profile.server.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.instrumentation.ui.feature.group" version=""/>
<iu id="org.eclipse.tptp.platform.core.feature.group" version=""/>
13 years, 6 months
JBoss Tools SVN: r28098 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-11 11:28:37 -0500 (Tue, 11 Jan 2011)
New Revision: 28098
Modified:
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
Log:
https://issues.jboss.org/browse/JBDS-1502 add missing tptp features to JBDS TP
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-01-11 16:08:17 UTC (rev 28097)
+++ trunk/build/target-platform/jbds.target 2011-01-11 16:28:37 UTC (rev 28098)
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?><?pde version="3.6"?>
<target includeMode="feature" name="jbds">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <locations>
+ <location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <!-- Pro tip: to convert
+ from org.eclipse.tptp.platform.xerces_4.6.0.v201005032111-777K4AkF7B77R7c7N77.jar
+ to <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.tptp.platform.xerces.feature.group"/>
+ using vi, apply this transform:
+ :%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit version="\2" id="\1.feature.group"\/>/g
+ -->
+
<!-- CVS -->
<unit version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911" id="org.eclipse.cvs.feature.group"/>
@@ -123,11 +130,16 @@
<unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ" id="org.eclipse.pde.feature.group"/>
<!-- TPTP -->
+ <unit version="4.3.1.v201009092123-794F9x8s73533H3I6A56" id="org.eclipse.tptp.trace.feature.group"/>
+ <unit version="4.5.0.v201005032111-2-37w312116191612" id="org.eclipse.tptp.platform.commons.logging.feature.group"/>
+ <unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t" id="org.eclipse.tptp.platform.core.feature.group"/>
<unit version="4.3.1.v201009092123-797908s73533D4H6D56" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
- <unit version="4.7.1.v201009092123-8X8ZFXUFLWUl6knOxRCm9t" id="org.eclipse.tptp.platform.core.feature.group"/>
+ <unit version="4.5.0.v201005032111-217E7w312116191611" id="org.eclipse.tptp.platform.jakarta.log4j.feature.group"/>
<unit version="4.5.1.v201009092123-797A18s73533L4F6D6D" id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+ <unit version="4.5.1.v201009092123-7H7BF8PAkF7B77ZARCNEK" id="org.eclipse.tptp.platform.probekit.feature.group"/>
<unit version="4.5.1.v201009092123-7H7F2AkF7B77c7dEGDG" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
- <unit version="4.3.1.v201009092123-794F9x8s73533H3I6A56" id="org.eclipse.tptp.trace.feature.group"/>
+ <unit version="4.5.1.v201009092123-7L7O8bBgJ9E99jAfGWEM" id="org.eclipse.tptp.platform.trace.feature.group"/>
+ <unit version="4.6.0.v201005032111-777K4AkF7B77R7c7N77" id="org.eclipse.tptp.platform.xerces.feature.group"/>
<!-- RSE SDK 3.2.1 -->
<unit version="3.2.1.v201008191400-7L78FA-8wqbPcNj4qa8R0eViy7vZ" id="org.eclipse.rse.feature.group"/>
@@ -137,7 +149,7 @@
<unit version="2.0.200.v201005032000-3-8_7w311A1A271116" id="org.eclipse.tm.terminal.telnet.feature.group"/>
<unit version="2.0.200.v201005271030-3-A77w312116382141" id="org.eclipse.tm.terminal.ssh.feature.group"/>
- <repository location="http://download.eclipse.org/releases/helios/"/>
-</location>
-</locations>
+ <repository location="http://download.eclipse.org/releases/helios/"/>
+ </location>
+ </locations>
</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-01-11 16:08:17 UTC (rev 28097)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-01-11 16:28:37 UTC (rev 28098)
@@ -128,11 +128,16 @@
<iu version="" id="org.eclipse.uml2.feature.group"/>
<iu version="" id="org.eclipse.uml2.doc.feature.group"/>
<iu version="" id="org.eclipse.pde.feature.group"/>
+<iu version="" id="org.eclipse.tptp.trace.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.commons.logging.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.core.feature.group"/>
<iu version="" id="org.eclipse.tptp.platform.instrumentation.ui.feature.group"/>
-<iu version="" id="org.eclipse.tptp.platform.core.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.jakarta.log4j.feature.group"/>
<iu version="" id="org.eclipse.tptp.platform.jvmti.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.probekit.feature.group"/>
<iu version="" id="org.eclipse.tptp.platform.profile.server.feature.group"/>
-<iu version="" id="org.eclipse.tptp.trace.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.trace.feature.group"/>
+<iu version="" id="org.eclipse.tptp.platform.xerces.feature.group"/>
<iu version="" id="org.eclipse.rse.feature.group"/>
<iu version="" id="org.eclipse.rse.useractions.feature.group"/>
<iu version="" id="org.eclipse.tm.terminal.feature.group"/>
13 years, 6 months
JBoss Tools SVN: r28097 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-11 11:08:17 -0500 (Tue, 11 Jan 2011)
New Revision: 28097
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java
Log:
JBIDE-8082 - npe and wizard finishing
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-11 15:43:17 UTC (rev 28096)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-11 16:08:17 UTC (rev 28097)
@@ -17,6 +17,8 @@
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FormLayout;
@@ -181,11 +183,25 @@
handleSelection(e.widget);
}
};
-
+ ModifyListener modListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ verifyPageComplete();
+ }
+ };
fillRuntimeTypeCombo();
refreshServerWidgets();
+ verifyPageComplete();
createRSE.addSelectionListener(listener);
createServer.addSelectionListener(listener);
+ autoScanCheck.addSelectionListener(listener);
+ hardCodeServerDetails.addSelectionListener(listener);
+ deployOnlyRadio.addSelectionListener(listener);
+ remoteDetailsLoc.addModifyListener(modListener);
+ serverHomeText.addModifyListener(modListener);
+ serverConfigText.addModifyListener(modListener);
+ deployFolderText.addModifyListener(modListener);
+ autoLocalRuntimeCombo.addModifyListener(modListener);
+ localRuntimeCombo.addModifyListener(modListener);
setControl(c2);
}
@@ -223,8 +239,25 @@
if( w == createServer ) {
refreshServerWidgets();
}
+ verifyPageComplete();
}
+ private void verifyPageComplete() {
+ boolean complete = true;
+ if( createServer.getSelection()) {
+ if( deployOnlyRadio.getSelection()) {
+ complete = !deployFolderText.getText().equals("");
+ } else if( autoScanCheck.getSelection()) {
+ int index = autoLocalRuntimeCombo.getSelectionIndex();
+ complete = index != -1 && !remoteDetailsLoc.getText().equals("");
+ } else if( hardCodeServerDetails.getSelection()) {
+ int index = localRuntimeCombo.getSelectionIndex();
+ complete = index != -1 && !serverHomeText.getText().equals("") && !serverConfigText.getText().equals("");
+ }
+ }
+ setPageComplete(complete);
+ }
+
private void refreshServerWidgets() {
if( initialHost != null ) {
createRSE.setEnabled(false);
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 2011-01-11 15:43:17 UTC (rev 28096)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2011-01-11 16:08:17 UTC (rev 28097)
@@ -79,7 +79,8 @@
@Override
public boolean canFinish() {
- return mainPage.isPageComplete();
+ //return mainPage.isPageComplete();
+ return super.canFinish();
}
@Override
13 years, 6 months
JBoss Tools SVN: r28096 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-11 10:43:17 -0500 (Tue, 11 Jan 2011)
New Revision: 28096
Modified:
trunk/build/aggregate/site/site.xml
Log:
rename JBT 3.2 site (JBDS 1491)
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2011-01-11 14:52:00 UTC (rev 28095)
+++ trunk/build/aggregate/site/site.xml 2011-01-11 15:43:17 UTC (rev 28096)
@@ -3,7 +3,7 @@
<!-- This file is only used when building with Tycho.
If building with Ant (trunk/build/build.xml), see category.*.xml -->
<description>
- JBoss Tools 3.2.0 Update Site / p2 Repo
+ JBoss Tools 3.2 Updates
</description>
<!-- only in JBDS -->
13 years, 6 months
JBoss Tools SVN: r28095 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-11 09:52:00 -0500 (Tue, 11 Jan 2011)
New Revision: 28095
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractCloudElementFilter.java
Log:
cleanup
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractCloudElementFilter.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractCloudElementFilter.java 2011-01-11 13:45:15 UTC (rev 28094)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/AbstractCloudElementFilter.java 2011-01-11 14:52:00 UTC (rev 28095)
@@ -34,7 +34,6 @@
this.cloud = cloud;
}
-
public Collection<CLOUDELEMENT> filter(CLOUDELEMENT[] cloudElements) throws DeltaCloudException {
List<CLOUDELEMENT> filteredElements = new ArrayList<CLOUDELEMENT>();
for (CLOUDELEMENT cloudElement : cloudElements) {
13 years, 6 months
JBoss Tools SVN: r28094 - in trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test: core/client and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-11 08:45:15 -0500 (Tue, 11 Jan 2011)
New Revision: 28094
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/RealmDomUnmarshallingTest.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/RealmResponseFakes.java
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
Log:
[JBIDE-7935] moved realms unmarshalling to separate classes (and added tests).
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2011-01-11 13:44:39 UTC (rev 28093)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2011-01-11 13:45:15 UTC (rev 28094)
@@ -14,6 +14,7 @@
import org.jboss.tools.internal.deltacloud.test.core.client.ImageDomUnmarshallingTest;
import org.jboss.tools.internal.deltacloud.test.core.client.InstanceDomUnmarshallingTest;
import org.jboss.tools.internal.deltacloud.test.core.client.KeyDomUnmarshallingTest;
+import org.jboss.tools.internal.deltacloud.test.core.client.RealmDomUnmarshallingTest;
import org.jboss.tools.internal.deltacloud.test.core.job.CloudSchedulingRulesTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -27,6 +28,7 @@
KeyDomUnmarshallingTest.class,
InstanceDomUnmarshallingTest.class,
ImageDomUnmarshallingTest.class,
- HardwareProfileDomUnmarshallingTest.class})
+ HardwareProfileDomUnmarshallingTest.class,
+ RealmDomUnmarshallingTest.class})
public class DeltaCloudTestSuite {
}
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/RealmDomUnmarshallingTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/RealmDomUnmarshallingTest.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/RealmDomUnmarshallingTest.java 2011-01-11 13:45:15 UTC (rev 28094)
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.internal.deltacloud.test.core.client;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.client.Realm;
+import org.jboss.tools.deltacloud.core.client.Realm.RealmState;
+import org.jboss.tools.deltacloud.core.client.unmarshal.RealmUnmarshaller;
+import org.jboss.tools.deltacloud.core.client.unmarshal.RealmsUnmarshaller;
+import org.jboss.tools.internal.deltacloud.test.fakes.RealmResponseFakes;
+import org.jboss.tools.internal.deltacloud.test.fakes.RealmResponseFakes.RealmsResponse;
+import org.junit.Test;
+
+/**
+ * @author André Dietisheim
+ */
+public class RealmDomUnmarshallingTest {
+
+ @Test
+ public void realmMayBeUnmarshalled() throws DeltaCloudClientException {
+ Realm realm = new Realm();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(RealmResponseFakes.realmResponse.response.getBytes());
+ new RealmUnmarshaller().unmarshall(inputStream, realm);
+ assertNotNull(realm);
+ assertEquals(RealmResponseFakes.realmResponse.id, realm.getId());
+ assertEquals(RealmResponseFakes.realmResponse.name, realm.getName());
+ assertEquals(RealmState.valueOf(RealmResponseFakes.realmResponse.state.toUpperCase()), realm.getState());
+ assertEquals(RealmResponseFakes.realmResponse.getIntLimit(), realm.getLimit());
+ }
+
+ @Test
+ public void emptyLimitSetsDefaultLimit() throws DeltaCloudClientException {
+ Realm realm = new Realm();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(RealmResponseFakes.invalidLimitRealmResponse.response.getBytes());
+ new RealmUnmarshaller().unmarshall(inputStream, realm);
+ assertNotNull(realm);
+ assertEquals(Realm.LIMIT_DEFAULT, realm.getLimit());
+ }
+
+ @Test
+ public void invalidStateSetsUNKNOWNState() throws DeltaCloudClientException {
+ Realm realm = new Realm();
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(RealmResponseFakes.invalidLimitRealmResponse.response.getBytes());
+ new RealmUnmarshaller().unmarshall(inputStream, realm);
+ assertNotNull(realm);
+ assertEquals(Realm.LIMIT_DEFAULT, realm.getLimit());
+ }
+
+ @Test
+ public void realmsMayBeUnmarshalled() throws DeltaCloudClientException {
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(RealmsResponse.response.getBytes());
+ List<Realm> realms = new ArrayList<Realm>();
+ new RealmsUnmarshaller().unmarshall(inputStream, realms);
+ assertEquals(2, realms.size());
+
+ Realm realm = realms.get(0);
+ assertEquals(RealmsResponse.id1, realm.getId());
+ assertEquals(RealmsResponse.name1, realm.getName());
+
+ realm = realms.get(1);
+ assertEquals(RealmsResponse.id2, realm.getId());
+ assertEquals(RealmsResponse.name2, realm.getName());
+ }
+
+}
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/RealmDomUnmarshallingTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/RealmResponseFakes.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/RealmResponseFakes.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/RealmResponseFakes.java 2011-01-11 13:45:15 UTC (rev 28094)
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.internal.deltacloud.test.fakes;
+
+import org.jboss.tools.deltacloud.core.client.Realm.RealmState;
+
+/**
+ * @author André Dietisheim
+ */
+public class RealmResponseFakes {
+
+ public static final RealmResponse realmResponse = new RealmResponse(
+ "http://try.steamcannon.org/deltacloud/api/realms/us-east-1a",
+ "us-east-1a",
+ "us-east-1a",
+ RealmState.AVAILABLE.toString().toLowerCase(),
+ "22");
+ public static final RealmResponse invalidLimitRealmResponse = new RealmResponse(
+ "http://try.steamcannon.org/deltacloud/api/realms/us-east-1a",
+ "us-east-1a",
+ "us-east-1a",
+ RealmState.AVAILABLE.toString().toLowerCase(),
+ "aa");
+
+ public static class RealmResponse {
+
+ public RealmResponse(String url, String id, String name, String state, String limit) {
+ this.url = url;
+ this.id = id;
+ this.name = name;
+ this.state = state;
+ this.limit = limit;
+ this.response = getRealmResponseXML(url, id, name, state, limit);
+ }
+
+ public String url = "http://try.steamcannon.org/deltacloud/api/realms/us-east-1a";
+ public String id = "us-east-1a";
+ public String name = "us-east-1a";
+ public String state = RealmState.AVAILABLE.toString().toLowerCase();
+ public String limit = "22";
+ public String response = getRealmResponseXML(url, id, name, state, limit);
+
+ public int getIntLimit() {
+ return Integer.parseInt(limit);
+ }
+ }
+
+ public static class RealmsResponse {
+
+ public static final String url1 = "http://try.steamcannon.org/deltacloud/api/realms/us-east-1a";
+ public static final String id1 = "us-east-1a";
+ public static final String name1 = "us-east-1a";
+ public static final String state1 = RealmState.AVAILABLE.toString().toLowerCase();
+ public static final String limit1 = "2";
+
+ public static final String url2 = "http://try.steamcannon.org/deltacloud/api/realms/us-east-2a";
+ public static final String id2 = "us-east-2a";
+ public static final String name2 = "us-east-2a";
+ public static final String state2 = RealmState.AVAILABLE.toString().toLowerCase();
+ public static final String limit2 = "12";
+
+ public static final String response =
+ "<realms>"
+ + getRealmResponseXML(url1, id1, name1, state1, limit1)
+ + getRealmResponseXML(url2, id2, name2, state2, limit2)
+ + "</realms>";
+
+ }
+
+ private static String getRealmResponseXML(String url, String id, String name, String state, String limit) {
+ return "<realm href='" + url + "' id='" + id + "'>"
+ + "<name>" + name + "</name>"
+ + "<state>" + state + "</state>"
+ + "<limit>" + limit + "</limit>"
+ + "</realm>";
+ }
+}
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/fakes/RealmResponseFakes.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 6 months