Author: adietish
Date: 2012-02-22 10:39:34 -0500 (Wed, 22 Feb 2012)
New Revision: 39000
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
[JBIDE-10978] reporting cartridges that were embedded in the application creation wizard
(was: no reporting)
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22
15:16:21 UTC (rev 38999)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22
15:39:34 UTC (rev 39000)
@@ -84,7 +84,6 @@
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils.IWidgetVisitor;
-import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry;
import com.openshift.express.client.Cartridge;
import com.openshift.express.client.IApplication;
@@ -595,8 +594,7 @@
@Override
public void run() {
- new CreationLogDialog(getShell(), new LogEntry(application.getName(),
application.getCreationLog()))
- .open();
+ new CreationLogDialog(getShell(), application).open();
}
});
}
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-02-22
15:16:21 UTC (rev 38999)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-02-22
15:39:34 UTC (rev 39000)
@@ -11,6 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,6 +35,9 @@
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import com.openshift.express.client.IApplication;
+import com.openshift.express.client.IEmbeddableCartridge;
+
/**
* @author André Dietisheim
*/
@@ -41,15 +45,25 @@
private static final Pattern HTTP_LINK_REGEX = Pattern.compile("(http[^
|\n]+)");
- private LogEntry[] logEntries;
+ private Collection<IEmbeddableCartridge> cartridges;
+ private IApplication application;
private List<LinkSubstring> linkSubstrings;
+
+ public CreationLogDialog(Shell parentShell, Collection<IEmbeddableCartridge>
cartridges) {
+ this(parentShell);
+ this.cartridges = cartridges;
+ }
- public CreationLogDialog(Shell parentShell, LogEntry... logEntries) {
+ public CreationLogDialog(Shell parentShell, IApplication application) {
+ this(parentShell);
+ this.application = application;
+ }
+
+ protected CreationLogDialog(Shell parentShell) {
super(parentShell);
- this.logEntries = logEntries;
this.linkSubstrings = new ArrayList<LinkSubstring>();
}
-
+
@Override
protected Control createContents(Composite parent) {
Control control = super.createContents(parent);
@@ -75,11 +89,38 @@
StyledText logText = new StyledText(container, SWT.BORDER | SWT.V_SCROLL);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true,
false).applyTo(logText);
- writeLogEntries(logEntries, logText);
+ writeLogEntries(createLogEntries(), logText);
logText.addListener(SWT.MouseDown, onLinkClicked(logText));
return container;
}
+ private LogEntry[] createLogEntries() {
+ if (cartridges != null) {
+ return createLogEntries(cartridges);
+ } else {
+ return createLogEntries(application);
+ }
+ }
+
+ private LogEntry[] createLogEntries(Collection<IEmbeddableCartridge> cartridges)
{
+ if (cartridges == null
+ || cartridges.isEmpty()) {
+ return new LogEntry[] {};
+ }
+ ArrayList<LogEntry> logEntries = new ArrayList<LogEntry>();
+ for (IEmbeddableCartridge cartridge : cartridges) {
+ logEntries.add(new LogEntry(cartridge.getName(), cartridge.getCreationLog()));
+ }
+ return logEntries.toArray(new LogEntry[cartridges.size()]);
+ }
+
+ private LogEntry[] createLogEntries(IApplication application) {
+ if (application == null) {
+ return new LogEntry[] {};
+ }
+ return new LogEntry[] { new LogEntry(application.getName(),
application.getCreationLog()) };
+ }
+
private Listener onLinkClicked(final StyledText logText) {
return new Listener() {
public void handleEvent(Event event) {
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-02-22
15:16:21 UTC (rev 38999)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-02-22
15:39:34 UTC (rev 39000)
@@ -52,7 +52,6 @@
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
@@ -375,18 +374,12 @@
if (cartridges.size() == 0) {
return;
}
-
- final ArrayList<LogEntry> logEntries = new ArrayList<LogEntry>();
- for (IEmbeddableCartridge cartridge : cartridges) {
- logEntries.add(new LogEntry(cartridge.getName(), cartridge.getCreationLog()));
- }
getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
- new CreationLogDialog(getShell(),
- logEntries.toArray(new LogEntry[logEntries.size()])).open();
+ new CreationLogDialog(getShell(), cartridges).open();
}
});
@@ -397,8 +390,7 @@
@Override
public void run() {
- new CreationLogDialog(getShell(),
- new LogEntry(application.getName(), application.getCreationLog())).open();
+ new CreationLogDialog(getShell(), application).open();
}
});
}
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
---
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22
15:16:21 UTC (rev 38999)
+++
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22
15:39:34 UTC (rev 39000)
@@ -226,6 +226,7 @@
List<IEmbeddableCartridge> embeddableCartridges = new
ArrayList<IEmbeddableCartridge>();
embeddableCartridges.addAll(selectedCartridges);
application.addEmbbedCartridges(embeddableCartridges);
+ openCreationLogDialog(embeddableCartridges);
}
} catch (OpenShiftEndpointException e) {
// TODO: refresh user
@@ -245,6 +246,20 @@
}
}
+ private void openCreationLogDialog(final List<IEmbeddableCartridge>
embeddableCartridges) {
+ if (embeddableCartridges == null
+ || embeddableCartridges.isEmpty()) {
+ return;
+ }
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ new CreationLogDialog(getShell(), embeddableCartridges).open();
+ }
+ });
+ }
+
/**
* A workspace job that will create a new project or enable the selected project to be
used with OpenShift.
*/