JBoss Tools SVN: r38185 - trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-25 13:46:49 -0500 (Wed, 25 Jan 2012)
New Revision: 38185
Modified:
trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferencePlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
ResourceReferencePlugin is modified to follow the common pattern.
Modified: trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferencePlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferencePlugin.java 2012-01-25 18:36:53 UTC (rev 38184)
+++ trunk/common/plugins/org.jboss.tools.common.resref.core/src/org/jboss/tools/common/resref/core/ResourceReferencePlugin.java 2012-01-25 18:46:49 UTC (rev 38185)
@@ -12,7 +12,6 @@
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -30,28 +29,9 @@
* The constructor
*/
public ResourceReferencePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
/**
* Returns the shared instance
*
13 years
JBoss Tools SVN: r38184 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-25 13:36:53 -0500 (Wed, 25 Jan 2012)
New Revision: 38184
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java
Log:
Obsolete code is removed.
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java 2012-01-25 18:26:35 UTC (rev 38183)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/ModelUIPlugin.java 2012-01-25 18:36:53 UTC (rev 38184)
@@ -10,70 +10,37 @@
******************************************************************************/
package org.jboss.tools.common.model.ui;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
import org.jboss.tools.common.model.plugin.IModelPlugin;
-import org.osgi.framework.BundleContext;
public class ModelUIPlugin extends BaseUIPlugin implements IModelPlugin {
public static final String PLUGIN_ID = "org.jboss.tools.common.model.ui"; //$NON-NLS-1$
- private static ModelUIPlugin INSTANCE;
- private ResourceBundle resourceBundle;
+ private static ModelUIPlugin plugin;
public ModelUIPlugin() {
- INSTANCE = this;
- try {
- resourceBundle= ResourceBundle.getBundle(PLUGIN_ID + ".PluginResources"); //$NON-NLS-1$
- }
- catch (MissingResourceException x) {
- resourceBundle = null;
- }
+ plugin = this;
}
public static IWorkspace getWorkspace() {
return ResourcesPlugin.getWorkspace();
}
- public static String getResourceString(String key) {
- ResourceBundle bundle= ModelUIPlugin.getDefault().getResourceBundle();
- try {
- return bundle.getString(key);
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
public static ModelUIPlugin getDefault() {
- return INSTANCE;
+ return plugin;
}
public static boolean isDebugEnabled() {
- return INSTANCE.isDebugging();
- }
-
+ return plugin.isDebugging();
+ }
public static final String PROJECT_OVERRIDE = "org.jboss.tools.common.model.ui.templates.projectOverriveTemplates"; //$NON-NLS-1$
// public static final String PROJECT_CAN_OVERRIDE = "org.jboss.tools.common.model.ui.templates.projectCanOverriveTemplates";
public static final String ID_PLUGIN= "org.jboss.tools.common.model.ui.templates"; //$NON-NLS-1$
public static final String META_TEMPLATES_DTD = "-//Red Hat Inc.//DTD Meta Templates 1.0//EN"; //$NON-NLS-1$
- public static String getPluginId() {
- return ModelUIPlugin.ID_PLUGIN;
- }
-
/**
* @return IPluginLog object
*/
13 years
JBoss Tools SVN: r38183 - trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-25 13:26:35 -0500 (Wed, 25 Jan 2012)
New Revision: 38183
Modified:
trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElUiPlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
ElUiPlugin is modified to follow the common pattern.
Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElUiPlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElUiPlugin.java 2012-01-25 18:16:40 UTC (rev 38182)
+++ trunk/common/plugins/org.jboss.tools.common.el.ui/src/org/jboss/tools/common/el/ui/ElUiPlugin.java 2012-01-25 18:26:35 UTC (rev 38183)
@@ -12,7 +12,6 @@
package org.jboss.tools.common.el.ui;
import org.jboss.tools.common.log.BaseUIPlugin;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -29,26 +28,9 @@
* The constructor
*/
public ElUiPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
/**
* Returns the shared instance
*
13 years
JBoss Tools SVN: r38182 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-01-25 13:16:40 -0500 (Wed, 25 Jan 2012)
New Revision: 38182
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java
Log:
JBIDE-10703
https://issues.jboss.org/browse/JBIDE-10703
ELCorePlugin is modified to follow the common pattern.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java 2012-01-25 18:10:59 UTC (rev 38181)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ELCorePlugin.java 2012-01-25 18:16:40 UTC (rev 38182)
@@ -12,7 +12,6 @@
import org.jboss.tools.common.log.BaseUIPlugin;
import org.jboss.tools.common.log.IPluginLog;
-import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
@@ -29,26 +28,9 @@
* The constructor
*/
public ELCorePlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
/**
* Returns the shared instance
*
13 years
JBoss Tools SVN: r38181 - in trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes: lib and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-25 13:10:59 -0500 (Wed, 25 Jan 2012)
New Revision: 38181
Added:
trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/lib/dom4j-1.6.1.jar
Modified:
trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/.classpath
Log:
fix for compilation problems in hibenate mapping example project
Modified: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/.classpath
===================================================================
--- trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/.classpath 2012-01-25 17:58:33 UTC (rev 38180)
+++ trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/.classpath 2012-01-25 18:10:59 UTC (rev 38181)
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/hibernate3.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/hibernate3.jar"/>
+ <classpathentry kind="lib" path="lib/dom4j-1.6.1.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/lib/dom4j-1.6.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate.sampleproject.mappingtypes/lib/dom4j-1.6.1.jar
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ application/zip
13 years
JBoss Tools SVN: r38180 - in trunk/cdi: tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-01-25 12:58:33 -0500 (Wed, 25 Jan 2012)
New Revision: 38180
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
Add the code which is supposed to be inserted by the Quick Fix into its description https://issues.jboss.org/browse/JBIDE-10636
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2012-01-25 17:52:35 UTC (rev 38179)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2012-01-25 17:58:33 UTC (rev 38180)
@@ -56,6 +56,7 @@
String shortName = CDIMarkerResolutionUtils.getShortName(parameter);
changeString += "("+shortName+")";
+ init();
}
public ChangeAnnotationMarkerResolution(IAnnotation annotation, String[] typeNames){
@@ -68,11 +69,13 @@
totalList = CDIMarkerResolutionUtils.OPEN_BRACE+totalList+CDIMarkerResolutionUtils.CLOSE_BRACE;
changeString += "("+totalList+")";
+ init();
}
public ChangeAnnotationMarkerResolution(IAnnotation annotation, String[] typeNames, boolean useBraces){
this(annotation, typeNames);
this.useBraces = useBraces;
+ init();
}
@Override
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2012-01-25 17:52:35 UTC (rev 38179)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2012-01-25 17:58:33 UTC (rev 38180)
@@ -39,6 +39,8 @@
import org.jboss.tools.cdi.ui.marker.DeleteAllInjectedConstructorsMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllOtherAnnotationsFromParametersMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAnnotationMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.MakeBeanScopedDependentMarkerResolution;
+import org.jboss.tools.cdi.ui.marker.MakeFieldProtectedMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeFieldStaticMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeMethodBusinessMarkerResolution;
import org.jboss.tools.cdi.ui.marker.MakeMethodPublicMarkerResolution;
@@ -1049,4 +1051,27 @@
CDIValidationErrorManager.MULTIPLE_OBSERVING_PARAMETERS_ID,
DeleteAllOtherAnnotationsFromParametersMarkerResolution.class);
}
+
+ public void testMakeFieldProtectedResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Leopard_Broken.java"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD_ID,
+ MakeFieldProtectedMarkerResolution.class);
+ }
+
+ public void testMakeBeanScopedDependentResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/Leopard_Broken.java"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD_ID,
+ MakeBeanScopedDependentMarkerResolution.class);
+ }
+
}
\ No newline at end of file
13 years
JBoss Tools SVN: r38179 - trunk/hibernatetools/sampleprojects.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-01-25 12:52:35 -0500 (Wed, 25 Jan 2012)
New Revision: 38179
Added:
trunk/hibernatetools/sampleprojects/org.jboss.tools.hibernate4.sampleproject.mappingtypes/
Log:
merge for mapping sample project for hibernate4 from hibernate-multiversion2 branch
13 years
JBoss Tools SVN: r38178 - 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: xcoulon
Date: 2012-01-25 12:10:50 -0500 (Wed, 25 Jan 2012)
New Revision: 38178
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.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/GitCloningSettingsWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
Log:
OPEN - issue JBIDE-10528: Improve OpenShift UI
https://issues.jboss.org/browse/JBIDE-10528
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2012-01-25 16:50:02 UTC (rev 38177)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java 2012-01-25 17:10:50 UTC (rev 38178)
@@ -60,6 +60,7 @@
* @author Rob Stryker
*
*/
+@Deprecated
public class AdapterWizardPage extends AbstractOpenShiftWizardPage implements IWizardPage, PropertyChangeListener {
private AdapterWizardPageModel model;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2012-01-25 16:50:02 UTC (rev 38177)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPageModel.java 2012-01-25 17:10:50 UTC (rev 38178)
@@ -23,6 +23,7 @@
* @author Rob Stryker
* @author Xavier Coulon
*/
+@Deprecated
public class AdapterWizardPageModel extends ObservableUIPojo {
private static final String REMOTE_NAME_DEFAULT = "origin";
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-01-25 16:50:02 UTC (rev 38177)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-01-25 17:10:50 UTC (rev 38178)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -83,12 +82,10 @@
private CheckboxTableViewer viewer;
private ApplicationConfigurationWizardPageModel pageModel;
- private CreateNewApplicationWizardModel wizardModel;
public ApplicationConfigurationWizardPage(IWizard wizard, CreateNewApplicationWizardModel wizardModel) {
super("Application Configuration", "Configure the application you want to create.",
"Application configuration", wizard);
- this.wizardModel = wizardModel;
this.pageModel = new ApplicationConfigurationWizardPageModel(wizardModel);
}
@@ -341,23 +338,8 @@
};
}
- private void clearViewer() {
- setViewerInput(new ArrayList<IEmbeddableCartridge>());
- }
-
- private void setViewerCheckedElements(final Collection<IEmbeddableCartridge> cartridges) {
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- viewer.setCheckedElements(cartridges.toArray());
- }
- });
- }
-
private void setViewerInput(final Collection<IEmbeddableCartridge> cartridges) {
getShell().getDisplay().syncExec(new Runnable() {
-
@Override
public void run() {
viewer.setInput(cartridges);
@@ -457,6 +439,22 @@
@Override
protected void onPageActivated(final DataBindingContext dbc) {
try {
+ WizardUtils.runInWizard(new Job("Loading existing applications...") {
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ pageModel.loadExistingApplications();
+ return Status.OK_STATUS;
+ } catch (NotFoundOpenShiftException e) {
+ return Status.OK_STATUS;
+ } catch (Exception e) {
+ return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Could not load applications",
+ e);
+ }
+ }
+
+ }, getContainer(), getDataBindingContext());
+
WizardUtils.runInWizard(new Job("Loading application cartridges...") {
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -464,11 +462,8 @@
pageModel.loadCartridges();
return Status.OK_STATUS;
} catch (NotFoundOpenShiftException e) {
- // no domain and therefore no applications present
- clearViewer();
return Status.OK_STATUS;
} catch (Exception e) {
- clearViewer();
return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
"Could not load application cartridges", e);
}
@@ -481,11 +476,8 @@
setViewerInput(pageModel.loadEmbeddableCartridges());
return Status.OK_STATUS;
} catch (NotFoundOpenShiftException e) {
- // no domain and therefore no applications present
- clearViewer();
return Status.OK_STATUS;
} catch (Exception e) {
- clearViewer();
return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
"Could not load embeddable cartridges", e);
}
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-01-25 16:50:02 UTC (rev 38177)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-01-25 17:10:50 UTC (rev 38178)
@@ -40,7 +40,8 @@
private CreateNewApplicationWizardModel wizardModel;
- List<ICartridge> cartridges = new ArrayList<ICartridge>();
+ private List<IApplication> existingApplications = new ArrayList<IApplication>();
+ private List<ICartridge> cartridges = new ArrayList<ICartridge>();
private List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>();
private String applicationName;
private IStatus applicationNameStatus;
@@ -49,11 +50,32 @@
public ApplicationConfigurationWizardPageModel(CreateNewApplicationWizardModel wizardModel) {
this.wizardModel = wizardModel;
}
-
+
public IUser getUser() {
return wizardModel.getUser();
}
+ public void loadExistingApplications() throws OpenShiftException {
+ IUser user = getUser();
+ if (user != null) {
+ setExistingApplications(user.getApplications());
+ }
+ }
+
+ /**
+ * @return the existingApplications
+ */
+ public List<IApplication> getExistingApplications() {
+ return existingApplications;
+ }
+
+ /**
+ * @param existingApplications the existingApplications to set
+ */
+ public void setExistingApplications(List<IApplication> existingApplications) {
+ this.existingApplications = existingApplications;
+ }
+
public void loadCartridges() throws OpenShiftException {
setCartridges(wizardModel.getUser().getCartridges());
}
@@ -108,6 +130,12 @@
status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
"The application name must not contain spaces.");
}
+ for(IApplication application : getExistingApplications()) {
+ if(application.getName().equalsIgnoreCase(applicationName)) {
+ status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
+ "An application with the same name already exists on OpenShift.");
+ }
+ }
setApplicationNameStatus(status);
return status;
}
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-01-25 16:50:02 UTC (rev 38177)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-01-25 17:10:50 UTC (rev 38178)
@@ -57,6 +57,7 @@
"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);
}
public GitCloningSettingsWizardPage(ImportExistingApplicationWizard wizard, AbstractOpenShiftApplicationWizardModel model) {
@@ -65,6 +66,7 @@
"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
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-01-25 16:50:02 UTC (rev 38177)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-01-25 17:10:50 UTC (rev 38178)
@@ -175,7 +175,7 @@
public String getApplicationName() {
IApplication application = wizardModel.getApplication();
if (application == null) {
- return null;
+ return wizardModel.getApplicationName();
}
return application.getName();
}
@@ -302,13 +302,19 @@
IStatus status = Status.OK_STATUS;
// skip the validation if the user wants to create a new project. The name and state of the existing project do
// not matter...
+ final IPath repoPath = new Path(getRepositoryPath());
if (!isUseDefaultRepoPath()) {
- IPath repoPath = new Path(getRepositoryPath());
if (repoPath.isEmpty() || !repoPath.isAbsolute() || !repoPath.toFile().canWrite()) {
status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
"The path does not exist or is not writeable.");
}
}
+ final IPath applicationPath = repoPath.append(new Path(getApplicationName()));
+ if (applicationPath.toFile().exists()) {
+ status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID,
+ "The location '" + repoPath.toOSString() + "' already contains a folder named '"+ getApplicationName() +"'.");
+ }
+
setCustomRepoPathValidity(status);
return status;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-01-25 16:50:02 UTC (rev 38177)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-01-25 17:10:50 UTC (rev 38178)
@@ -55,10 +55,10 @@
*/
public class ProjectAndServerAdapterSettingsWizardPage extends AbstractOpenShiftWizardPage {
- public static final String PREF_CONTENTASSISTKEY = "prefContentAssistKey";
-
- private ProjectAndServerAdapterSettingsWizardPageModel pageModel;
+ public static final String PREF_CONTENTASSISTKEY = "prefContentAssistKey";
+ private ProjectAndServerAdapterSettingsWizardPageModel pageModel;
+
private Text existingProjectNameText = null;
public ProjectAndServerAdapterSettingsWizardPage(IWizard wizard, AbstractOpenShiftApplicationWizardModel wizardModel) {
@@ -75,8 +75,6 @@
createServerAdapterGroup(container, dbc);
createWorkingSetGroup(container, dbc);
}
-
-
private Composite createProjectGroup(Composite parent, DataBindingContext dbc) {
Composite projectGroup = new Composite(parent, SWT.NONE);
@@ -139,11 +137,10 @@
dec.setImage(contentProposalFieldIndicator.getImage());
dec.setDescriptionText("Auto-completion is enabled when you start typing a project name.");
dec.setShowOnlyOnFocus(true);
-
- AutoCompleteField adapter = new AutoCompleteField(
- existingProjectNameText, new TextContentAdapter(),
- new String [] {});
-
+
+ AutoCompleteField adapter = new AutoCompleteField(existingProjectNameText, new TextContentAdapter(),
+ new String[] {});
+
adapter.setProposals(getOpenProjectsInWorkspace());
Button browseProjectsButton = new Button(projectGroup, SWT.NONE);
@@ -166,8 +163,8 @@
private String[] getOpenProjectsInWorkspace() {
List<String> projects = new ArrayList<String>();
- for(IProject project: ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
- if(project.exists() && project.isOpen()) {
+ for (IProject project : ResourcesPlugin.getWorkspace().getRoot().getProjects()) {
+ if (project.exists() && project.isOpen()) {
projects.add(project.getName());
}
}
@@ -220,12 +217,11 @@
ValueBindingBuilder.bind(serverAdapterCheckboxObservable).to(serverAdapterModelObservable).in(dbc);
return serverAdapterGroup;
}
-
+
private IServerType getServerTypeToCreate() {
return ServerCore.findServerType("org.jboss.tools.openshift.express.openshift.server.type");
}
-
private WorkingSetGroup createWorkingSetGroup(Composite container, DataBindingContext dbc) {
return new WorkingSetGroup(container, null, new String[] { "org.eclipse.ui.resourceWorkingSetPage", //$NON-NLS-1$
"org.eclipse.jdt.ui.JavaWorkingSetPage" /* JavaWorkingSetUpdater.ID */});
@@ -296,14 +292,17 @@
@Override
public IObservableList getTargets() {
WritableList targets = new WritableList();
- //targets.add(existingProjectNameTextObservable);
+ // targets.add(existingProjectNameTextObservable);
return targets;
}
}
- /* (non-Javadoc)
- * @see org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftWizardPage#onPageActivated(org.eclipse.core.databinding.DataBindingContext)
+ /*
+ * (non-Javadoc)
+ * @see
+ * org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftWizardPage#onPageActivated(org.eclipse.
+ * core.databinding.DataBindingContext)
*/
@Override
protected void onPageActivated(DataBindingContext dbc) {
13 years
JBoss Tools SVN: r38177 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-01-25 11:50:02 -0500 (Wed, 25 Jan 2012)
New Revision: 38177
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDIAllBotTestsMaven.launch
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDISeam3AllBotTestsMaven.launch
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDISmokeBotTestsMaven.launch
Log:
Eclipse maven launchers for CDI bot tests were edited
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDIAllBotTestsMaven.launch
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDIAllBotTestsMaven.launch 2012-01-25 16:47:37 UTC (rev 38176)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDIAllBotTestsMaven.launch 2012-01-25 16:50:02 UTC (rev 38177)
@@ -7,7 +7,6 @@
<stringAttribute key="M2_PROFILES" value=""/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="swtbot.test.skip=false"/>
-<listEntry value="swtbot.properties=/home/jjankovi/swtbot.properties"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDISeam3AllBotTestsMaven.launch
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDISeam3AllBotTestsMaven.launch 2012-01-25 16:47:37 UTC (rev 38176)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDISeam3AllBotTestsMaven.launch 2012-01-25 16:50:02 UTC (rev 38177)
@@ -7,7 +7,6 @@
<stringAttribute key="M2_PROFILES" value="-P seam3-bot-tests"/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="swtbot.test.skip=false"/>
-<listEntry value="swtbot.properties=/home/jjankovi/swtbot.properties"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDISmokeBotTestsMaven.launch
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDISmokeBotTestsMaven.launch 2012-01-25 16:47:37 UTC (rev 38176)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/properties/launchers/CDISmokeBotTestsMaven.launch 2012-01-25 16:50:02 UTC (rev 38177)
@@ -7,7 +7,6 @@
<stringAttribute key="M2_PROFILES" value="-P smoke-bot-tests"/>
<listAttribute key="M2_PROPERTIES">
<listEntry value="swtbot.test.skip=false"/>
-<listEntry value="swtbot.properties=/home/jjankovi/swtbot.properties"/>
</listAttribute>
<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
13 years
JBoss Tools SVN: r38176 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: src/org/jboss/tools/ws/ui/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-01-25 11:47:37 -0500 (Wed, 25 Jan 2012)
New Revision: 38176
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
Log:
WSAllBotTests edited to include the new RESTful test
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2012-01-25 16:46:54 UTC (rev 38175)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2012-01-25 16:47:37 UTC (rev 38176)
@@ -17,8 +17,8 @@
org.eclipse.ui.ide;bundle-version="3.5.1",
org.eclipse.ui.forms;bundle-version="3.4.1",
org.junit4;bundle-version="4.5.0",
+ org.eclipse.core.resources,
org.jboss.tools.ws.ui;bundle-version="1.1.0",
- org.eclipse.core.resources,
org.eclipse.wst.common.project.facet.core,
org.hamcrest;bundle-version="1.1.0"
Bundle-ActivationPolicy: lazy
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-01-25 16:46:54 UTC (rev 38175)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSAllBotTests.java 2012-01-25 16:47:37 UTC (rev 38176)
@@ -11,6 +11,7 @@
package org.jboss.tools.ws.ui.bot.test;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
+import org.jboss.tools.ws.ui.bot.test.rest.completion.RESTfulCompletionTest;
import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulExplorerTest;
import org.jboss.tools.ws.ui.bot.test.rest.explorer.RESTfulSupportTest;
import org.jboss.tools.ws.ui.bot.test.rest.validation.RESTfulValidationTest;
@@ -54,7 +55,8 @@
SimpleRESTWebServiceTest.class,
RESTfulSupportTest.class,
RESTfulExplorerTest.class,
-// RESTfulValidationTest.class,
+ RESTfulValidationTest.class,
+ RESTfulCompletionTest.class,
BottomUpWSTest.class,
TopDownWSTest.class,
WsClientTest.class,
13 years