JBoss Tools SVN: r40598 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-04-27 19:20:52 -0400 (Fri, 27 Apr 2012)
New Revision: 40598
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
Log:
JBIDE-11540
https://issues.jboss.org/browse/JBIDE-11540
Collecting bean stereotypes is fixed.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2012-04-27 23:19:59 UTC (rev 40597)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2012-04-27 23:20:52 UTC (rev 40598)
@@ -145,42 +145,55 @@
}
public Set<IStereotypeDeclaration> getStereotypeDeclarations() {
- return getStereotypeDeclarations(true);
+ return getStereotypeDeclarations(false);
}
public Set<IStereotypeDeclaration> getStereotypeDeclarations(boolean includeInherited) {
Set<IStereotypeDeclaration> result = new HashSet<IStereotypeDeclaration>();
+ Set<IStereotype> ss = new HashSet<IStereotype>();
for (IAnnotationDeclaration d: definition.getAnnotations()) {
if(d instanceof IStereotypeDeclaration) {
- if(d instanceof IStereotypeDeclaration) {
- result.add((IStereotypeDeclaration)d);
+ IStereotypeDeclaration sd = (IStereotypeDeclaration)d;
+ result.add(sd);
+ if(sd.getStereotype() != null) ss.add(sd.getStereotype());
+ }
+ }
+ Set<IStereotypeDeclaration> delta1 = result;
+ Set<IStereotypeDeclaration> delta2 = new HashSet<IStereotypeDeclaration>();
+ while(!delta1.isEmpty()) {
+ for (IStereotypeDeclaration d: delta1) {
+ IStereotype s = d.getStereotype();
+ if(s == null) continue;
+ Set<IStereotypeDeclaration> ds = s.getStereotypeDeclarations();
+ for (IStereotypeDeclaration d1: ds) {
+ if(d1.getStereotype() != null) {
+ if(!result.contains(d1) && !delta2.contains(d1)) delta2.add(d1);
+ }
}
}
+ if(delta2.isEmpty()) break;
+ for (IStereotypeDeclaration d: delta2) {
+ result.add(d);
+ if(d.getStereotype() != null) ss.add(d.getStereotype());
+ }
+ delta1 = delta2;
+ delta2 = new HashSet<IStereotypeDeclaration>();
}
if(includeInherited) {
- Set<IStereotypeDeclaration> delta1 = result;
- Set<IStereotypeDeclaration> delta2 = new HashSet<IStereotypeDeclaration>();
- while(!delta1.isEmpty()) {
- for (IStereotypeDeclaration d: delta1) {
- IStereotype s = d.getStereotype();
- if(s == null) continue;
- Set<IStereotypeDeclaration> ds = s.getStereotypeDeclarations();
- for (IStereotypeDeclaration d1: ds) {
- IStereotype s1 = d1.getStereotype();
- if(s1 != null/* && s1.getInheritedDeclaration() != null*/) {
- if(!result.contains(d1) && !delta2.contains(d1)) delta2.add(d1);
- }
- }
+ Set<IStereotypeDeclaration> ds = getInheritedStereotypDeclarations();
+ for (IStereotypeDeclaration d : ds) {
+ if (d.getStereotype() != null && !ss.contains(d.getStereotype())) {
+ result.add(d);
}
- if(delta2.isEmpty()) break;
- result.addAll(delta2);
- delta1 = delta2;
- delta2 = new HashSet<IStereotypeDeclaration>();
}
}
return result;
}
+ public Set<IStereotypeDeclaration> getInheritedStereotypDeclarations() {
+ return Collections.emptySet();
+ }
+
public Set<IQualifierDeclaration> getQualifierDeclarations() {
return getQualifierDeclarations(false);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2012-04-27 23:19:59 UTC (rev 40597)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2012-04-27 23:20:52 UTC (rev 40598)
@@ -431,7 +431,7 @@
if(getCDIProject().isClassAlternativeActivated(getDefinition().getQualifiedName())) {
return true;
}
- Set<IStereotypeDeclaration> ds = getStereotypeDeclarations();
+ Set<IStereotypeDeclaration> ds = getStereotypeDeclarations(true);
for (IStereotypeDeclaration d: ds) {
IStereotype s = d.getStereotype();
if(s != null && s.isAlternative() && !getCDIProject().getAlternatives(s.getSourceType().getFullyQualifiedName()).isEmpty()) {
@@ -569,7 +569,7 @@
if(getDefinition().getAlternativeAnnotation() != null && getCDIProject().isTypeAlternative(getBeanClass().getFullyQualifiedName())) {
return true;
}
- Set<IStereotypeDeclaration> ds = getStereotypeDeclarations();
+ Set<IStereotypeDeclaration> ds = getStereotypeDeclarations(true);
for (IStereotypeDeclaration d: ds) {
IStereotype s = d.getStereotype();
if(s != null && s.isAlternative() &&
13 years, 7 months
JBoss Tools SVN: r40597 - in trunk/openshift/plugins: org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-04-27 19:19:59 -0400 (Fri, 27 Apr 2012)
New Revision: 40597
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
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/EmbedCartridgeWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
In progress - JBIDE-11505
Provide ability to create a scalable and gearsized OpenShift application with JBoss Tools
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-04-27 23:05:26 UTC (rev 40596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-04-27 23:19:59 UTC (rev 40597)
@@ -23,10 +23,12 @@
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectToOpenShiftWizard;
+import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
import com.openshift.client.IDomain;
import com.openshift.client.IEmbeddableCartridge;
+import com.openshift.client.IGearProfile;
import com.openshift.client.IUser;
import com.openshift.client.OpenShiftException;
@@ -111,10 +113,10 @@
return (delegate.getPassword() != null && !"".equals(delegate.getPassword()));
}
- public IApplication createApplication(String applicationName, ICartridge applicationType)
+ public IApplication createApplication(final String applicationName, final ICartridge applicationType, final ApplicationScale scale, final IGearProfile gearProfile)
throws OpenShiftException, SocketTimeoutException {
if(checkForPassword()) {
- return delegate.getDefaultDomain().createApplication(applicationName, applicationType);
+ return delegate.getDefaultDomain().createApplication(applicationName, applicationType, scale, gearProfile);
}
return null;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-04-27 23:05:26 UTC (rev 40596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-04-27 23:19:59 UTC (rev 40597)
@@ -88,9 +88,11 @@
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils.IWidgetVisitor;
+import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
import com.openshift.client.IEmbeddableCartridge;
+import com.openshift.client.IGearProfile;
import com.openshift.client.NotFoundOpenShiftException;
import com.openshift.client.OpenShiftException;
@@ -106,10 +108,10 @@
private Text existingAppNameText;
private Button browseAppsButton;
private Group newAppConfigurationGroup;
- private Label newAppNameLabel;
private Text newAppNameText;
- private Label newAppTypeLabel;
private Combo newAppCartridgeCombo;
+ private Button enableScalingButton;
+ private Combo gearProfilesCombo;
private Group newAppEmbeddableCartridgesGroup;
private Button checkAllButton;
private Button uncheckAllButton;
@@ -232,7 +234,7 @@
this.newAppConfigurationGroup = new Group(parent, SWT.NONE);
newAppConfigurationGroup.setText("New application");
GridLayoutFactory.fillDefaults()
- .numColumns(2).margins(6, 6).applyTo(newAppConfigurationGroup);
+ .numColumns(3).margins(6, 6).applyTo(newAppConfigurationGroup);
GridDataFactory.fillDefaults()
.grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(newAppConfigurationGroup);
@@ -242,11 +244,11 @@
onUseExistingApplication(
newAppConfigurationGroup, existingAppNameText, browseAppsButton));
- this.newAppNameLabel = new Label(newAppConfigurationGroup, SWT.NONE);
+ final Label newAppNameLabel = new Label(newAppConfigurationGroup, SWT.NONE);
newAppNameLabel.setText("Name:");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(newAppNameLabel);
this.newAppNameText = new Text(newAppConfigurationGroup, SWT.BORDER);
- GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.FILL).applyTo(newAppNameText);
+ GridDataFactory.fillDefaults().grab(true, false).span(2, 1).align(SWT.FILL, SWT.FILL).applyTo(newAppNameText);
UIUtils.selectAllOnFocus(newAppNameText);
final IObservableValue applicationNameTextObservable =
WidgetProperties.text(SWT.Modify).observe(newAppNameText);
@@ -255,13 +257,13 @@
pageModel);
ValueBindingBuilder.bind(applicationNameTextObservable).to(applicationNameModelObservable).in(dbc);
- this.newAppTypeLabel = new Label(newAppConfigurationGroup, SWT.NONE);
+ final Label newAppTypeLabel = new Label(newAppConfigurationGroup, SWT.NONE);
newAppTypeLabel.setText("Type:");
GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.CENTER).span(1, 1).applyTo(newAppTypeLabel);
this.newAppCartridgeCombo = new Combo(newAppConfigurationGroup, SWT.BORDER | SWT.READ_ONLY);
GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false).applyTo(newAppCartridgeCombo);
+ .align(SWT.FILL, SWT.CENTER).span(2, 1).grab(true, false).applyTo(newAppCartridgeCombo);
fillCartridgesCombo(dbc, newAppCartridgeCombo);
final ISWTObservableValue selectedCartridgeComboObservable =
WidgetProperties.selection().observe(newAppCartridgeCombo);
@@ -285,10 +287,39 @@
ControlDecorationSupport.create(newApplicationTypeValidator, SWT.LEFT | SWT.TOP, null,
new CustomControlDecorationUpdater());
+ // gear size
+ final Label gearProfileLabel = new Label(newAppConfigurationGroup, SWT.NONE);
+ gearProfileLabel.setText("Gear profile:");
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).span(1, 1).applyTo(gearProfileLabel);
+ this.gearProfilesCombo = new Combo(newAppConfigurationGroup, SWT.BORDER | SWT.READ_ONLY);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).span(1, 1).grab(true, false).applyTo(gearProfilesCombo);
+ fillGearProfilesCombo(dbc, gearProfilesCombo);
+ final ISWTObservableValue gearSizeComboObservable =
+ WidgetProperties.selection().observe(gearProfilesCombo);
+ final IObservableValue selectedGearProfileModelObservable = BeanProperties.value(
+ ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_GEAR_PROFILE).observe(pageModel);
+ ValueBindingBuilder.bind(gearSizeComboObservable)
+ .converting(new StringToGearProfileConverter())
+ .to(selectedGearProfileModelObservable)
+ .converting(new GearProfileToStringConverter())
+ .in(dbc);
+
+ // scaling
+ this.enableScalingButton = new Button(newAppConfigurationGroup, SWT.CHECK);
+ enableScalingButton.setText("Enable scaling");
+ IObservableValue enableScalingModelObservable = BeanProperties.value(
+ ApplicationConfigurationWizardPageModel.PROPERTY_APPLICATION_SCALE).observe(pageModel);
+ final IObservableValue enableScalingButtonSelection = WidgetProperties.selection().observe(enableScalingButton);
+ ValueBindingBuilder.bind(enableScalingButtonSelection).converting(new BooleanToApplicationScaleConverter())
+ .to(enableScalingModelObservable).converting(new ApplicationScaleToBooleanConverter()).in(dbc);
+
+
// embeddable cartridges
this.newAppEmbeddableCartridgesGroup = new Group(newAppConfigurationGroup, SWT.NONE);
newAppEmbeddableCartridgesGroup.setText("Embeddable Cartridges");
- GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).span(2, 1)
+ GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).span(3, 1)
.applyTo(newAppEmbeddableCartridgesGroup);
GridLayoutFactory.fillDefaults().numColumns(2).margins(6, 6).applyTo(newAppEmbeddableCartridgesGroup);
@@ -374,6 +405,13 @@
new UpdateListStrategy().setConverter(new CartridgeToStringConverter()));
}
+ private void fillGearProfilesCombo(DataBindingContext dbc, Combo gearSizesCombo) {
+ dbc.bindList(WidgetProperties.items().observe(gearSizesCombo),
+ BeanProperties.list(ApplicationConfigurationWizardPageModel.PROPERTY_GEAR_PROFILES).observe(pageModel),
+ new UpdateListStrategy(UpdateListStrategy.POLICY_NEVER),
+ new UpdateListStrategy().setConverter(new GearProfileToStringConverter()));
+ }
+
protected CheckboxTableViewer createTable(Composite tableContainer) {
Table table =
new Table(tableContainer, SWT.BORDER | SWT.FULL_SELECTION | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK);
@@ -581,7 +619,69 @@
return null;
}
}
+
+ private static final class GearProfileToStringConverter extends Converter {
+ private GearProfileToStringConverter() {
+ super(Object.class, String.class);
+ }
+ @Override
+ public Object convert(Object fromObject) {
+ if (!(fromObject instanceof IGearProfile)) {
+ return null;
+ }
+ return ((IGearProfile) fromObject).getName();
+ }
+ }
+
+ private final class StringToGearProfileConverter extends Converter {
+ private StringToGearProfileConverter() {
+ super(String.class, IGearProfile.class);
+ }
+
+ @Override
+ public Object convert(Object fromObject) {
+ if (fromObject instanceof String) {
+ return pageModel.getGearProfileByName((String) fromObject);
+ }
+ return null;
+ }
+ }
+
+ private static final class ApplicationScaleToBooleanConverter extends Converter {
+ private ApplicationScaleToBooleanConverter() {
+ super(Object.class, Boolean.class);
+ }
+
+ @Override
+ public Object convert(Object fromObject) {
+ if (!(fromObject instanceof ApplicationScale)) {
+ return null;
+ }
+ switch((ApplicationScale)fromObject) {
+ case SCALE:
+ return Boolean.TRUE;
+ default:
+ return Boolean.FALSE;
+ }
+ }
+ }
+
+ private final class BooleanToApplicationScaleConverter extends Converter {
+ private BooleanToApplicationScaleConverter() {
+ super(Boolean.class, ApplicationScale.class);
+ }
+
+ @Override
+ public Object convert(Object fromObject) {
+ if (fromObject instanceof Boolean) {
+ return ((Boolean) fromObject).booleanValue() ? ApplicationScale.SCALE : ApplicationScale.NO_SCALE;
+ }
+ return null;
+ }
+ }
+
+
private static class JenkinsApplicationDialog extends InputDialog {
public JenkinsApplicationDialog(Shell shell) {
@@ -741,6 +841,19 @@
}
}
}, getContainer(), dbc);
+ WizardUtils.runInWizard(new Job("Loading gear sizes...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ pageModel.loadGearProfiles();
+ return Status.OK_STATUS;
+ } catch (NotFoundOpenShiftException e) {
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return OpenShiftUIActivator.createErrorStatus("Could not load gear sizes", e);
+ }
+ }
+ }, getContainer(), dbc);
} catch (Exception ex) {
// ignore
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-04-27 23:05:26 UTC (rev 40596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-04-27 23:19:59 UTC (rev 40597)
@@ -23,9 +23,11 @@
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
import com.openshift.client.IEmbeddableCartridge;
+import com.openshift.client.IGearProfile;
import com.openshift.client.OpenShiftException;
/**
@@ -36,14 +38,19 @@
public class ApplicationConfigurationWizardPageModel extends ObservableUIPojo {
public static final String PROPERTY_USE_EXISTING_APPLICATION = "useExistingApplication";
+ public static final String PROPERTY_APPLICATION_SCALE = "applicationScale";
public static final String PROPERTY_EXISTING_APPLICATION_NAME = "existingApplicationName";
public static final String PROPERTY_CARTRIDGES = "cartridges";
public static final String PROPERTY_EMBEDDED_CARTRIDGES = "embeddedCartridges";
public static final String PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges";
public static final String PROPERTY_SELECTED_CARTRIDGE = "selectedCartridge";
+ public static final String PROPERTY_SELECTED_GEAR_PROFILE = "selectedGearProfile";
public static final String PROPERTY_APPLICATION_NAME = "applicationName";
public static final String PROPERTY_EXISTING_APPLICATIONS = "existingApplications";
public static final String PROPERTY_EXISTING_APPLICATIONS_LOADED = "existingApplicationsLoaded";
+ public static final String PROPERTY_SCALABLE_APPLICATION = "scalableApplication";
+ public static final String PROPERTY_GEAR_PROFILES = "gearProfiles";
+
private final OpenShiftExpressApplicationWizardModel wizardModel;
@@ -51,6 +58,7 @@
// first pass validation)
private List<IApplication> existingApplications = new ArrayList<IApplication>();
private List<ICartridge> cartridges = new ArrayList<ICartridge>();
+ private List<IGearProfile> gearProfiles = new ArrayList<IGearProfile>();
private List<IEmbeddableCartridge> embeddedCartridges = new ArrayList<IEmbeddableCartridge>();
private String existingApplicationName;
private boolean existingApplicationsLoaded = false;;
@@ -106,7 +114,18 @@
, wizardModel.isUseExistingApplication()
, wizardModel.setUseExistingApplication(useExistingApplication));
}
+
+ public ApplicationScale getApplicationScale() {
+ return wizardModel.getApplicationScale();
+ }
+ public void setApplicationScale(ApplicationScale scale) {
+ firePropertyChange(PROPERTY_APPLICATION_SCALE
+ , wizardModel.getApplicationScale()
+ , wizardModel.setApplicationScale(scale));
+ }
+
+
protected void setUseExistingApplication(IApplication application) {
setUseExistingApplication(application != null);
}
@@ -190,6 +209,7 @@
firePropertyChange(PROPERTY_CARTRIDGES, this.cartridges, this.cartridges = cartridges);
}
+
public List<ICartridge> getCartridges() {
return cartridges;
}
@@ -215,6 +235,47 @@
return wizardModel.getApplicationCartridge();
}
+ public void loadGearProfiles() throws OpenShiftException, SocketTimeoutException {
+ setGearProfiles(getUser().getDefaultDomain().getAvailableGearProfiles());
+ //refreshSelectedCartridge();
+ }
+
+
+ public void setGearProfiles(List<IGearProfile> gearProfiles) {
+ firePropertyChange(PROPERTY_GEAR_PROFILES, this.gearProfiles, this.gearProfiles = gearProfiles);
+ }
+
+ public List<IGearProfile> getGearProfiles() {
+ return gearProfiles;
+ }
+
+ public IGearProfile getSelectedGearProfile() {
+ return wizardModel.getApplicationGearProfile();
+ }
+
+ public void setSelectedGearProfile(IGearProfile gearProfile) {
+ firePropertyChange(PROPERTY_SELECTED_GEAR_PROFILE
+ , wizardModel.getApplicationGearProfile()
+ , wizardModel.setApplicationGearProfile(gearProfile));
+ }
+
+ public IGearProfile getGearProfileByName(String name) {
+ List<IGearProfile> gearProfiles = getGearProfiles();
+ if (gearProfiles == null) {
+ return null;
+ }
+
+ IGearProfile matchingGearProfile = null;
+ for (IGearProfile gearProfile : gearProfiles) {
+ if (name.equals(gearProfile.getName())) {
+ matchingGearProfile = gearProfile;
+ break;
+ }
+ }
+
+ return matchingGearProfile;
+ }
+
/**
* forces property change listeners to update their value
*/
@@ -342,7 +403,7 @@
}
public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException {
- return wizardModel.createApplication(name, ICartridge.JENKINS_14, monitor);
+ return wizardModel.createApplication(name, ICartridge.JENKINS_14, ApplicationScale.NO_SCALE, IGearProfile.SMALL, monitor);
}
}
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 2012-04-27 23:05:26 UTC (rev 40596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2012-04-27 23:19:59 UTC (rev 40597)
@@ -18,8 +18,10 @@
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
+import com.openshift.client.IGearProfile;
import com.openshift.client.OpenShiftApplicationNotAvailableException;
import com.openshift.client.OpenShiftException;
@@ -40,6 +42,8 @@
private IApplication application;
private String name;
private ICartridge cartridge;
+ private ApplicationScale scale;
+ private IGearProfile gearProfile;
public ApplicationWizardModel(UserDelegate user) {
this(null, user);
@@ -54,14 +58,24 @@
return user;
}
- public String getName() {
- return name;
- }
-
public String setName(String name) {
return this.name = name;
}
+ /**
+ * @param scale the scale to set
+ */
+ public final void setScale(ApplicationScale scale) {
+ this.scale = scale;
+ }
+
+ /**
+ * @param gearProfile the gearProfile to set
+ */
+ public final void setGearProfile(IGearProfile gearProfile) {
+ this.gearProfile = gearProfile;
+ }
+
public void setCartridge(ICartridge cartridge) {
this.cartridge = cartridge;
}
@@ -76,12 +90,12 @@
}
public void createApplication(IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException {
- IApplication application = createApplication(name, cartridge, monitor);
+ IApplication application = createApplication(this.name, this.cartridge, this.scale , this.gearProfile, monitor);
setApplication(application);
}
- public IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException {
+ public IApplication createApplication(final String name, final ICartridge cartridge, final ApplicationScale scale, final IGearProfile gearProfile, IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException {
// monitor.subTask("creating application...");
- IApplication application = getUser().createApplication(name, cartridge);
+ IApplication application = getUser().createApplication(name, cartridge, scale, gearProfile);
waitForAccessible(application, monitor);
return application;
}
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 2012-04-27 23:05:26 UTC (rev 40596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPageModel.java 2012-04-27 23:19:59 UTC (rev 40597)
@@ -22,10 +22,12 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
import com.openshift.client.IEmbeddableCartridge;
import com.openshift.client.IEmbeddedCartridge;
+import com.openshift.client.IGearProfile;
import com.openshift.client.OpenShiftException;
/**
@@ -89,7 +91,7 @@
}
public IApplication createJenkinsApplication(String name, IProgressMonitor monitor) throws OpenShiftException, SocketTimeoutException {
- return wizardModel.createApplication(name, ICartridge.JENKINS_14, monitor);
+ return wizardModel.createApplication(name, ICartridge.JENKINS_14, ApplicationScale.NO_SCALE, IGearProfile.SMALL, monitor);
}
/**
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-04-27 23:05:26 UTC (rev 40596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-04-27 23:19:59 UTC (rev 40597)
@@ -25,9 +25,11 @@
import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
import com.openshift.client.IEmbeddableCartridge;
+import com.openshift.client.IGearProfile;
import com.openshift.client.OpenShiftException;
/**
@@ -40,7 +42,10 @@
public static final String APPLICATION = "application";
public static final String APPLICATION_NAME = "applicationName";
public static final String APPLICATION_CARTRIDGE = "applicationCartridge";
- public static final String USE_EXISTING_APPLICATION = "uswizardModel.getApplicationName()eExistingApplication";
+ public static final String APPLICATION_GEAR_PROFILE = "applicationGearProfile";
+ public static final String APPLICATION_SCALE = "applicationScale";
+ //public static final String USE_EXISTING_APPLICATION = "uswizardModel.getApplicationName()eExistingApplication";
+ public static final String USE_EXISTING_APPLICATION = "useExistingApplication";
public static final String REMOTE_NAME = "remoteName";
public static final String REPOSITORY_PATH = "repositoryPath";
public static final String PROJECT_NAME = "projectName";
@@ -197,4 +202,12 @@
public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges();
+ IGearProfile getApplicationGearProfile();
+
+ IGearProfile setApplicationGearProfile(IGearProfile gearProfile);
+
+ ApplicationScale getApplicationScale();
+
+ ApplicationScale setApplicationScale(final ApplicationScale scale);
+
}
\ No newline at end of file
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-04-27 23:05:26 UTC (rev 40596)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-04-27 23:19:59 UTC (rev 40597)
@@ -15,35 +15,31 @@
import java.util.concurrent.FutureTask;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureGitSharedProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureUnsharedProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportNewProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ServerAdapterFactory;
-import org.osgi.service.prefs.BackingStoreException;
+import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
import com.openshift.client.ICartridge;
import com.openshift.client.IEmbeddableCartridge;
+import com.openshift.client.IGearProfile;
import com.openshift.client.OpenShiftApplicationNotAvailableException;
import com.openshift.client.OpenShiftException;
@@ -234,6 +230,9 @@
setUseExistingApplication(application);
setApplicationCartridge(application);
setApplicationName(application);
+ setApplicationScaling(application);
+ setApplicationGearProfile(application);
+
}
@Override
@@ -368,6 +367,22 @@
setUseExistingApplication(application != null);
}
+ @Override
+ public ApplicationScale getApplicationScale() {
+ return (ApplicationScale) getProperty(APPLICATION_SCALE);
+ }
+
+ @Override
+ public ApplicationScale setApplicationScale(final ApplicationScale scale) {
+ return (ApplicationScale) setProperty(APPLICATION_SCALE, scale);
+ }
+
+ protected void setApplicationScaling(IApplication application) {
+ if(application != null) {
+ setApplicationScale(application.getApplicationScale());
+ }
+ }
+
private void waitForAccessible(IApplication application, IProgressMonitor monitor)
throws OpenShiftApplicationNotAvailableException, OpenShiftException {
// monitor.subTask("waiting for application to become accessible...");
@@ -377,7 +392,7 @@
}
}
- protected IApplication createApplication(final String name, final ICartridge cartridge, final IProgressMonitor monitor)
+ protected IApplication createApplication(final String name, final ICartridge cartridge, final ApplicationScale scale, final IGearProfile gearProfile, final IProgressMonitor monitor)
throws OpenShiftApplicationNotAvailableException, OpenShiftException {
final UserDelegate user = getUser();
if (user == null) {
@@ -392,7 +407,7 @@
monitor.setTaskName("Creating application \"" + name + "\"...");
Logger.debug("creating application...");
final IApplication application
- = user.createApplication(name, cartridge);
+ = user.createApplication(name, cartridge, scale, gearProfile);
monitor.beginTask("Waiting for application to be reachable...",
IProgressMonitor.UNKNOWN);
Logger.debug("Waiting for application to be reachable...");
@@ -420,7 +435,7 @@
public void createApplication(IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException,
OpenShiftException {
- IApplication application = createApplication(getApplicationName(), getApplicationCartridge(), monitor);
+ IApplication application = createApplication(getApplicationName(), getApplicationCartridge(), getApplicationScale(), getApplicationGearProfile(), monitor);
setApplication(application);
}
@@ -456,6 +471,22 @@
}
@Override
+ public IGearProfile getApplicationGearProfile() {
+ return (IGearProfile) getProperty(APPLICATION_GEAR_PROFILE);
+ }
+
+ @Override
+ public IGearProfile setApplicationGearProfile(IGearProfile gearProfile) {
+ return (IGearProfile) setProperty(APPLICATION_GEAR_PROFILE, gearProfile);
+ }
+
+ protected void setApplicationGearProfile(IApplication application) {
+ if (application != null) {
+ setApplicationGearProfile(application.getGearProfile());
+ }
+ }
+
+ @Override
public ICartridge getApplicationCartridge() {
return (ICartridge) getProperty(APPLICATION_CARTRIDGE);
}
@@ -493,4 +524,5 @@
Assert.isNotNull(user);
UserModel.getDefault().addUser(user);
}
+
}
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r40596 - 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: 2012-04-27 19:05:26 -0400 (Fri, 27 Apr 2012)
New Revision: 40596
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java
Log:
[JBIDE-11162] removed WTP in filter that only accepted the following projects: ((non-shared | git-shared) && WTP)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java 2012-04-27 22:48:18 UTC (rev 40595)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/SelectExistingProjectDialog.java 2012-04-27 23:05:26 UTC (rev 40596)
@@ -35,7 +35,8 @@
super(shell, new ProjectLabelProvider());
setTitle("Select Existing Project");
setMessage(NLS.bind(
- "Select an existing project for {0}.\nOnly Dynamic Web/Eclipse WTP projects can be used.",
+// "Select an existing project for {0}.\nOnly Dynamic Web/Eclipse WTP projects can be used.",
+ "Select an existing project for {0}.\nOnly Git shared projects can be used.",
openShiftAppName));
setMultipleSelection(false);
setAllowDuplicates(false);
@@ -59,9 +60,10 @@
}
}
- if (!hasModuleNature(project)) {
- return false;
- }
+// we now accept all projects, not just WTP
+// if (!hasModuleNature(project)) {
+// return false;
+// }
return true;
}
13 years, 7 months
JBoss Tools SVN: r40595 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-04-27 18:48:18 -0400 (Fri, 27 Apr 2012)
New Revision: 40595
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
[JBIDE-11518] latest client jar that corrects creation log output
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 7 months
JBoss Tools SVN: r40594 - 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: 2012-04-27 18:26:10 -0400 (Fri, 27 Apr 2012)
New Revision: 40594
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
Log:
[JBIDE-11518] fixed databinding error
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-04-27 22:25:08 UTC (rev 40593)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-04-27 22:26:10 UTC (rev 40594)
@@ -297,7 +297,7 @@
.applyTo(tableContainer);
this.viewer = createTable(tableContainer);
dbc.bindSet(ViewerProperties.checkedElements(IEmbeddableCartridge.class).observe(viewer),
- BeanProperties.set(ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_EMBEDDED_CARTRIDGES)
+ BeanProperties.set(ApplicationConfigurationWizardPageModel.PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES)
.observe(pageModel));
this.checkAllButton = new Button(newAppEmbeddableCartridgesGroup, SWT.PUSH);
@@ -437,7 +437,7 @@
private void addJenkinsCartridge(final IEmbeddableCartridge cartridge) throws OpenShiftException,
SocketTimeoutException {
if (pageModel.hasApplicationOfType(ICartridge.JENKINS_14)) {
- pageModel.getSelectedEmbeddedCartridges().add(cartridge);
+ pageModel.getSelectedEmbeddableCartridges().add(cartridge);
} else {
final JenkinsApplicationDialog dialog = new JenkinsApplicationDialog(getShell());
if (dialog.open() == Dialog.OK) {
@@ -455,7 +455,7 @@
protected IStatus run(IProgressMonitor monitor) {
try {
IApplication jenkinsApplication = pageModel.createJenkinsApplication(name, monitor);
- pageModel.getSelectedEmbeddedCartridges().add(cartridge);
+ pageModel.getSelectedEmbeddableCartridges().add(cartridge);
openLogDialog(jenkinsApplication);
return Status.OK_STATUS;
} catch (Exception e) {
@@ -486,16 +486,16 @@
viewer.setChecked(cartridge, false);
}
} else {
- pageModel.getSelectedEmbeddedCartridges().add(cartridge);
+ pageModel.getSelectedEmbeddableCartridges().add(cartridge);
}
}
private void addCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- pageModel.getSelectedEmbeddedCartridges().add(cartridge);
+ pageModel.getSelectedEmbeddableCartridges().add(cartridge);
}
private void removeMySQLCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- Set<IEmbeddableCartridge> checkedCartridges = pageModel.getSelectedEmbeddedCartridges();
+ Set<IEmbeddableCartridge> checkedCartridges = pageModel.getSelectedEmbeddableCartridges();
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.")) {
@@ -511,7 +511,7 @@
}
private void removeCartridge(IEmbeddableCartridge cartridge) throws OpenShiftException {
- pageModel.getSelectedEmbeddedCartridges().remove(cartridge);
+ pageModel.getSelectedEmbeddableCartridges().remove(cartridge);
}
private SelectionListener onCheckAll() {
13 years, 7 months
JBoss Tools SVN: r40593 - 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: 2012-04-27 18:25:08 -0400 (Fri, 27 Apr 2012)
New Revision: 40593
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
Log:
[JBIDE-11518] fixed databinding error
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-04-27 22:23:45 UTC (rev 40592)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-04-27 22:25:08 UTC (rev 40593)
@@ -39,7 +39,7 @@
public static final String PROPERTY_EXISTING_APPLICATION_NAME = "existingApplicationName";
public static final String PROPERTY_CARTRIDGES = "cartridges";
public static final String PROPERTY_EMBEDDED_CARTRIDGES = "embeddedCartridges";
- public static final String PROPERTY_SELECTED_EMBEDDED_CARTRIDGES = "selectedEmbeddedCartridges";
+ public static final String PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges";
public static final String PROPERTY_SELECTED_CARTRIDGE = "selectedCartridge";
public static final String PROPERTY_APPLICATION_NAME = "applicationName";
public static final String PROPERTY_EXISTING_APPLICATIONS = "existingApplications";
@@ -315,7 +315,7 @@
return embeddedCartridges;
}
- public Set<IEmbeddableCartridge> getSelectedEmbeddedCartridges() throws OpenShiftException {
+ public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() throws OpenShiftException {
return wizardModel.getSelectedEmbeddableCartridges();
}
@@ -324,7 +324,7 @@
}
public void setSelectedEmbeddableCartridges(Set<IEmbeddableCartridge> selectedEmbeddableCartridges) {
- firePropertyChange(PROPERTY_SELECTED_EMBEDDED_CARTRIDGES,
+ firePropertyChange(PROPERTY_SELECTED_EMBEDDABLE_CARTRIDGES,
wizardModel.getSelectedEmbeddableCartridges(),
wizardModel.setSelectedEmbeddableCartridges(selectedEmbeddableCartridges));
}
13 years, 7 months
JBoss Tools SVN: r40592 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/project.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-04-27 18:23:45 -0400 (Fri, 27 Apr 2012)
New Revision: 40592
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/project/MavenProjectImportOperation.java
Log:
JBIDE-11166 : collect sub module projects during import
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/project/MavenProjectImportOperation.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/project/MavenProjectImportOperation.java 2012-04-27 22:14:22 UTC (rev 40591)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/project/MavenProjectImportOperation.java 2012-04-27 22:23:45 UTC (rev 40592)
@@ -12,7 +12,10 @@
import java.io.File;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
@@ -42,7 +45,7 @@
MavenPluginActivator mavenPlugin = MavenPluginActivator.getDefault();
IProjectConfigurationManager configurationManager = mavenPlugin.getProjectConfigurationManager();
MavenModelManager modelManager = mavenPlugin.getMavenModelManager();
- List<MavenProjectInfo> projectInfos = getMavenProjects(getProjectDirectory(), modelManager, monitor);
+ Set<MavenProjectInfo> projectInfos = getMavenProjects(getProjectDirectory(), modelManager, monitor);
ProjectImportConfiguration projectImportConfiguration = new ProjectImportConfiguration();
List<IMavenProjectImportResult> importResults =
configurationManager.importProjects(projectInfos, projectImportConfiguration, monitor);
@@ -60,12 +63,12 @@
return projects;
}
- private List<MavenProjectInfo> getMavenProjects(File directory, MavenModelManager modelManager,
+ private Set<MavenProjectInfo> getMavenProjects(File directory, MavenModelManager modelManager,
IProgressMonitor monitor) throws InterruptedException {
- LocalProjectScanner scanner = new LocalProjectScanner(directory, directory.toString(), false,
+ LocalProjectScanner scanner = new LocalProjectScanner(directory.getParentFile(), directory.toString(), false,
modelManager);
scanner.run(monitor);
- return scanner.getProjects();
+ return collectProjects(scanner.getProjects());
}
public boolean isMavenProject() {
@@ -76,4 +79,20 @@
return isReadable(new File(getProjectDirectory(), POM_FILE));
}
+
+ public Set<MavenProjectInfo> collectProjects(
+ Collection<MavenProjectInfo> projects) {
+ return new LinkedHashSet<MavenProjectInfo>() {
+ private static final long serialVersionUID = 1L;
+
+ public Set<MavenProjectInfo> collectProjects(
+ Collection<MavenProjectInfo> projects) {
+ for (MavenProjectInfo projectInfo : projects) {
+ add(projectInfo);
+ collectProjects(projectInfo.getProjects());
+ }
+ return this;
+ }
+ }.collectProjects(projects);
+ }
}
13 years, 7 months
JBoss Tools SVN: r40591 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-27 18:14:22 -0400 (Fri, 27 Apr 2012)
New Revision: 40591
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java
Log:
JBIDE-11691 do not recalculate ports if forwarding is running
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java 2012-04-27 22:12:27 UTC (rev 40590)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardModel.java 2012-04-27 22:14:22 UTC (rev 40591)
@@ -189,9 +189,11 @@
}
public void refreshForwardablePorts() throws OpenShiftSSHOperationException {
- application.refreshForwardablePorts();
- updateLocalAddressBindings(this.useDefaultLocalIpAddress);
- updateLocalPortBindings(this.useFreePorts);
+ if(!application.isPortFowardingStarted()) { // we don't reload/refresh the ports if portforwarding is already running since we then loose the existing local ip/ports.
+ application.refreshForwardablePorts();
+ updateLocalAddressBindings(this.useDefaultLocalIpAddress);
+ updateLocalPortBindings(this.useFreePorts);
+ }
}
}
13 years, 7 months
JBoss Tools SVN: r40590 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-27 18:12:27 -0400 (Fri, 27 Apr 2012)
New Revision: 40590
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java
Log:
JBIDE-11696 show error dialog instead of logging
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java 2012-04-27 21:53:25 UTC (rev 40589)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/ApplicationPortForwardingWizardPage.java 2012-04-27 22:12:27 UTC (rev 40590)
@@ -194,7 +194,7 @@
wizardModel.startPortForwarding();
refreshViewerInput();
} catch (Exception e) {
- Logger.error("Failed to start port-forwarding", e);
+ return OpenShiftUIActivator.createErrorStatus("Failed to start port-forwarding.", e);
}
return Status.OK_STATUS;
}
@@ -227,7 +227,7 @@
wizardModel.stopPortForwarding();
refreshViewerInput();
} catch (Exception e) {
- Logger.error("Failed to stop Port-forwarding", e);
+ return OpenShiftUIActivator.createErrorStatus("Failed to stop port-forwarding.", e);
}
return Status.OK_STATUS;
}
13 years, 7 months
JBoss Tools SVN: r40589 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-04-27 17:53:25 -0400 (Fri, 27 Apr 2012)
New Revision: 40589
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
[JBIDE-11518] latest client jar that makes sure jenkins creationLog is passed over
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 7 months