JBoss Tools SVN: r22064 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-13 10:13:04 -0400 (Thu, 13 May 2010)
New Revision: 22064
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-13 14:07:32 UTC (rev 22063)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-13 14:13:04 UTC (rev 22064)
@@ -375,6 +375,7 @@
public void testUnresolvedDisposalMethod() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/broken/unresolvedMethod/SpiderProducer_Broken.java");
AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, 35);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, 31);
}
/**
15 years, 11 months
JBoss Tools SVN: r22063 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-13 10:07:32 -0400 (Thu, 13 May 2010)
New Revision: 22063
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMethod.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6251
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMethod.java 2010-05-13 13:47:30 UTC (rev 22062)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMethod.java 2010-05-13 14:07:32 UTC (rev 22063)
@@ -34,4 +34,16 @@
* @return
*/
List<IParameter> getParameters();
+
+ /**
+ * Returns true if method has a parameter annotated with @Disposes
+ * @return
+ */
+ boolean isDisposer();
+
+ /**
+ * Returns true if method has a parameter annotated with @Observes
+ * @return
+ */
+ public boolean isObserver();
}
\ No newline at end of file
15 years, 11 months
JBoss Tools SVN: r22062 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-13 09:47:30 -0400 (Thu, 13 May 2010)
New Revision: 22062
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-13 13:39:48 UTC (rev 22061)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-13 13:47:30 UTC (rev 22062)
@@ -727,7 +727,7 @@
*/
IField[] fields = type.getFields();
for (IField field : fields) {
- if(Flags.isPublic(field.getFlags())) {
+ if(Flags.isPublic(field.getFlags()) && !Flags.isStatic(field.getFlags())) {
addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, declaration, bean.getResource());
break;
}
15 years, 11 months
JBoss Tools SVN: r22061 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-13 09:39:48 -0400 (Thu, 13 May 2010)
New Revision: 22061
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6258
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-13 13:39:46 UTC (rev 22060)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-13 13:39:48 UTC (rev 22061)
@@ -410,8 +410,8 @@
*/
public void testParameterizedTypeWithWildcard() throws Exception {
IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java");
- AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, 23, 1008, 1033);
- AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, 24, 10011, 1036);
+ AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, 23, 1011, 1026);
+ AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, 24, 1100, 1125);
}
/**
15 years, 11 months
JBoss Tools SVN: r22060 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-05-13 09:39:46 -0400 (Thu, 13 May 2010)
New Revision: 22060
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-6252
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-13 13:07:31 UTC (rev 22059)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-13 13:39:46 UTC (rev 22060)
@@ -442,8 +442,7 @@
for (IBeanMethod disposerMethod : disposers) {
if(!boundDisposers.contains(disposerMethod)) {
for (ITextSourceReference declaration : disposerDeclarations) {
- // TODO uncomment it when https://jira.jboss.org/jira/browse/JBIDE-6252 is resolved
-// addError(CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, CDIPreferences.NO_PRODUCER_MATCHING_DISPOSER, declaration, bean.getResource());
+ addError(CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, CDIPreferences.NO_PRODUCER_MATCHING_DISPOSER, declaration, bean.getResource());
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-05-13 13:07:31 UTC (rev 22059)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/messages.properties 2010-05-13 13:39:46 UTC (rev 22060)
@@ -50,7 +50,7 @@
BOTH_INTERCEPTOR_AND_DECORATOR=The bean class of a managed bean is annotated with both the @Interceptor and @Decorator stereotypes
SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR=Bean class of a session bean is annotated @Interceptor or @Decorator
PRODUCER_IN_INTERCEPTOR=Interceptor has a member annotated @Produces
-PRODUCER_IN_OR_DECORATOR=Decorator has a member annotated @Produces
+PRODUCER_IN_DECORATOR=Decorator has a member annotated @Produces
DISPOSER_IN_INTERCEPTOR=Interceptor has a method annotated @Disposes
DISPOSER_IN_DECORATOR=Decorator has a method annotated @Disposes
MULTIPLE_DELEGATE=Decorator has more than one delegate injection point
15 years, 11 months
JBoss Tools SVN: r22059 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-05-13 09:07:31 -0400 (Thu, 13 May 2010)
New Revision: 22059
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/JSf2MoveParticipant.java
Log:
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/JSf2MoveParticipant.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/JSf2MoveParticipant.java 2010-05-13 13:05:47 UTC (rev 22058)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/JSf2MoveParticipant.java 2010-05-13 13:07:31 UTC (rev 22059)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2007-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
+ ******************************************************************************/
+
package org.jboss.tools.jsf.jsf2.refactoring;
import java.util.HashMap;
@@ -20,6 +31,12 @@
import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil;
import org.jboss.tools.jsf.messages.JSFUIMessages;
+/**
+ *
+ * @author yzhishko
+ *
+ */
+
public class JSf2MoveParticipant extends MoveParticipant {
private IProject project;
15 years, 11 months
JBoss Tools SVN: r22058 - in trunk/jsf: tests/org.jboss.tools.jsf.ui.bot.test/resources and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-05-13 09:05:47 -0400 (Thu, 13 May 2010)
New Revision: 22058
Added:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2MoveTestPageRefactor.html
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2RenameTestPageRefactor.html
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2TestPage.html
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/JSF2RenameParticipant.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5942 - swtbot test were added
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/JSF2RenameParticipant.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/JSF2RenameParticipant.java 2010-05-13 12:53:58 UTC (rev 22057)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring/JSF2RenameParticipant.java 2010-05-13 13:05:47 UTC (rev 22058)
@@ -92,11 +92,11 @@
if (!"org.eclipse.wst.html.core.htmlsource".equals(contentType.getId())) { //$NON-NLS-1$
return false;
}
- if ((JSF2ComponentModelManager.getManager()
- .checkCompositeInterface(JSF2ComponentModelManager
- .getReadableDOMDocument(file))) == null) {
- return false;
- }
+// if ((JSF2ComponentModelManager.getManager()
+// .checkCompositeInterface(JSF2ComponentModelManager
+// .getReadableDOMDocument(file))) == null) {
+// return false;
+// }
return true;
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2MoveTestPageRefactor.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2MoveTestPageRefactor.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2MoveTestPageRefactor.html 2010-05-13 13:05:47 UTC (rev 22058)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:mycomp="http://java.sun.com/jsf/composite/mycomp1/mycomp">
+
+<mycomp:echo echo="test" />
+
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2RenameTestPageRefactor.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2RenameTestPageRefactor.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2RenameTestPageRefactor.html 2010-05-13 13:05:47 UTC (rev 22058)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:mycomp="http://java.sun.com/jsf/composite/mycomp">
+
+<mycomp:echo1 echo="test" />
+
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2TestPage.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2TestPage.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2TestPage.html 2010-05-13 13:05:47 UTC (rev 22058)
@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:mycomp="http://java.sun.com/jsf/composite/mycomp">
+
+<mycomp:echo echo="test" />
+
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2010-05-13 12:53:58 UTC (rev 22057)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAllBotTests.java 2010-05-13 13:05:47 UTC (rev 22058)
@@ -9,6 +9,8 @@
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3579Test;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3920Test;
import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE4391Test;
+import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2MoveParticipantTest;
+import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2RenameParticipantTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.AddRemoveJSFCapabilitiesTest;
import org.jboss.tools.jsf.ui.bot.test.smoke.CreateNewJSFProjectTest;
import org.jboss.tools.jsf.ui.bot.test.templates.SetTemplateForUnknownTagTest;
@@ -32,6 +34,8 @@
suite.addTestSuite(UnknownTemplateTest.class);
suite.addTestSuite(SetTemplateForUnknownTagTest.class);
suite.addTestSuite(CSSSelectorJBIDE3288.class);
+ suite.addTestSuite(JSF2MoveParticipantTest.class);
+ suite.addTestSuite(JSF2RenameParticipantTest.class);
return suite;
}
}
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2010-05-13 12:53:58 UTC (rev 22057)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/JSFAutoTestCase.java 2010-05-13 13:05:47 UTC (rev 22058)
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Scanner;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
@@ -36,23 +37,23 @@
String filePath = FileLocator
.toFileURL(
Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile() + "resources/" + testPage; //$NON-NLS-1$ //$NON-NLS-2$
-
- File file = new File(filePath);
- if (!file.exists() || !file.isFile()) {
- filePath = FileLocator
- .toFileURL(
- Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile() + testPage; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
+
+ File file = new File(filePath);
+ if (!file.exists() || !file.isFile()) {
+ filePath = FileLocator
+ .toFileURL(
+ Platform.getBundle(Activator.PLUGIN_ID).getEntry(
+ "/")).getFile() + testPage; //$NON-NLS-1$
+ }
return filePath;
-
}
protected void openTestPage() {
SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
.bot();
SWTBotTree tree = innerBot.tree();
- tree.expandNode(JBT_TEST_PROJECT_NAME)
+ tree
+ .expandNode(JBT_TEST_PROJECT_NAME)
.expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -61,6 +62,7 @@
performContentTestByDocument(testPage, bot
.multiPageEditorByTitle(TEST_PAGE));
}
+
@Override
protected void closeUnuseDialogs() {
}
@@ -84,4 +86,14 @@
super.tearDown();
}
+ protected String loadFileContent(String resourceRelativePath) throws IOException {
+ File file = new File(getPathToResources(resourceRelativePath));
+ StringBuilder builder = new StringBuilder(""); //$NON-NLS-1$
+ Scanner scanner = new Scanner(file);
+ while (scanner.hasNextLine()) {
+ builder.append(scanner.nextLine());
+ }
+ return builder.toString();
+ }
+
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2010-05-13 13:05:47 UTC (rev 22058)
@@ -0,0 +1,101 @@
+package org.jboss.tools.jsf.ui.bot.test.jsf2.refactor;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+
+public abstract class JSF2AbstractRefactorTest extends JSFAutoTestCase {
+
+ protected static final String JSF2_Test_Page_Name = "jsf2TestPage"; //$NON-NLS-1$
+
+ protected void createCompositeComponent() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ try {
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ } catch (WidgetNotFoundException e) {
+ tree
+ .getTreeItem(
+ projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").select(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.textWithLabel("Folder name:").setText("resources"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("Finish").click(); //$NON-NLS-1$
+ }
+ try {
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ } catch (WidgetNotFoundException e) {
+ tree
+ .getTreeItem(
+ projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.textWithLabel("Folder name:").setText("mycomp"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("Finish").click(); //$NON-NLS-1$
+ }
+ try {
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ } catch (WidgetNotFoundException e) {
+ tree
+ .getTreeItem(
+ projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.textWithLabel("Folder name:").setText("mycomp"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("Finish").click(); //$NON-NLS-1$
+ }
+ try {
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ } catch (WidgetNotFoundException e) {
+ tree
+ .getTreeItem(
+ projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.shell("New").activate(); //$NON-NLS-1$
+ tree = bot.tree();
+ tree.expandNode("JBoss Tools Web").select("XHTML Page"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("Next >").click(); //$NON-NLS-1$
+ bot.textWithLabel("File name:").setText("echo"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("Finish").click(); //$NON-NLS-1$
+ bot.sleep(2000);
+ bot.editorByTitle("echo.xhtml").close(); //$NON-NLS-1$
+ }
+ }
+
+ protected void createTestPage() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ try {
+ tree.expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent"). //$NON-NLS-1$ //$NON-NLS-2$
+ getNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$
+ } catch (WidgetNotFoundException e) {
+ tree
+ .getTreeItem(
+ projectProperties.getProperty("JSFProjectName")).select(); //$NON-NLS-1$
+ bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.shell("New").activate(); //$NON-NLS-1$
+ tree = bot.tree();
+ tree.expandNode("JBoss Tools Web").select("XHTML Page"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("Next >").click(); //$NON-NLS-1$
+ bot.textWithLabel("File name:").setText(JSF2_Test_Page_Name); //$NON-NLS-1$
+ bot.button("Finish").click(); //$NON-NLS-1$
+ }
+ SWTBotEclipseEditor editor = bot.editorByTitle(
+ JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$
+ editor.setFocus();
+ bot.sleep(2000);
+ bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$//$NON-NLS-2$
+ bot.sleep(2000);
+ editor.setText(loadFileContent("refactor/jsf2TestPage.html")); //$NON-NLS-1$
+ bot.sleep(2000);
+ editor.saveAndClose();
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2010-05-13 13:05:47 UTC (rev 22058)
@@ -0,0 +1,87 @@
+package org.jboss.tools.jsf.ui.bot.test.jsf2.refactor;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+
+public class JSF2MoveParticipantTest extends JSF2AbstractRefactorTest {
+
+ public void testJSF2MoveParticipant() throws Exception {
+ createTestPage();
+ createCompositeComponent();
+ createDistResFolder();
+ moveCurrResFolder();
+ checkContent();
+ }
+
+ private void checkContent() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ delay();
+ SWTBotEclipseEditor editor = bot.editorByTitle(
+ JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$
+ assertEquals(
+ loadFileContent("refactor/jsf2MoveTestPageRefactor.html"), editor.getText()); //$NON-NLS-1$
+ delay();
+ editor.close();
+ }
+
+ private void moveCurrResFolder() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ bot.menu("Refactor").menu("Move...").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ innerBot = bot.shell("Move").bot(); //$NON-NLS-1$
+ tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ delay();
+ bot.button("OK").click(); //$NON-NLS-1$
+ delay();
+ }
+
+ private void createDistResFolder() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ try {
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ } catch (WidgetNotFoundException e) {
+ tree
+ .getTreeItem(
+ projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.textWithLabel("Folder name:").setText("mycomp1"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("Finish").click(); //$NON-NLS-1$
+ delay();
+ }
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ delay();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("OK").click(); //$NON-NLS-1$
+ delay();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("OK").click(); //$NON-NLS-1$
+ delay();
+ super.tearDown();
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2010-05-13 13:05:47 UTC (rev 22058)
@@ -0,0 +1,62 @@
+package org.jboss.tools.jsf.ui.bot.test.jsf2.refactor;
+
+import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.jboss.tools.ui.bot.test.WidgetVariables;
+
+public class JSF2RenameParticipantTest extends JSF2AbstractRefactorTest {
+
+ public void testJSF2RenameParticipant() throws Exception {
+ createTestPage();
+ createCompositeComponent();
+ renameCompositeComponent();
+ checkContent();
+ }
+
+ private void renameCompositeComponent() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ bot.menu("Refactor").menu("Rename...").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.textWithLabel("New name:").setText("echo1.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("OK").click(); //$NON-NLS-1$
+ delay();
+ }
+
+ private void checkContent() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ delay();
+ SWTBotEclipseEditor editor = bot.editorByTitle(
+ JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$
+ assertEquals(
+ loadFileContent("refactor/jsf2RenameTestPageRefactor.html"), editor.getText()); //$NON-NLS-1$
+ delay();
+ editor.close();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
+ .bot();
+ SWTBotTree tree = innerBot.tree();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("OK").click(); //$NON-NLS-1$
+ delay();
+ tree
+ .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo1.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
+ bot.button("OK").click(); //$NON-NLS-1$
+ delay();
+ super.tearDown();
+ }
+
+}
15 years, 11 months
JBoss Tools SVN: r22057 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-05-13 08:53:58 -0400 (Thu, 13 May 2010)
New Revision: 22057
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6258
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2010-05-13 12:35:56 UTC (rev 22056)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2010-05-13 12:53:58 UTC (rev 22057)
@@ -54,10 +54,12 @@
String start = content.substring(sr.getOffset(), nr.getOffset());
int off = -1;
int off0 = -1;
+ int bc = 0;
for (int i = start.length() - 1; i >= 0; i--) {
char ch = start.charAt(i);
+ if(ch == '>') bc++; else if(ch == '<') bc--;
if(Character.isWhitespace(ch)) {
- if(off >= 0) break;
+ if(off >= 0 && bc <= 0) break;
} else if(Character.isJavaIdentifierPart(ch) || ch == '.' || ch == '$' || ch == '<' || ch == '>') {
off = i;
if(off0 < 0) off0 = i + 1;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-13 12:35:56 UTC (rev 22056)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/MethodDefinition.java 2010-05-13 12:53:58 UTC (rev 22057)
@@ -78,7 +78,10 @@
int start = paramStart + 1;
for (int i = 0; i < params.length; i++) {
- if(params[i].indexOf('@') < 0) continue; //do not need parameters without annotation
+ if(params[i].indexOf('@') < 0) {
+ start += params[i].length() + 1;
+ continue; //do not need parameters without annotation
+ }
ParameterDefinition pd = new ParameterDefinition();
15 years, 11 months
JBoss Tools SVN: r22056 - branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-05-13 08:35:56 -0400 (Thu, 13 May 2010)
New Revision: 22056
Modified:
branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
Log:
JBIDE-6056 branch
Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
===================================================================
--- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2010-05-13 12:32:34 UTC (rev 22055)
+++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2010-05-13 12:35:56 UTC (rev 22056)
@@ -82,6 +82,8 @@
}
public int getPublishType(int kind, int deltaKind, int modulePublishState) {
+ if( ServerBehaviourDelegate.ADDED == deltaKind )
+ return IJBossServerPublisher.FULL_PUBLISH;
if (ServerBehaviourDelegate.REMOVED == deltaKind) {
return IJBossServerPublisher.REMOVE_PUBLISH;
} else if (kind == IServer.PUBLISH_FULL || modulePublishState == IServer.PUBLISH_STATE_FULL || kind == IServer.PUBLISH_CLEAN ) {
15 years, 11 months
JBoss Tools SVN: r22055 - in branches/jbosstools-3.1.x: esb/plugins/org.jboss.tools.esb.project.core and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-05-13 08:32:34 -0400 (Thu, 13 May 2010)
New Revision: 22055
Modified:
branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java
Log:
JBIDE-6056 branch
Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-05-13 11:27:22 UTC (rev 22054)
+++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-05-13 12:32:34 UTC (rev 22055)
@@ -769,7 +769,7 @@
id="org.jboss.ide.eclipse.as.runtime.component"
version="6.0"/>
<facet id="jst.web" version="2.2,2.3,2.4,2.5"/>
- <facet id="jst.java" version="1.3,1.4,5.0,6.0"/>
+ <facet id="jst.java" version="5.0,6.0"/>
<facet id="jst.utility" version="1.0"/>
<facet id="jst.connector" version="1.0,1.5"/>
<facet id="jst.ejb" version="2.0,2.1,3.0"/>
Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml
===================================================================
--- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2010-05-13 11:27:22 UTC (rev 22054)
+++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2010-05-13 12:32:34 UTC (rev 22055)
@@ -151,7 +151,7 @@
</facet>
<runtime-component
id="org.jboss.ide.eclipse.as.runtime.component"
- version="4.2,5.0,5.1">
+ version="4.2,5.0,5.1,6.0">
</runtime-component>
</supported>
<supported>
Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java
===================================================================
--- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2010-05-13 11:27:22 UTC (rev 22054)
+++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2010-05-13 12:32:34 UTC (rev 22055)
@@ -11,6 +11,7 @@
package org.jboss.tools.esb.project.ui.wizards;
import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -31,7 +32,11 @@
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate;
+import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCopy;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEvent;
+import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectListener;
import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
@@ -48,6 +53,13 @@
public ESBProjectWizard() {
super();
+ Set<IProjectFacetVersion> current = getFacetedProjectWorkingCopy().getProjectFacets();
+ getFacetedProjectWorkingCopy().addListener(new IFacetedProjectListener(){
+ public void handleEvent(IFacetedProjectEvent event) {
+ System.out.println("runtime changed" + event.getWorkingCopy().getPrimaryRuntime().getName());
+ }}, IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED);
+ IRuntime rt = getFacetedProjectWorkingCopy().getPrimaryRuntime();
+ getFacetedProjectWorkingCopy().setProjectFacets(current);
setWindowTitle(JBossESBUIMessages.ESBProjectWizard_Title);
setDefaultPageImageDescriptor(ESBSharedImages.getImageDescriptor(ESBSharedImages.WIZARD_NEW_PROJECT));
}
@@ -64,6 +76,14 @@
return DataModelFactory.createDataModel(new JBossESBFacetProjectCreationDataModelProvider());
}
+ private IFacetedProjectWorkingCopy fpjwc;
+
+ @Override
+ public void setFacetedProjectWorkingCopy( final IFacetedProjectWorkingCopy fpjwc ) {
+ super.setFacetedProjectWorkingCopy(fpjwc);
+ this.fpjwc = fpjwc;
+ }
+
@Override
protected IWizardPage createFirstPage() {
return new ESBProjectFirstPage(model, "first.page"); //$NON-NLS-1$
Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java
===================================================================
--- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-05-13 11:27:22 UTC (rev 22054)
+++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-05-13 12:32:34 UTC (rev 22055)
@@ -41,8 +41,12 @@
return ESBProjectConstant.ESB_PROJECT_FACET;
}
- protected void createPresetPanel(Composite top) {
- new Label(top, SWT.NONE);
+// protected void createPresetPanel(Composite top) {
+// new Label(top, SWT.NONE);
+// }
+ protected void createPrimaryFacetComposite(Composite top) {
+ super.createPrimaryFacetComposite(top);
+ super.handlePrimaryFacetVersionSelectedEvent();
}
@Override
15 years, 11 months