JBoss Tools SVN: r39388 - 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: dgolovin
Date: 2012-03-08 16:35:45 -0500 (Thu, 08 Mar 2012)
New Revision: 39388
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
fix for compilatation problem in openshift .express.ui
IUser import was missing
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-08 21:14:37 UTC (rev 39387)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-08 21:35:45 UTC (rev 39388)
@@ -44,6 +44,7 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IEmbeddableCartridge;
+import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftEndpointException;
import com.openshift.express.client.OpenShiftException;
14 years, 1 month
JBoss Tools SVN: r39387 - trunk/modeshape/plugins/org.jboss.tools.modeshape.client.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-03-08 16:14:37 -0500 (Thu, 08 Mar 2012)
New Revision: 39387
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.client/pom.xml
Log:
fixed packaging in modeshape.client plugin to fix continuous build
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.client/pom.xml
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.client/pom.xml 2012-03-08 20:55:08 UTC (rev 39386)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.client/pom.xml 2012-03-08 21:14:37 UTC (rev 39387)
@@ -9,4 +9,5 @@
</parent>
<groupId>org.jboss.tools.modeshape.plugins</groupId>
<artifactId>org.jboss.tools.modeshape.client</artifactId>
- </project>
\ No newline at end of file
+ <packaging>eclipse-plugin</packaging>
+ </project>
14 years, 1 month
JBoss Tools SVN: r39386 - in trunk/modeshape: plugins/org.jboss.tools.modeshape.jcr/META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-03-08 15:55:08 -0500 (Thu, 08 Mar 2012)
New Revision: 39386
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF
trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/META-INF/MANIFEST.MF
trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/META-INF/MANIFEST.MF
Log:
synchronized version in modeshape plugin, which should be 1.1.0.qualifier
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF 2012-03-08 20:44:38 UTC (rev 39385)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.client/META-INF/MANIFEST.MF 2012-03-08 20:55:08 UTC (rev 39386)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.jboss.tools.modeshape.client;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %bundleVendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/META-INF/MANIFEST.MF
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/META-INF/MANIFEST.MF 2012-03-08 20:44:38 UTC (rev 39385)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.jcr/META-INF/MANIFEST.MF 2012-03-08 20:55:08 UTC (rev 39386)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.jboss.tools.modeshape.jcr;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %bundleVendor
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/META-INF/MANIFEST.MF 2012-03-08 20:44:38 UTC (rev 39385)
+++ trunk/modeshape/tests/org.jboss.tools.modeshape.jcr.test/META-INF/MANIFEST.MF 2012-03-08 20:55:08 UTC (rev 39386)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-SymbolicName: org.jboss.tools.modeshape.jcr.test;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: %bundleVendor
Fragment-Host: org.jboss.tools.modeshape.jcr
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
14 years, 1 month
JBoss Tools SVN: r39385 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-03-08 15:44:38 -0500 (Thu, 08 Mar 2012)
New Revision: 39385
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
Log:
Fixed - JBIDE-11214
Import wizard: import wizard may not be completed when run from Server wizard and having user whit pw not stored to secure storage
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-03-08 20:39:20 UTC (rev 39384)
+++ 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-03-08 20:44:38 UTC (rev 39385)
@@ -27,7 +27,6 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.errors.TransportException;
@@ -134,19 +133,22 @@
@Override
public void addPages() {
- if( getWizardModel().getUser() == null)
+ if( getWizardModel().getUser() == null) {
getWizardModel().setUser(initialUser);
- addPage(new CredentialsWizardPage(this, getWizardModel()));
+ }
+ if(initialUser == null) {
+ addPage(new CredentialsWizardPage(this, getWizardModel()));
+ }
addPage(new ApplicationConfigurationWizardPage(this, getWizardModel()));
addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel()));
addPage(new GitCloningSettingsWizardPage(this, getWizardModel()));
}
- @Override
+ /*@Override
public IWizardPage getStartingPage() {
IWizardPage[] pages = getPages();
return initialUser == null ? pages[0] : pages[1];
- }
+ }*/
public void setInitialUser(UserDelegate user) {
this.initialUser = user;
14 years, 1 month
JBoss Tools SVN: r39384 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-08 15:39:20 -0500 (Thu, 08 Mar 2012)
New Revision: 39384
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
[JBIDE-11214] removed unncesseary accessors #setSelectedApplication, #setSelectedProject and replaced #setInitialUser by skipCredentialsPage parameter in the wizard constructor. this flag reflects what the initial user is all about.
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-08 18:58:35 UTC (rev 39383)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-03-08 20:39:20 UTC (rev 39384)
@@ -358,9 +358,8 @@
if (showImportLink ) {
importLink.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- OpenShiftExpressApplicationWizard wizard = new ImportOpenShiftExpressApplicationWizard();
- wizard.setInitialUser(fuser);
- wizard.setSelectedApplication(fapplication);
+ OpenShiftExpressApplicationWizard wizard =
+ new ImportOpenShiftExpressApplicationWizard(fuser, null, fapplication, true);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
int oldServerCount = ServerCore.getServers().length;
dialog.create();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-03-08 18:58:35 UTC (rev 39383)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-03-08 20:39:20 UTC (rev 39384)
@@ -21,13 +21,17 @@
super(true, "Import OpenShift Express Application");
}
+ public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application) {
+ this(user, project, application, false);
+ }
+
/**
* Constructor
* @param user
* @param project
* @param application
*/
- public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application) {
- super(user, project, application, true, "Import OpenShift Express Application");
+ public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean skipCredentialsPage) {
+ super(user, project, application, true, skipCredentialsPage, "Import OpenShift Express Application");
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-08 18:58:35 UTC (rev 39383)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-08 20:39:20 UTC (rev 39384)
@@ -27,7 +27,6 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.errors.TransportException;
@@ -45,7 +44,6 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftEndpointException;
import com.openshift.express.client.OpenShiftException;
@@ -55,17 +53,22 @@
*/
public abstract class OpenShiftExpressApplicationWizard extends Wizard implements IImportWizard, INewWizard {
- private UserDelegate initialUser;
-
+ private boolean skipCredentialsPage;
+
private OpenShiftExpressApplicationWizardModel wizardModel;
public OpenShiftExpressApplicationWizard(boolean useExistingApplication, String wizardTitle) {
this(null, null, null, useExistingApplication, wizardTitle);
}
public OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication, String wizardTitle) {
+ this(user, project, application, useExistingApplication, false, wizardTitle);
+ }
+
+ public OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication, boolean skipCredentialsPage, String wizardTitle) {
setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application, useExistingApplication));
setWindowTitle(wizardTitle);
setNeedsProgressMonitor(true);
+ this.skipCredentialsPage = skipCredentialsPage;
}
void setWizardModel(OpenShiftExpressApplicationWizardModel wizardModel) {
@@ -111,14 +114,6 @@
return confirmed[0];
}
- public void setSelectedApplication(IApplication application) {
- getWizardModel().setApplication(application);
- }
-
- public void setSelectedProject(IProject project) {
- getWizardModel().setProject(project);
- }
-
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
Object o = selection.getFirstElement();
@@ -133,25 +128,15 @@
@Override
public void addPages() {
- if( getWizardModel().getUser() == null)
- getWizardModel().setUser(initialUser);
- addPage(new CredentialsWizardPage(this, getWizardModel()));
+ if (!skipCredentialsPage) {
+ addPage(new CredentialsWizardPage(this, getWizardModel()));
+ }
addPage(new ApplicationConfigurationWizardPage(this, getWizardModel()));
addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel()));
addPage(new GitCloningSettingsWizardPage(this, getWizardModel()));
}
@Override
- public IWizardPage getStartingPage() {
- IWizardPage[] pages = getPages();
- return initialUser == null ? pages[0] : pages[1];
- }
-
- public void setInitialUser(UserDelegate user) {
- this.initialUser = user;
- }
-
- @Override
public boolean performFinish() {
boolean success = getWizardModel().isUseExistingApplication();
if (!success) {
14 years, 1 month
JBoss Tools SVN: r39383 - in trunk/vpe/plugins: org.jboss.tools.vpe.browsersim.eclipse/META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-03-08 13:58:35 -0500 (Thu, 08 Mar 2012)
New Revision: 39383
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF
Log:
https://issues.jboss.org/browse/JBIDE-11047 BrowserSim: the features should be disabled for 64-bit Java on 64-bit Windows
added filter for all plugins in feature to avoid missing dependencies
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF 2012-03-08 18:19:03 UTC (rev 39382)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/META-INF/MANIFEST.MF 2012-03-08 18:58:35 UTC (rev 39383)
@@ -12,3 +12,8 @@
org.jboss.tools.vpe.browsersim.browser;bundle-version="1.0.0"
Export-Package: org.jboss.tools.vpe.browsersim.ui
Bundle-Vendor: JBoss by Red Hat
+Eclipse-PlatformFilter: (|
+ (&(osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86))
+ (&(osgi.ws=cocoa)(osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=x86_64)) )
+ (&(osgi.ws=gtk)(osgi.os=linux) (|(osgi.arch=x86)(osgi.arch=x86_64)) )
+ )
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2012-03-08 18:19:03 UTC (rev 39382)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.eclipse/META-INF/MANIFEST.MF 2012-03-08 18:58:35 UTC (rev 39383)
@@ -15,3 +15,8 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: JBoss by Red Hat
+Eclipse-PlatformFilter: (|
+ (&(osgi.ws=win32)(osgi.os=win32)(osgi.arch=x86))
+ (&(osgi.ws=cocoa)(osgi.os=macosx) (|(osgi.arch=x86)(osgi.arch=x86_64)) )
+ (&(osgi.ws=gtk)(osgi.os=linux) (|(osgi.arch=x86)(osgi.arch=x86_64)) )
+ )
14 years, 1 month
JBoss Tools SVN: r39382 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-03-08 13:19:03 -0500 (Thu, 08 Mar 2012)
New Revision: 39382
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
Log:
JBIDE-11197
https://issues.jboss.org/browse/JBIDE-11197
Open editor on finish.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-03-08 18:09:31 UTC (rev 39381)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-03-08 18:19:03 UTC (rev 39382)
@@ -110,7 +110,7 @@
WizardNewDSXMLFileCreationPage mainPage;
- private boolean fOpenEditorOnFinish;
+ private boolean fOpenEditorOnFinish = true;
public NewDSXMLWizard() {
}
14 years, 1 month
JBoss Tools SVN: r39381 - 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-03-08 13:09:31 -0500 (Thu, 08 Mar 2012)
New Revision: 39381
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
Log:
[JBIDE-11214] removed unnecessary (and disturbing) call to #setPageComplete
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-03-08 18:03:29 UTC (rev 39380)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-03-08 18:09:31 UTC (rev 39381)
@@ -68,7 +68,6 @@
"Configure the cloning settings by specifying the clone destination if you create a new project, and the git remote name if you're using an existing project.",
"Cloning settings", wizard);
this.pageModel = new GitCloningSettingsWizardPageModel(model);
- setPageComplete(false);
}
@Override
14 years, 1 month
JBoss Tools SVN: r39380 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-08 13:03:29 -0500 (Thu, 08 Mar 2012)
New Revision: 39380
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
Log:
JBIDE-10527 reopened issue with completion state in a wizard fragment to beta1
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-03-08 18:02:55 UTC (rev 39379)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-03-08 18:03:29 UTC (rev 39380)
@@ -33,7 +33,6 @@
private NewServerWizardBehaviourCallback callback;
public ExpressWizardFragment() {
- setComplete(false);
}
public boolean hasComposite() {
@@ -43,6 +42,9 @@
super.setComplete(complete);
}
+ public boolean isComplete() {
+ return getTaskModel().getObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP) != null;
+ }
public Composite createComposite(Composite parent, IWizardHandle handle) {
handle.setTitle("Create an Openshift Server");
@@ -59,7 +61,6 @@
}
};
composite = ExpressDetailsComposite.createComposite(parent,callback, ExpressServerUtils.EXPRESS_SOURCE_MODE, true);
- setComplete(getTaskModel().getObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP) != null);
return composite.getComposite();
}
14 years, 1 month
JBoss Tools SVN: r39379 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-08 13:02:55 -0500 (Thu, 08 Mar 2012)
New Revision: 39379
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
Log:
JBIDE-11210 - delay in UI thread
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-03-08 17:38:37 UTC (rev 39378)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-03-08 18:02:55 UTC (rev 39379)
@@ -13,6 +13,7 @@
import java.net.URL;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -55,7 +56,8 @@
@Override
public URL getModuleRootURL(IModule module) {
- IProject appProj = ExpressServerUtils.findProjectForServersApplication(getServer());
+ String appProjString = ExpressServerUtils.getExpressDeployProject(getServer());
+ IProject appProj = appProjString == null ? null : ResourcesPlugin.getWorkspace().getRoot().getProject(appProjString);
IProject p =module.getProject();
boolean shouldIgnore = ExpressServerUtils.getIgnoresContextRoot(getServer()) && p.equals(appProj);
return JBossServer.getModuleRootURL(module, getServer().getHost(), 80, shouldIgnore);
14 years, 1 month