JBoss Tools SVN: r26062 - trunk/smooks/tests.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2010-10-26 06:40:19 -0400 (Tue, 26 Oct 2010)
New Revision: 26062
Added:
trunk/smooks/tests/org.jboss.tools.smooks.ui.bot.test/
Log:
Smooks SWTBotTest project folder added
13 years, 7 months
JBoss Tools SVN: r26061 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test: src/org/jboss/tools/struts/ui/bot/test/tutorial and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-10-26 06:36:35 -0400 (Tue, 26 Oct 2010)
New Revision: 26061
Added:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf
Removed:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/project.properties
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/build.properties
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
Log:
move resources to a package
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath 2010-10-26 10:21:02 UTC (rev 26060)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/.classpath 2010-10-26 10:36:35 UTC (rev 26061)
@@ -3,6 +3,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="resources"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/build.properties
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/build.properties 2010-10-26 10:21:02 UTC (rev 26060)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/build.properties 2010-10-26 10:36:35 UTC (rev 26061)
@@ -1,4 +1,4 @@
-source.. = src/,resources/
+source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-10-26 10:21:02 UTC (rev 26060)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/TutorialTest.java 2010-10-26 10:36:35 UTC (rev 26061)
@@ -250,14 +250,14 @@
SWTBotEditor editor = packageExplorer.openFile(PROJECT_NAME, "JavaSource", "sample", "GetNameForm.java");
SWTBotEclipseEditor eeditor = editor.toTextEditor();
eeditor.selectRange(0, 0, eeditor.getText().length());
- eeditor.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/GetNameForm.java.gf")));
+ eeditor.setText(readResource(TutorialTest.class.getResourceAsStream("resources/GetNameForm.java.gf")));
editor.saveAndClose();
//4.1.2. GreetingAction.java
editor = packageExplorer.openFile(PROJECT_NAME, "JavaSource", "sample", "GreetingAction.java");
eeditor = editor.toTextEditor();
eeditor.selectRange(0, 0, eeditor.getText().length());
- eeditor.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/GreetingAction.java.gf")));
+ eeditor.setText(readResource(TutorialTest.class.getResourceAsStream("resources/GreetingAction.java.gf")));
editor.saveAndClose();
//4.2.1. inputname.jsp
@@ -275,7 +275,7 @@
editorA.selectTab("Source");
SWTBotStyledText st = editorA.bot().styledText();
st.selectRange(0, 0, st.getText().length());
- st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/inputname.jsp.gf")));
+ st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/inputname.jsp.gf")));
editor.saveAndClose();
// st.navigateTo(7, 24);
@@ -301,7 +301,7 @@
editorA.selectTab("Source");
st = editorA.bot().styledText();
st.selectRange(0, 0, st.getText().length());
- st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/greeting.jsp.gf")));
+ st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/greeting.jsp.gf")));
editor.saveAndClose();
//4.2.3. index.jsp
@@ -315,7 +315,7 @@
editorA.selectTab("Source");
st = bot.styledText();
st.selectRange(0, 0, st.getText().length());
- st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/index.jsp.gf")));
+ st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/index.jsp.gf")));
editor.saveAndClose();
}
@@ -420,7 +420,7 @@
jspEditor.selectTab("Source");
SWTBotStyledText st = jspEditor.bot().styledText();
st.selectRange(0, 0, st.getText().length());
- st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/inputname63.jsp.gf")));
+ st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/inputname63.jsp.gf")));
jspEditor.save();
bot.editorByTitle("struts-config.xml").save();
util.waitForNonIgnoredJobs();
@@ -444,7 +444,7 @@
//6.5. Editing the JSP File
jspEditor.show();
st.selectRange(0, 0, st.getText().length());
- st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/inputname65.jsp.gf")));
+ st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/inputname65.jsp.gf")));
jspEditor.saveAndClose();
//6.6. Editing the Action
@@ -465,7 +465,7 @@
editor.show();
st = editor.bot().styledText();
st.selectRange(0, 0, st.getText().length());
- st.setText(readResource(TutorialTest.class.getResourceAsStream("/resources/GetNameForm67.java.gf")));
+ st.setText(readResource(TutorialTest.class.getResourceAsStream("resources/GetNameForm67.java.gf")));
editor.saveAndClose();
new StrutsUIEditorBot(bot.editorByTitle("struts-config.xml").getReference()).show();
bot.activeShell().bot().menu("File").menu("Save All").click();
Copied: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources (from rev 26044, trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources)
Deleted: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/inputname63.jsp.gf 2010-10-26 04:25:09 UTC (rev 26044)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf 2010-10-26 10:36:35 UTC (rev 26061)
@@ -1,24 +0,0 @@
-<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
-<!--
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
--->
-<html:html>
- <head>
- <html:javascript formName="GetNameForm"/>
- <title></title>
- </head>
- <body>
- <html:form action="/greeting.do" onsubmit="return validateGetNameForm(this)">
- Input name:<html:text property="name"/><html:submit value="Say Hello!"/>
- </html:form>
- </body>
-</html:html>
Copied: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf (from rev 26053, trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/inputname63.jsp.gf)
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf (rev 0)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/inputname63.jsp.gf 2010-10-26 10:36:35 UTC (rev 26061)
@@ -0,0 +1,24 @@
+<%@ taglib uri="/WEB-INF/struts-html" prefix="html" %>
+<!--
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+-->
+<html:html>
+ <head>
+ <html:javascript formName="GetNameForm" />
+ <title></title>
+ </head>
+ <body>
+ <html:form action="/greeting.do" onsubmit="return validateGetNameForm(this)">
+ Input name:<html:text property="name"/><html:submit value="Say Hello!"/>
+ </html:form>
+ </body>
+</html:html>
Deleted: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/project.properties
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/project.properties 2010-10-26 04:25:09 UTC (rev 26044)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/tutorial/resources/project.properties 2010-10-26 10:36:35 UTC (rev 26061)
@@ -1 +0,0 @@
-JBossEap4.3Home=/opt/jboss-eap-4.3/jboss-as
13 years, 7 months
JBoss Tools SVN: r26060 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-10-26 06:21:02 -0400 (Tue, 26 Oct 2010)
New Revision: 26060
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java
Log:
JBIDE-7108 - bad if-statement
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java 2010-10-26 10:14:19 UTC (rev 26059)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspaceVFS.java 2010-10-26 10:21:02 UTC (rev 26060)
@@ -31,7 +31,7 @@
public IPath[] getWorkspaceChildren(IPath path) {
IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
- if( res != null || !(res instanceof IContainer)) {
+ if( res != null && res instanceof IContainer) {
try {
IResource[] resources = ((IContainer)res).members();
IPath[] paths = new IPath[resources.length];
13 years, 7 months
JBoss Tools SVN: r26059 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-26 06:14:19 -0400 (Tue, 26 Oct 2010)
New Revision: 26059
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java
Log:
JBIDE-7405
https://jira.jboss.org/browse/JBIDE-7405
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java 2010-10-26 10:12:38 UTC (rev 26058)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/Watcher.java 2010-10-26 10:14:19 UTC (rev 26059)
@@ -140,7 +140,7 @@
class RM extends ResourceMarkers {
public RM() {
- super(ResourceMarkers.JST_WEB_PROBLEM);
+ super(ResourceMarkers.JST_WEB_PROBLEM, ResourceMarkers.OLD_JST_WEB_PROBLEM);
}
protected String[] getErrors() {
return (error == null) ? new String[0] : new String[]{error};
13 years, 7 months
JBoss Tools SVN: r26058 - trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-26 06:12:38 -0400 (Tue, 26 Oct 2010)
New Revision: 26058
Modified:
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java
trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VerificationMarkers.java
Log:
JBIDE-7405
https://jira.jboss.org/browse/JBIDE-7405
Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java 2010-10-26 10:11:24 UTC (rev 26057)
+++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/MarkerClearer.java 2010-10-26 10:12:38 UTC (rev 26058)
@@ -23,7 +23,7 @@
public static void clear(XModelObject o) {
if(o == null || o.getFileType() == XModelObject.NONE) return;
if(o.getFileType() == XModelObject.FILE) {
- ResourceMarkers markers = new ResourceMarkers(ResourceMarkers.JST_WEB_PROBLEM);
+ ResourceMarkers markers = new ResourceMarkers(ResourceMarkers.JST_WEB_PROBLEM, ResourceMarkers.OLD_JST_WEB_PROBLEM);
markers.setModelObject(o);
markers.update();
} else {
Modified: trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VerificationMarkers.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VerificationMarkers.java 2010-10-26 10:11:24 UTC (rev 26057)
+++ trunk/common/plugins/org.jboss.tools.common.verification/src/org/jboss/tools/common/verification/vrules/core/resources/VerificationMarkers.java 2010-10-26 10:12:38 UTC (rev 26058)
@@ -17,7 +17,7 @@
ResourceProblems p;
public VerificationMarkers(ResourceProblems p) {
- super(ResourceMarkers.JST_WEB_PROBLEM);
+ super(ResourceMarkers.JST_WEB_PROBLEM, ResourceMarkers.OLD_JST_WEB_PROBLEM);
this.p = p;
}
13 years, 7 months
JBoss Tools SVN: r26057 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/internal/deltacloud/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-26 06:11:24 -0400 (Tue, 26 Oct 2010)
New Revision: 26057
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
Log:
[JBIDE-7402] corrected CloudNameValidator to ignore the name of the connection that's being edited
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-26 10:10:28 UTC (rev 26056)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-26 10:11:24 UTC (rev 26057)
@@ -6,6 +6,8 @@
[JBIDE-7402] added MalformedURLException handling.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java (bindCloudType):
[JBIDE-7402] bound type label to converter state.
+ (CloudNameValidator): [JBIDE-7402] corrected CloudNameValidator to ignore the name of the connection that's being edited
+ (bindName): [JBIDE-7402] corrected CloudNameValidator to ignore the name of the connection that's being edited
* src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionModel.java
(getDeltaCloudType): [JBIDE-7402] added setup of type at instantiation time
(CloudConnectionModel): [JBIDE-7402] radded setup of type at instantiation time
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-10-26 10:10:28 UTC (rev 26056)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2010-10-26 10:11:24 UTC (rev 26057)
@@ -62,7 +62,7 @@
public class CloudConnectionPage extends WizardPage {
private static final int CLOUDTYPE_CHECK_DELAY = 500;
-
+
private static final String DESCRIPTION = "NewCloudConnection.desc"; //$NON-NLS-1$
private static final String TITLE = "NewCloudConnection.title"; //$NON-NLS-1$
private static final String URL_LABEL = "Url.label"; //$NON-NLS-1$
@@ -137,7 +137,7 @@
}
/**
- * A class that listens to a user click on a button that allows it to test
+ * A Listener that listens to user clicks on a button that allows it to test
* credentials.
*
* @see CloudConnection#performTest()
@@ -186,6 +186,35 @@
}
}
+ /**
+ * A validator that marks cloud names as invalid if the name the user
+ * entered is already used by another connection. It does not invalidate the
+ * name the connection had before editing.
+ *
+ * @see IValidator
+ * @see CloudConnectionModel#getInitialName()
+ * @see DeltaCloudManager#findCloud(String)
+ *
+ */
+ private class CloudNameValidator implements IValidator {
+
+ @Override
+ public IStatus validate(Object value) {
+ String connectionName = (String) value;
+ /*
+ * keeping the same name when editing must be valid
+ */
+ if (!connectionName.equals(connectionModel.getInitialName())
+ /* all new names must be unique */
+ && DeltaCloudManager.getDefault().findCloud(connectionName) != null) {
+ return ValidationStatus
+ .error(WizardMessages.getString(NAME_ALREADY_IN_USE));
+ } else {
+ return ValidationStatus.ok();
+ }
+ }
+ }
+
public CloudConnectionPage(String pageName, CloudConnection cloudConnection) {
super(pageName);
setDescription(WizardMessages.getString(DESCRIPTION));
@@ -415,8 +444,8 @@
// bind converter to delta cloud label
IObservableValue cloudTypeObservable = urlToCloudTypeConverter.getCloudTypeObservable();
- DeltaCloudTypeLabelAdapter cloudTypeAdapter = new DeltaCloudTypeLabelAdapter(
- (DeltaCloudType) cloudTypeObservable.getValue(), typeLabel);
+ DeltaCloudTypeLabelAdapter cloudTypeAdapter =
+ new DeltaCloudTypeLabelAdapter((DeltaCloudType) cloudTypeObservable.getValue(), typeLabel);
cloudTypeObservable.addValueChangeListener(cloudTypeAdapter);
ControlDecorationSupport.create(binding, SWT.LEFT | SWT.TOP);
@@ -441,24 +470,7 @@
new UpdateValueStrategy().setBeforeSetValidator(
new CompositeValidator(
new MandatoryStringValidator(WizardMessages.getString(MUST_ENTER_A_NAME)),
- new IValidator() {
-
- @Override
- public IStatus validate(Object value) {
- /*
- * keeping the same name when editing
- * must be valid
- */
- if (!nameText.getText().equals(connectionModel.getInitialName())
- /* all new names must be unique */
- && DeltaCloudManager.getDefault().findCloud(nameText.getText()) != null) {
- return ValidationStatus
- .error(WizardMessages.getString(NAME_ALREADY_IN_USE));
- } else {
- return ValidationStatus.ok();
- }
- }
- })),
+ new CloudNameValidator())),
null);
ControlDecorationSupport.create(nameTextBinding, SWT.LEFT | SWT.TOP);
}
13 years, 7 months
JBoss Tools SVN: r26056 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model: markers and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-26 06:10:28 -0400 (Tue, 26 Oct 2010)
New Revision: 26056
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintMarkers.java
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java
Log:
JBIDE-7405
https://jira.jboss.org/browse/JBIDE-7405
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java 2010-10-26 09:57:22 UTC (rev 26055)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/handlers/RemoveModelNatureHandler.java 2010-10-26 10:10:28 UTC (rev 26056)
@@ -147,7 +147,7 @@
public static void clear(XModelObject o) {
if(o == null || o.getFileType() == XModelObject.NONE) return;
if(o.getFileType() == XModelObject.FILE) {
- ResourceMarkers markers = new ResourceMarkers(ResourceMarkers.JST_WEB_PROBLEM);
+ ResourceMarkers markers = new ResourceMarkers(ResourceMarkers.JST_WEB_PROBLEM, ResourceMarkers.OLD_JST_WEB_PROBLEM);
markers.setModelObject(o);
markers.update();
} else {
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintMarkers.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintMarkers.java 2010-10-26 09:57:22 UTC (rev 26055)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ConstraintMarkers.java 2010-10-26 10:10:28 UTC (rev 26056)
@@ -16,7 +16,7 @@
ResourceProblems p;
public ConstraintMarkers(ResourceProblems p) {
- super(ResourceMarkers.CONSTRAINT_PROBLEM);
+ super(ResourceMarkers.CONSTRAINT_PROBLEM, ResourceMarkers.OLD_CONSTRAINT_PROBLEM);
this.p = p;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java 2010-10-26 09:57:22 UTC (rev 26055)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/markers/ResourceMarkers.java 2010-10-26 10:10:28 UTC (rev 26056)
@@ -30,16 +30,24 @@
public class ResourceMarkers {
public static String TEXT_PROBLEM = "org.jboss.tools.common.model.textproblemmarker"; //$NON-NLS-1$
- public static String CONSTRAINT_PROBLEM = "org.jboss.tools.jst.web.ui.constraintsmarker"; //$NON-NLS-1$
- public static String JST_WEB_PROBLEM = "org.jboss.tools.jst.web.ui.strutsmarker"; //$NON-NLS-1$
+ public static String CONSTRAINT_PROBLEM = "org.jboss.tools.jst.web.constraintsmarker"; //$NON-NLS-1$
+ public static String JST_WEB_PROBLEM = "org.jboss.tools.jst.web.strutsmarker"; //$NON-NLS-1$
+ public static String OLD_CONSTRAINT_PROBLEM = "org.jboss.tools.jst.web.ui.constraintsmarker"; //$NON-NLS-1$
+ public static String OLD_JST_WEB_PROBLEM = "org.jboss.tools.jst.web.ui.strutsmarker"; //$NON-NLS-1$
private XModelObject object;
- String type;
+ String type = null;
+ String oldType = null;
public ResourceMarkers(String type) {
this.type = type;
}
+ public ResourceMarkers(String type, String oldType) {
+ this.type = type;
+ this.oldType = oldType;
+ }
+
public void setModelObject(XModelObject object) {
this.object = object;
}
@@ -120,6 +128,7 @@
try {
if(!message.equals(m.getAttribute(IMarker.MESSAGE))) continue;
if(attr != null && !attr.equals(m.getAttribute("attribute"))) continue; //$NON-NLS-1$
+ if(oldType != null && oldType.equals(m.getType())) continue;
if(!path.equals(m.getAttribute("path"))) { //$NON-NLS-1$
m.setAttribute("path", path); //$NON-NLS-1$
}
@@ -201,7 +210,7 @@
String _type = m.getType();
if(_type == null) return true;
if(_type.startsWith("org.jboss.tools.")) { //$NON-NLS-1$
- return _type.equals(type);
+ return _type.equals(type) || (oldType != null && _type.equals(oldType));
}
return false;
}
13 years, 7 months
JBoss Tools SVN: r26055 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-26 05:57:22 -0400 (Tue, 26 Oct 2010)
New Revision: 26055
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
Log:
[JBIDE-7360] CloudTypeValidator now returns a warning instead of an error.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-26 09:56:11 UTC (rev 26054)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-26 09:57:22 UTC (rev 26055)
@@ -1,5 +1,7 @@
2010-10-26 André Dietisheim <adietish(a)redhat.com>
+ * src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudTypeValidator.java (validate):
+ [JBIDE-7360] CloudTypeValidator now returns a warning instead of an error (wizard may be finished with an invalid url).
* src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnection.java (addPages):
[JBIDE-7402] added MalformedURLException handling.
* src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java (bindCloudType):
13 years, 7 months
JBoss Tools SVN: r26054 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-26 05:56:11 -0400 (Tue, 26 Oct 2010)
New Revision: 26054
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudTypeValidator.java
Log:
[JBIDE-7360] CloudTypeValidator now returns a warning instead of an error.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudTypeValidator.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudTypeValidator.java 2010-10-26 09:52:38 UTC (rev 26053)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudTypeValidator.java 2010-10-26 09:56:11 UTC (rev 26054)
@@ -23,7 +23,7 @@
&& !DeltaCloudClient.DeltaCloudType.UNKNOWN.equals(value)) {
return ValidationStatus.ok();
} else {
- return ValidationStatus.error(WizardMessages.getString("IllegalCloudUrl.msg")); //$NON-NLS-1$
+ return ValidationStatus.warning(WizardMessages.getString("IllegalCloudUrl.msg")); //$NON-NLS-1$
}
}
}
\ No newline at end of file
13 years, 7 months
JBoss Tools SVN: r26053 - in trunk/struts/tests/org.jboss.tools.struts.ui.bot.test: src/org/jboss/tools/struts/ui/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jlukas(a)redhat.com
Date: 2010-10-26 05:52:38 -0400 (Tue, 26 Oct 2010)
New Revision: 26053
Removed:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/project.properties
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/inputname63.jsp.gf
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
Log:
cleanup
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/inputname63.jsp.gf
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/inputname63.jsp.gf 2010-10-26 09:51:09 UTC (rev 26052)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/inputname63.jsp.gf 2010-10-26 09:52:38 UTC (rev 26053)
@@ -13,7 +13,7 @@
-->
<html:html>
<head>
- <html:javascript formName="GetNameForm"/>
+ <html:javascript formName="GetNameForm" />
<title></title>
</head>
<body>
Deleted: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/project.properties
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/project.properties 2010-10-26 09:51:09 UTC (rev 26052)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/resources/project.properties 2010-10-26 09:52:38 UTC (rev 26053)
@@ -1 +0,0 @@
-JBossEap4.3Home=/opt/jboss-eap-4.3/jboss-as
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2010-10-26 09:51:09 UTC (rev 26052)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/StrutsAllBotTests.java 2010-10-26 09:52:38 UTC (rev 26053)
@@ -10,8 +10,6 @@
******************************************************************************/
package org.jboss.tools.struts.ui.bot.test;
-import java.util.logging.Logger;
-
import org.jboss.tools.struts.ui.bot.test.smoke.AddRemoveStrutsCapabilities;
import org.jboss.tools.struts.ui.bot.test.smoke.CreateNewStrutsProjectTest;
import org.jboss.tools.struts.ui.bot.test.smoke.ImportStrutsProjectTest;
@@ -20,8 +18,6 @@
import org.jboss.tools.struts.ui.bot.test.smoke.RunStrutsProjectOnServer;
import org.jboss.tools.struts.ui.bot.test.tutorial.TutorialTest;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
13 years, 7 months