JBoss Tools SVN: r36449 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-18 12:12:23 -0500 (Fri, 18 Nov 2011)
New Revision: 36449
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
Log:
[JBIDE-9927] set a custom ElmenentComparer to the viewer since the available cartridges (items listed in the viewer) are not the same instances as the cartridges embedded into the application (items to be checked in the viewer)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 16:43:24 UTC (rev 36448)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 17:12:23 UTC (rev 36449)
@@ -12,7 +12,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -32,6 +31,7 @@
import org.eclipse.jface.viewers.CheckboxTableViewer;
import org.eclipse.jface.viewers.ColumnWeightData;
import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.IElementComparer;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TableViewerColumn;
import org.eclipse.jface.viewers.ViewerCell;
@@ -103,6 +103,7 @@
TableColumnLayout tableLayout = new TableColumnLayout();
tableContainer.setLayout(tableLayout);
CheckboxTableViewer viewer = new CheckboxTableViewer(table);
+ viewer.setComparer(new EqualityComparer());
viewer.setContentProvider(new ArrayContentProvider());
createTableColumn("Embeddable Cartridge", 1, new CellLabelProvider() {
@@ -262,22 +263,11 @@
setViewerInput(model.loadEmbeddableCartridges());
model.initSelectedEmbeddableCartridges();
getShell().getDisplay().syncExec(new Runnable() {
-
+
@Override
public void run() {
- viewer.setCheckedElements(
- getViewerInstances(model.getSelectedEmbeddableCartridges()));
+ viewer.setCheckedElements(model.getSelectedEmbeddableCartridges().toArray());
}
-
- private Object[] getViewerInstances(List<IEmbeddableCartridge> selectedEmbeddableCartridges) {
- List<IEmbeddableCartridge> viewerInstances = new ArrayList<IEmbeddableCartridge>();
- for (IEmbeddableCartridge cartridge : model.getEmbeddableCartridges()) {
- if (selectedEmbeddableCartridges.contains(cartridge)) {
- viewerInstances.add(cartridge);
- }
- }
- return viewerInstances.toArray();
- }
});
return Status.OK_STATUS;
} catch (Exception e) {
@@ -291,7 +281,7 @@
// ignore
}
}
-
+
private void clearViewer() {
setViewerInput(new ArrayList<IEmbeddableCartridge>());
}
@@ -328,4 +318,34 @@
}
}
+ /**
+ * Viewer element comparer based on #equals(). The default implementation in
+ * CheckboxTableViewer compares elements based on instance identity.
+ * <p>
+ * We need this since the available cartridges (item listed in the viewer)
+ * are not the same instance as the ones in the embedded application (items
+ * to check in the viewer).
+ */
+ private static class EqualityComparer implements IElementComparer {
+
+ @Override
+ public boolean equals(Object thisObject, Object thatObject) {
+ if (thisObject == null) {
+ return thatObject != null;
+ }
+
+ if (thatObject == null) {
+ return false;
+ }
+
+ return thisObject.equals(thatObject);
+ }
+
+ @Override
+ public int hashCode(Object element) {
+ return element.hashCode();
+ }
+
+ }
+
}
\ No newline at end of file
13 years, 1 month
JBoss Tools SVN: r36448 - in trunk/download.jboss.org/jbosstools/updates/indigo: M7 and 6 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-11-18 11:43:24 -0500 (Fri, 18 Nov 2011)
New Revision: 36448
Removed:
trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/extras/M6/compositeArt...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/M6/compositeCon...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/.gitignore
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/.gitignore
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeAr...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeCo...
Log:
remove obsolete versions of regs mirror composite (from old milestones, not longer on www.jboss.org)
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeArtifacts.xml 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo M6 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1308002202000'/>
-</properties>
-<children size='9'>
-<!-- <child location='../../requirements/indigo/201103180900-M6/'/> -->
-<child location='../../requirements/birt/3.7M6/'/>
-<child location='../../requirements/eclipse/3.7M6/'/>
-<child location='../../requirements/emf/2.7M6/'/>
-<child location='../../requirements/m2eclipse/0.13.0.201103291237/'/>
-
-<child location='../../requirements/orbit/S20110124210048/'/>
-<child location='../../requirements/webtools/3.3M6/'/>
-<child location='../../requirements/ecf/3.5/'/>
-<child location='../../requirements/swtbot/2.0.4/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M6/compositeContent.xml 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo M6 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1308002202000'/>
-</properties>
-<children size='9'>
-<!-- <child location='../../requirements/indigo/201103180900-M6/'/> -->
-<child location='../../requirements/birt/3.7M6/'/>
-<child location='../../requirements/eclipse/3.7M6/'/>
-<child location='../../requirements/emf/2.7M6/'/>
-<child location='../../requirements/m2eclipse/0.13.0.201103291237/'/>
-
-<child location='../../requirements/orbit/S20110124210048/'/>
-<child location='../../requirements/webtools/3.3M6/'/>
-<child location='../../requirements/ecf/3.5/'/>
-<child location='../../requirements/swtbot/2.0.4/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeArtifacts.xml 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo M7 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1308003100000'/>
-</properties>
-<children size='10'>
-<child location='../../requirements/indigo/201105060900-M7/'/>
-<child location='../../requirements/birt/3.7M7/'/>
-<child location='../../requirements/eclipse/3.7M7/'/>
-<child location='../../requirements/emf/2.7M7/'/>
-<child location='../../requirements/webtools/3.3M7/'/>
-
-<child location='../../requirements/m2eclipse/0.13.0.201105091504/'/>
-<child location='../../requirements/orbit/S20110515001817/'/>
-<child location='../../requirements/ecf/3.5/'/>
-<child location='../../requirements/swtbot/2.0.4/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/M7/compositeContent.xml 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo M7 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1308003100000'/>
-</properties>
-<children size='10'>
-<child location='../../requirements/indigo/201105060900-M7/'/>
-<child location='../../requirements/birt/3.7M7/'/>
-<child location='../../requirements/eclipse/3.7M7/'/>
-<child location='../../requirements/emf/2.7M7/'/>
-<child location='../../requirements/webtools/3.3M7/'/>
-
-<child location='../../requirements/m2eclipse/0.13.0.201105091504/'/>
-<child location='../../requirements/orbit/S20110515001817/'/>
-<child location='../../requirements/ecf/3.5/'/>
-<child location='../../requirements/swtbot/2.0.4/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeArtifacts... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeArtifacts... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo RC2 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1308250485000'/>
-</properties>
-<children size='10'>
-<child location='../../requirements/indigo/201105270900-RC2/'/>
-<child location='../../requirements/birt/3.7RC2/'/>
-<child location='../../requirements/ecf/3.5/'/>
-<child location='../../requirements/eclipse/3.7RC5/'/>
-<child location='../../requirements/emf/2.7RC3/'/>
-
-<child location='../../requirements/m2eclipse/20110623-1035/'/>
-<child location='../../requirements/orbit/R20110523182458/'/>
-<child location='../../requirements/swtbot/2.0.4/'/>
-<child location='../../requirements/webtools/3.3RC2/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeContent.xml 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/RC2/compositeContent.xml 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo RC2 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1308250485000'/>
-</properties>
-<children size='10'>
-<child location='../../requirements/indigo/201105270900-RC2/'/>
-<child location='../../requirements/birt/3.7RC2/'/>
-<child location='../../requirements/ecf/3.5/'/>
-<child location='../../requirements/eclipse/3.7RC5/'/>
-<child location='../../requirements/emf/2.7RC3/'/>
-
-<child location='../../requirements/m2eclipse/20110623-1035/'/>
-<child location='../../requirements/orbit/R20110523182458/'/>
-<child location='../../requirements/swtbot/2.0.4/'/>
-<child location='../../requirements/webtools/3.3RC2/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeArtifacts... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo SR0 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1314031255000'/>
-</properties>
-<children size='13'>
-<child location='../../requirements/indigo/201105270900-RC2/'/>
-<child location='../../requirements/birt/3.7RC2/'/>
-<child location='../../requirements/ecf/3.5/'/>
-<child location='../../requirements/eclipse/3.7RC5/'/>
-<child location='../../requirements/egit/1.0.0/'/>
-
-<child location='../../requirements/emf/2.7RC3/'/>
-<child location='../../requirements/m2eclipse/20110728-1500/'/>
-<child location='../../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
-<child location='../../requirements/orbit/R20110523182458/'/>
-<child location='../../requirements/swtbot/2.0.4/'/>
-
-<child location='../../requirements/webtools/3.3RC2/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-<child location='http://dl.google.com/eclipse/plugin/3.7/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR0/compositeContent.xml 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo SR0 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1314031263000'/>
-</properties>
-<children size='13'>
-<child location='../../requirements/indigo/201105270900-RC2/'/>
-<child location='../../requirements/birt/3.7RC2/'/>
-<child location='../../requirements/ecf/3.5/'/>
-<child location='../../requirements/eclipse/3.7RC5/'/>
-<child location='../../requirements/egit/1.0.0/'/>
-
-<child location='../../requirements/emf/2.7RC3/'/>
-<child location='../../requirements/m2eclipse/20110728-1500/'/>
-<child location='../../requirements/m2eclipse/m2eclipse-wtp-0.13.1/'/>
-<child location='../../requirements/orbit/R20110523182458/'/>
-<child location='../../requirements/swtbot/2.0.4/'/>
-
-<child location='../../requirements/webtools/3.3RC2/'/>
-<child location='../../requirements/xulrunner-1.9.2/'/>
-<child location='http://dl.google.com/eclipse/plugin/3.7/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/M6/compositeArt...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/M6/compositeArt... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/M6/compositeArt... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1308010282000'/>
-</properties>
-<children size='9'>
-<child location='../../../requirements/egit/0.11/'/>
-<child location='../../../requirements/findbugs/1.3.9/'/>
-<child location='../../../requirements/jslint/1.5/'/>
-<child location='../../../requirements/mylyn/3.6-I20110415-0655/'/>
-<child location='../../../requirements/pmd/3.2.6/'/>
-
-<child location='../../../requirements/springide/2.6.0.201103160035/'/>
-<child location='../../../requirements/subclipse/1.6/'/>
-<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
-<child location='../../../requirements/testng/6.0.1.20110418_1444/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/M6/compositeCon...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/M6/compositeCon... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/M6/compositeCon... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1308010282000'/>
-</properties>
-<children size='9'>
-<child location='../../../requirements/egit/0.11/'/>
-<child location='../../../requirements/findbugs/1.3.9/'/>
-<child location='../../../requirements/jslint/1.5/'/>
-<child location='../../../requirements/mylyn/3.6-I20110415-0655/'/>
-<child location='../../../requirements/pmd/3.2.6/'/>
-
-<child location='../../../requirements/springide/2.6.0.201103160035/'/>
-<child location='../../../requirements/subclipse/1.6/'/>
-<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
-<child location='../../../requirements/testng/6.0.1.20110418_1444/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeAr... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1311110045000'/>
-</properties>
-<children size='9'>
-<child location='../../../requirements/egit/0.11/'/>
-<child location='../../../requirements/findbugs/1.3.9/'/>
-<child location='../../../requirements/jslint/1.5/'/>
-<child location='../../../requirements/mylyn/3.6-v20110608-1400/'/>
-<child location='../../../requirements/pmd/3.2.6/'/>
-
-<child location='../../../requirements/springide/2.6.0.201103160035/'/>
-<child location='../../../requirements/subclipse/1.6_1.3/'/>
-<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
-<child location='../../../requirements/testng/6.0.1.20110418_1444/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/RC2/compositeCo... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1311110057000'/>
-</properties>
-<children size='9'>
-<child location='../../../requirements/egit/0.11/'/>
-<child location='../../../requirements/findbugs/1.3.9/'/>
-<child location='../../../requirements/jslint/1.5/'/>
-<child location='../../../requirements/mylyn/3.6-v20110608-1400/'/>
-<child location='../../../requirements/pmd/3.2.6/'/>
-
-<child location='../../../requirements/springide/2.6.0.201103160035/'/>
-<child location='../../../requirements/subclipse/1.6_1.3/'/>
-<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
-<child location='../../../requirements/testng/6.0.1.20110418_1444/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/.gitignore 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/.gitignore 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1 +0,0 @@
-.directory
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeAr... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1315968445000'/>
-</properties>
-<children size='10'>
-<child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/>
-<child location='../../../requirements/findbugs/1.3.9/'/>
-<child location='../../../requirements/jslint/1.5/'/>
-<child location="../../../requirements/m2eclipse/20110728-1500/"/>
-<child location='../../../requirements/mylyn/3.6-v20110608-1400/'/>
-
-<child location='../../../requirements/pmd/3.2.4/'/>
-<child location='../../../requirements/springide/2.6.0.201103160035/'/>
-<child location='../../../requirements/subclipse/1.6_1.3/'/>
-<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
-<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR0/compositeCo... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1315968445000'/>
-</properties>
-<children size='10'>
-<child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/>
-<child location='../../../requirements/findbugs/1.3.9/'/>
-<child location='../../../requirements/jslint/1.5/'/>
-<child location="../../../requirements/m2eclipse/20110728-1500/"/>
-<child location='../../../requirements/mylyn/3.6-v20110608-1400/'/>
-
-<child location='../../../requirements/pmd/3.2.4/'/>
-<child location='../../../requirements/springide/2.6.0.201103160035/'/>
-<child location='../../../requirements/subclipse/1.6_1.3/'/>
-<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
-<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/.gitignore
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/.gitignore 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/.gitignore 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1 +0,0 @@
-.directory
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeAr...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeAr... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeAr... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1317877601000'/>
-</properties>
-<children size='8'>
-<child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/>
-<child location='../../../requirements/findbugs/1.3.9/'/>
-<child location='../../../requirements/jslint/1.5/'/>
-<child location='../../../requirements/pmd/3.2.4/'/>
-<child location='../../../requirements/springide/2.6.0.201103160035/'/>
-
-<child location='../../../requirements/subclipse/1.6_1.3/'/>
-<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
-<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
-</children>
-</repository>
-
Deleted: trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeCo...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeCo... 2011-11-18 16:41:24 UTC (rev 36447)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/SR1/compositeCo... 2011-11-18 16:43:24 UTC (rev 36448)
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-<properties size='2'>
-<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1317877601000'/>
-</properties>
-<children size='8'>
-<child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/>
-<child location='../../../requirements/findbugs/1.3.9/'/>
-<child location='../../../requirements/jslint/1.5/'/>
-<child location='../../../requirements/pmd/3.2.4/'/>
-<child location='../../../requirements/springide/2.6.0.201103160035/'/>
-
-<child location='../../../requirements/subclipse/1.6_1.3/'/>
-<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
-<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
-</children>
-</repository>
-
13 years, 1 month
JBoss Tools SVN: r36446 - in trunk/download.jboss.org/jbosstools/updates/indigo: extras and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-11-18 11:41:15 -0500 (Fri, 18 Nov 2011)
New Revision: 36446
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/indigo/extras/compositeArtifa...
trunk/download.jboss.org/jbosstools/updates/indigo/extras/compositeConten...
trunk/download.jboss.org/jbosstools/updates/indigo/index.html
Log:
remove obsolete versions of regs mirror composite; switch to SR1a for extras as it's only an updated version of SpringIDE 2.6 -> 2.7.2
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-11-18 16:39:41 UTC (rev 36445)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeArtifacts.xml 2011-11-18 16:41:15 UTC (rev 36446)
@@ -12,10 +12,9 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1316559185000'/>
+<property name='p2.timestamp' value='1321632884000'/>
</properties>
<children size='1'>
-<!-- <child location='RC2/'/> -->
-<child location='SR0/'/>
+<child location='SR1/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-11-18 16:39:41 UTC (rev 36445)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/compositeContent.xml 2011-11-18 16:41:15 UTC (rev 36446)
@@ -12,10 +12,9 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1316559185000'/>
+<property name='p2.timestamp' value='1321632887000'/>
</properties>
<children size='1'>
-<!-- <child location='RC2/'/> -->
-<child location='SR0/'/>
+<child location='SR1/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/extras/compositeArtifa...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/compositeArtifa... 2011-11-18 16:39:41 UTC (rev 36445)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/compositeArtifa... 2011-11-18 16:41:15 UTC (rev 36446)
@@ -3,9 +3,9 @@
<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1316838896000'/>
+<property name='p2.timestamp' value='1321632890000'/>
</properties>
<children size='1'>
-<child location='SR0/'/>
+<child location='SR1a/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/extras/compositeConten...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/extras/compositeConten... 2011-11-18 16:39:41 UTC (rev 36445)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/extras/compositeConten... 2011-11-18 16:41:15 UTC (rev 36446)
@@ -3,9 +3,9 @@
<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1316838899000'/>
+<property name='p2.timestamp' value='1321632893000'/>
</properties>
<children size='1'>
-<child location='SR0/'/>
+<child location='SR1a/'/>
</children>
</repository>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2011-11-18 16:39:41 UTC (rev 36445)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/index.html 2011-11-18 16:41:15 UTC (rev 36446)
@@ -28,11 +28,7 @@
</p>
<p class="bodyText">Available Versions:<ul>
- <li><a href=SR1>Indigo SR1</a></li>
- <li><a href=SR0>Indigo SR0</a> & <a href=extras/SR0>SR0 extras</a></li>
- <li><a href=RC2>Indigo RC2</a> & <a href=extras/RC2>RC2 extras</a></li>
- <li><a href=M7>Indigo M7</a></li>
- <li><a href=M6>Indigo M6</a> & <a href=extras/M6>M6 extras</a></li>
+ <li><a href=SR1>Indigo SR1</a></li> & <a href=extras/SR1a>SR1a extras</a></li>
</ul>
</p>
</td>
13 years, 1 month
JBoss Tools SVN: r36445 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-18 11:39:41 -0500 (Fri, 18 Nov 2011)
New Revision: 36445
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
Log:
[JBIDE-9927] now removing phpmyadmin if you remove mysql cartridge
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2011-11-18 16:29:15 UTC (rev 36444)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2011-11-18 16:39:41 UTC (rev 36445)
@@ -42,7 +42,7 @@
final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1);
try {
WizardUtils.runInWizard(
- new Job(NLS.bind("Embedding cartridges to application \"{0}\"...",
+ new Job(NLS.bind("Adding/Removing embedded cartridges for application {0}...",
wizardModel.getApplication().getName())) {
@Override
@@ -53,7 +53,7 @@
} catch (OpenShiftException e) {
queue.offer(false);
return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
- NLS.bind("Could not embed cartridges to application \"{0}\"",
+ NLS.bind("Could not embed cartridges to application {0}",
wizardModel.getApplication().getName()), e);
}
return Status.OK_STATUS;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 16:29:15 UTC (rev 36444)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 16:39:41 UTC (rev 36445)
@@ -140,7 +140,11 @@
addCartridge(cartridge);
}
} else {
- model.getSelectedEmbeddableCartridges().remove(cartridge);
+ if (IEmbeddableCartridge.MYSQL_51.equals(cartridge)) {
+ removeMySQLCartridge(cartridge);
+ } else {
+ removeCartridge(cartridge);
+ }
}
}
};
@@ -188,11 +192,11 @@
private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) {
if (!viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) {
- if (MessageDialog.openQuestion(getShell(), "Enable MySQL cartridge",
- "To embed PhpMyAdmin, you'd also have to embed MySql. ")) {
- viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true);
+ if (MessageDialog.openQuestion(getShell(), "Embed mysql cartridge",
+ "To embed phpmyadmin, you'd also have to embed mysql.")) {
model.getSelectedEmbeddableCartridges().add(IEmbeddableCartridge.MYSQL_51);
model.getSelectedEmbeddableCartridges().add(cartridge);
+ viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true);
} else {
viewer.setChecked(cartridge, false);
}
@@ -205,6 +209,25 @@
model.getSelectedEmbeddableCartridges().add(cartridge);
}
+ private void removeMySQLCartridge(IEmbeddableCartridge cartridge) {
+ if (viewer.getChecked(IEmbeddableCartridge.PHPMYADMIN_34)) {
+ if (MessageDialog.openQuestion(getShell(), "Remove phpmyadmin cartridge",
+ "If you remove the mysql cartridge, you'd also have to remove phpmyadmin.")) {
+ model.getSelectedEmbeddableCartridges().remove(IEmbeddableCartridge.PHPMYADMIN_34);
+ model.getSelectedEmbeddableCartridges().remove(cartridge);
+ viewer.setChecked(IEmbeddableCartridge.PHPMYADMIN_34, false);
+ } else {
+ viewer.setChecked(cartridge, true);
+ }
+ } else {
+ model.getSelectedEmbeddableCartridges().add(cartridge);
+ }
+ }
+
+ private void removeCartridge(IEmbeddableCartridge cartridge) {
+ model.getSelectedEmbeddableCartridges().remove(cartridge);
+ }
+
private SelectionListener onCheckAll() {
return new SelectionAdapter() {
13 years, 1 month
JBoss Tools SVN: r36444 - in branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo: SR1 and 2 other directories.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-11-18 11:29:15 -0500 (Fri, 18 Nov 2011)
New Revision: 36444
Added:
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
Modified:
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
Log:
remove obsolete versions of regs mirror composite; switch to SR1a for extras as it's only an updated version of SpringIDE 2.6 -> 2.7.2
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:15 UTC (rev 36444)
@@ -3,12 +3,12 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1318538731000'/>
+<property name='p2.timestamp' value='1320910251000'/>
</properties>
<children size='14'>
<child location='../../requirements/indigo/201109230900-SR1/'/>
<child location='../../requirements/birt/3.7.1/'/>
-<child location='../../requirements/bpel/0.5.0-20110915-1141-H87/'/>
+<child location='../../requirements/bpel/0.8.0.v20111109-1901-H94-CI/'/>
<child location='../../requirements/ecf/3.5.2/'/>
<child location='../../requirements/eclipse/3.7.1/'/>
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:15 UTC (rev 36444)
@@ -3,12 +3,12 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR1 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1318538743000'/>
+<property name='p2.timestamp' value='1320910262000'/>
</properties>
<children size='14'>
<child location='../../requirements/indigo/201109230900-SR1/'/>
<child location='../../requirements/birt/3.7.1/'/>
-<child location='../../requirements/bpel/0.5.0-20110915-1141-H87/'/>
+<child location='../../requirements/bpel/0.8.0.v20111109-1901-H94-CI/'/>
<child location='../../requirements/ecf/3.5.2/'/>
<child location='../../requirements/eclipse/3.7.1/'/>
Added: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... (rev 0)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:15 UTC (rev 36444)
@@ -0,0 +1 @@
+.directory
Added: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... (rev 0)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:15 UTC (rev 36444)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1320104639000'/>
+</properties>
+<children size='8'>
+<child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/>
+<child location='../../../requirements/findbugs/1.3.9/'/>
+<child location='../../../requirements/jslint/1.5/'/>
+<child location='../../../requirements/pmd/3.2.4/'/>
+<child location='../../../requirements/springide/2.7.2.201109122348/'/>
+
+<child location='../../../requirements/subclipse/1.6_1.3/'/>
+<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
+<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
+</children>
+</repository>
+
Added: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... (rev 0)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:15 UTC (rev 36444)
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<property name='p2.timestamp' value='1320104643000'/>
+</properties>
+<children size='8'>
+<child location='../../../requirements/eclipsecs/5.4.0.201109110000/'/>
+<child location='../../../requirements/findbugs/1.3.9/'/>
+<child location='../../../requirements/jslint/1.5/'/>
+<child location='../../../requirements/pmd/3.2.4/'/>
+<child location='../../../requirements/springide/2.7.2.201109122348/'/>
+
+<child location='../../../requirements/subclipse/1.6_1.3/'/>
+<child location='../../../requirements/subversive/0.7.9_2.2.2_1.3/'/>
+<child location='../../../requirements/testng/6.1.1.20110823_1537/'/>
+</children>
+</repository>
+
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:15 UTC (rev 36444)
@@ -6,6 +6,6 @@
<property name='p2.timestamp' value='1321632890000'/>
</properties>
<children size='1'>
-<child location='SR1/'/>
+<child location='SR1a/'/>
</children>
</repository>
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:15 UTC (rev 36444)
@@ -6,6 +6,6 @@
<property name='p2.timestamp' value='1321632893000'/>
</properties>
<children size='1'>
-<child location='SR1/'/>
+<child location='SR1a/'/>
</children>
</repository>
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:15 UTC (rev 36444)
@@ -28,11 +28,7 @@
</p>
<p class="bodyText">Available Versions:<ul>
- <li><a href=SR1>Indigo SR1</a></li>
- <li><a href=SR0>Indigo SR0</a> & <a href=extras/SR0>SR0 extras</a></li>
- <li><a href=RC2>Indigo RC2</a> & <a href=extras/RC2>RC2 extras</a></li>
- <li><a href=M7>Indigo M7</a></li>
- <li><a href=M6>Indigo M6</a> & <a href=extras/M6>M6 extras</a></li>
+ <li><a href=SR1>Indigo SR1</a></li> & <a href=extras/SR1a>SR1a extras</a></li>
</ul>
</p>
</td>
13 years, 1 month
JBoss Tools SVN: r36443 - in branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo: extras and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2011-11-18 11:29:01 -0500 (Fri, 18 Nov 2011)
New Revision: 36443
Modified:
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
Log:
latest indigo site (and extras site) should point at SR1, not SR0, since M4 is now released
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:21:33 UTC (rev 36442)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
@@ -12,10 +12,9 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1316559185000'/>
+<property name='p2.timestamp' value='1321632884000'/>
</properties>
<children size='1'>
-<!-- <child location='RC2/'/> -->
-<child location='SR0/'/>
+<child location='SR1/'/>
</children>
</repository>
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:21:33 UTC (rev 36442)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
@@ -12,10 +12,9 @@
endfun
nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
-->
-<property name='p2.timestamp' value='1316559185000'/>
+<property name='p2.timestamp' value='1321632887000'/>
</properties>
<children size='1'>
-<!-- <child location='RC2/'/> -->
-<child location='SR0/'/>
+<child location='SR1/'/>
</children>
</repository>
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:21:33 UTC (rev 36442)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
@@ -3,9 +3,9 @@
<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1316838896000'/>
+<property name='p2.timestamp' value='1321632890000'/>
</properties>
<children size='1'>
-<child location='SR0/'/>
+<child location='SR1/'/>
</children>
</repository>
Modified: branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo...
===================================================================
--- branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:21:33 UTC (rev 36442)
+++ branches/jbosstools-3.3.0.M4/download.jboss.org/jbosstools/updates/indigo... 2011-11-18 16:29:01 UTC (rev 36443)
@@ -3,9 +3,9 @@
<repository name='JBoss Tools Requirements - Composite Indigo Mirror - Extras' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1316838899000'/>
+<property name='p2.timestamp' value='1321632893000'/>
</properties>
<children size='1'>
-<child location='SR0/'/>
+<child location='SR1/'/>
</children>
</repository>
13 years, 1 month
JBoss Tools SVN: r36442 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-18 11:21:33 -0500 (Fri, 18 Nov 2011)
New Revision: 36442
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java
Log:
[JBIDE-9927] embedded cartridges are now correctly checked when the dialog is shown
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-11-18 16:20:53 UTC (rev 36441)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2011-11-18 16:21:33 UTC (rev 36442)
@@ -10,9 +10,19 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.databinding.observable.list.ListDiff;
+import org.eclipse.core.databinding.observable.list.ListDiffEntry;
+import org.eclipse.core.runtime.Assert;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.express.client.IApplication;
import org.jboss.tools.openshift.express.client.ICartridge;
+import org.jboss.tools.openshift.express.client.IEmbeddableCartridge;
import org.jboss.tools.openshift.express.client.IUser;
import org.jboss.tools.openshift.express.client.OpenShiftException;
@@ -27,8 +37,14 @@
private IApplication application;
private String name;
private ICartridge cartridge;
+ private List<IEmbeddableCartridge> selectedCartridges;
public ApplicationWizardModel(IUser user) {
+ this(null, user);
+ }
+
+ public ApplicationWizardModel(IApplication application, IUser user) {
+ this.application = application;
this.user = user;
}
@@ -49,10 +65,10 @@
}
public void createApplication() throws OpenShiftException {
- createApplication(name, cartridge);
+ IApplication application = createApplication(name, cartridge);
+ setApplication(application);
}
-
public void setApplication(IApplication application) {
firePropertyChange(PROPERTY_APPLICATION, this.application, this.application = application);
}
@@ -61,9 +77,64 @@
return application;
}
- public void createApplication(String name, ICartridge cartridge) throws OpenShiftException {
- IApplication application = getUser().createApplication(name, cartridge);
- setApplication(application);
+ public IApplication createApplication(String name, ICartridge cartridge) throws OpenShiftException {
+ return getUser().createApplication(name, cartridge);
}
+
+ public void setSelectedCartridges(List<IEmbeddableCartridge> selectedCartridges) {
+ this.selectedCartridges = selectedCartridges;
+ }
+ public void embedCartridges() throws OpenShiftException {
+ Assert.isNotNull(selectedCartridges);
+ List<IEmbeddableCartridge> addedCartridges = new ArrayList<IEmbeddableCartridge>();
+ List<IEmbeddableCartridge> removedCartridges = new ArrayList<IEmbeddableCartridge>();
+ computeAdditionsAndRemovals(addedCartridges, removedCartridges, selectedCartridges);
+ addEmbeddedCartridges(addedCartridges);
+ removeEmbeddedCartridges(removedCartridges);
+ }
+
+ private void removeEmbeddedCartridges(List<IEmbeddableCartridge> removedCartridges) throws OpenShiftException {
+ if (removedCartridges.isEmpty()) {
+ return;
+ }
+ Collections.sort(removedCartridges, new CartridgeComparator());
+ application.removeEmbbedCartridges(removedCartridges);
+ }
+
+ private void addEmbeddedCartridges(List<IEmbeddableCartridge> addedCartridges) throws OpenShiftException {
+ if (addedCartridges.isEmpty()) {
+ return;
+ }
+ Collections.sort(addedCartridges, new CartridgeComparator());
+ application.addEmbbedCartridges(addedCartridges);
+ }
+
+ private void computeAdditionsAndRemovals(List<IEmbeddableCartridge> addedCartridges,
+ List<IEmbeddableCartridge> removedCartridges, List<IEmbeddableCartridge> selectedCartridges)
+ throws OpenShiftException {
+ ListDiff listDiff = Diffs.computeListDiff(getApplication().getEmbeddedCartridges(), selectedCartridges);
+ for (ListDiffEntry entry : listDiff.getDifferences()) {
+ if (entry.isAddition()) {
+ addedCartridges.add((IEmbeddableCartridge) entry.getElement());
+ } else {
+ removedCartridges.add((IEmbeddableCartridge) entry.getElement());
+ }
+ }
+ }
+
+ private static class CartridgeComparator implements Comparator<IEmbeddableCartridge> {
+
+ @Override
+ public int compare(IEmbeddableCartridge thisCartridge, IEmbeddableCartridge thatCartridge) {
+ // mysql has to be added/removed before phpmyadmin
+ if (thisCartridge.equals(IEmbeddableCartridge.MYSQL_51)) {
+ return -1;
+ } else if (thatCartridge.equals(IEmbeddableCartridge.MYSQL_51)) {
+ return 1;
+ }
+ return 0;
+ }
+ }
+
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-11-18 16:20:53 UTC (rev 36441)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-11-18 16:21:33 UTC (rev 36442)
@@ -329,7 +329,7 @@
@Override
public void widgetSelected(SelectionEvent e) {
- WizardUtils.openWizardDialog(new EmbedCartridgeWizard(model.getUser()), getShell());
+ WizardUtils.openWizardDialog(new EmbedCartridgeWizard(model.getSelectedApplication(), model.getUser()), getShell());
}
};
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2011-11-18 16:20:53 UTC (rev 36441)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2011-11-18 16:21:33 UTC (rev 36442)
@@ -32,8 +32,8 @@
private ApplicationWizardModel wizardModel;
- public EmbedCartridgeWizard(IUser user) {
- this.wizardModel = new ApplicationWizardModel(user);
+ public EmbedCartridgeWizard(IApplication application, IUser user) {
+ this.wizardModel = new ApplicationWizardModel(application, user);
setNeedsProgressMonitor(true);
}
@@ -41,21 +41,24 @@
public boolean performFinish() {
final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1);
try {
- WizardUtils.runInWizard(new Job(NLS.bind("Creating application \"{0}\"...", wizardModel.getName())) {
+ WizardUtils.runInWizard(
+ new Job(NLS.bind("Embedding cartridges to application \"{0}\"...",
+ wizardModel.getApplication().getName())) {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
- wizardModel.createApplication();
- queue.offer(true);
- } catch (OpenShiftException e) {
- queue.offer(false);
- return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
- NLS.bind("Could not create application \"{0}\"", wizardModel.getName()), e);
- }
- return Status.OK_STATUS;
- }
- }, getContainer());
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ wizardModel.embedCartridges();
+ queue.offer(true);
+ } catch (OpenShiftException e) {
+ queue.offer(false);
+ return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
+ NLS.bind("Could not embed cartridges to application \"{0}\"",
+ wizardModel.getApplication().getName()), e);
+ }
+ return Status.OK_STATUS;
+ }
+ }, getContainer());
return queue.poll(10, TimeUnit.SECONDS);
} catch (Exception e) {
return false;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 16:20:53 UTC (rev 36441)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-11-18 16:21:33 UTC (rev 36442)
@@ -133,9 +133,11 @@
IEmbeddableCartridge cartridge = (IEmbeddableCartridge) event.getElement();
if (event.getChecked()) {
if (IEmbeddableCartridge.PHPMYADMIN_34.equals(cartridge)) {
- addPhpMyACartridge(cartridge);
+ addPhpMyAdminCartridge(cartridge);
} else if (IEmbeddableCartridge.JENKINS_14.equals(cartridge)) {
addJenkinsCartridge(cartridge);
+ } else {
+ addCartridge(cartridge);
}
} else {
model.getSelectedEmbeddableCartridges().remove(cartridge);
@@ -159,6 +161,7 @@
protected IStatus run(IProgressMonitor monitor) {
try {
model.createJenkinsApplication(name);
+ model.getSelectedEmbeddableCartridges().add(cartridge);
return Status.OK_STATUS;
} catch (Exception e) {
getShell().getDisplay().syncExec(new Runnable() {
@@ -183,19 +186,25 @@
}
}
- private void addPhpMyACartridge(IEmbeddableCartridge cartridge) {
- if (MessageDialog.openQuestion(getShell(), "Enable MySQL cartridge",
- "To embed PhpMyAdmin, you'd also have to embed MySql. ")) {
- List<IEmbeddableCartridge> selectedCartriges = model.getSelectedEmbeddableCartridges();
- viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true);
- selectedCartriges.add(IEmbeddableCartridge.MYSQL_51);
- selectedCartriges.add(cartridge);
+ private void addPhpMyAdminCartridge(IEmbeddableCartridge cartridge) {
+ if (!viewer.getChecked(IEmbeddableCartridge.MYSQL_51)) {
+ if (MessageDialog.openQuestion(getShell(), "Enable MySQL cartridge",
+ "To embed PhpMyAdmin, you'd also have to embed MySql. ")) {
+ viewer.setChecked(IEmbeddableCartridge.MYSQL_51, true);
+ model.getSelectedEmbeddableCartridges().add(IEmbeddableCartridge.MYSQL_51);
+ model.getSelectedEmbeddableCartridges().add(cartridge);
+ } else {
+ viewer.setChecked(cartridge, false);
+ }
} else {
- viewer.setChecked(cartridge, false);
+ model.getSelectedEmbeddableCartridges().add(cartridge);
}
- refreshViewer();
}
+ private void addCartridge(IEmbeddableCartridge cartridge) {
+ model.getSelectedEmbeddableCartridges().add(cartridge);
+ }
+
private SelectionListener onCheckAll() {
return new SelectionAdapter() {
@@ -228,6 +237,25 @@
protected IStatus run(IProgressMonitor monitor) {
try {
setViewerInput(model.loadEmbeddableCartridges());
+ model.initSelectedEmbeddableCartridges();
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ viewer.setCheckedElements(
+ getViewerInstances(model.getSelectedEmbeddableCartridges()));
+ }
+
+ private Object[] getViewerInstances(List<IEmbeddableCartridge> selectedEmbeddableCartridges) {
+ List<IEmbeddableCartridge> viewerInstances = new ArrayList<IEmbeddableCartridge>();
+ for (IEmbeddableCartridge cartridge : model.getEmbeddableCartridges()) {
+ if (selectedEmbeddableCartridges.contains(cartridge)) {
+ viewerInstances.add(cartridge);
+ }
+ }
+ return viewerInstances.toArray();
+ }
+ });
return Status.OK_STATUS;
} catch (Exception e) {
clearViewer();
@@ -240,7 +268,7 @@
// ignore
}
}
-
+
private void clearViewer() {
setViewerInput(new ArrayList<IEmbeddableCartridge>());
}
@@ -255,16 +283,6 @@
});
}
- private void refreshViewer() {
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- viewer.refresh(true, true);
- }
- });
- }
-
private static class JenkinsApplicationDialog extends InputDialog {
public JenkinsApplicationDialog(Shell shell) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-11-18 16:20:53 UTC (rev 36441)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2011-11-18 16:21:33 UTC (rev 36442)
@@ -38,8 +38,19 @@
public EmbedCartridgeWizardPageModel(ApplicationWizardModel wizardModel) {
this.wizardModel = wizardModel;
+ wizardModel.setSelectedCartridges(selectedEmbeddableCartridges);
}
+ public void initSelectedEmbeddableCartridges() throws OpenShiftException {
+ IApplication application = wizardModel.getApplication();
+ if (application == null
+ || application.getEmbeddedCartridges() == null) {
+ return;
+ }
+ List<IEmbeddableCartridge> embeddedCartridges = application.getEmbeddedCartridges();
+ getSelectedEmbeddableCartridges().addAll(embeddedCartridges);
+ }
+
public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException {
List<IEmbeddableCartridge> cartridges = wizardModel.getUser().getEmbeddableCartridges();
setEmbeddableCartridges(cartridges);
@@ -58,7 +69,7 @@
public List<IEmbeddableCartridge> getSelectedEmbeddableCartridges() {
return selectedEmbeddableCartridges;
}
-
+
public boolean hasApplication(ICartridge cartridge) {
try {
return wizardModel.getUser().hasApplication(cartridge);
@@ -70,6 +81,6 @@
}
public void createJenkinsApplication(String name) throws OpenShiftException {
- IApplication application = wizardModel.getUser().createApplication(name, ICartridge.JENKINS_14);
+ wizardModel.getUser().createApplication(name, ICartridge.JENKINS_14);
}
}
13 years, 1 month
JBoss Tools SVN: r36441 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-18 11:20:53 -0500 (Fri, 18 Nov 2011)
New Revision: 36441
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
Log:
[JBIDE-9927] switched to latest client jar
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 1 month
JBoss Tools SVN: r36440 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-11-18 10:25:09 -0500 (Fri, 18 Nov 2011)
New Revision: 36440
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
Log:
[JBIDE-9927] switched to latest client jar
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 1 month