JBoss Tools SVN: r33795 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-10 18:51:08 -0400 (Wed, 10 Aug 2011)
New Revision: 33795
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java
Log:
JBIDE-7892
Search for @Named beans.
Open CDI Named Bean Dialog is added
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java 2011-08-10 22:49:29 UTC (rev 33794)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java 2011-08-10 22:51:08 UTC (rev 33795)
@@ -60,46 +60,43 @@
if (result != IDialogConstants.OK_ID)
return null;
- Object[] beans= dialog.getResult();
- if (beans != null && beans.length > 0) {
- CDINamedBeanWrapper wrapper= null;
- for (int i= 0; i < beans.length; i++) {
- wrapper= (CDINamedBeanWrapper) beans[i];
- IBean bean = wrapper.getBean();
- IProject project = bean.getCDIProject().getNature().getProject();
- ELContextImpl elContext = new ELContextImpl();
- elContext.setResource(project.getFile(".project"));
-
- CdiElResolver resolver = new CdiElResolver();
- ELResolution resolution = resolver.resolve(elContext, resolver.parseOperand("${" + bean.getName() + "}"), 0);
- if (resolution.isResolved() && resolution.getNumberOfResolvedSegments() == 1) {
- ELSegment segment = resolution.getLastSegment();
- if (segment.isResolved()) {
- IOpenableReference[] openables = segment.getOpenable();
-
- if(openables.length == 0 || !openables[0].open()) {
- ITextSourceReference ref = segment.getSourceReference();
- if (ref.getResource() instanceof IFile) {
- try {
- IWorkbenchPage page = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow().getActivePage();
- IEditorPart part = IDE.openEditor(page, (IFile)ref.getResource(), true);
- if (ref.getStartPosition() >=0 && ref.getLength() > 0) {
- if (part instanceof JavaEditor) {
- EditorUtility.revealInEditor(part,
- ref.getStartPosition(), ref.getLength());
- } else if (part != null) {
- // We have not to pass null argument here, because the following call will
- // perform select and reveal on active editor which is wrong in part == null
- //
- StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(
- new Region(ref.getStartPosition(), ref.getLength()));
- }
+ Object[] resultObjects = dialog.getResult();
+ for (Object resultObject : resultObjects) {
+ CDINamedBeanWrapper wrapper= (CDINamedBeanWrapper) resultObject;
+ IBean bean = wrapper.getBean();
+ IProject project = bean.getCDIProject().getNature().getProject();
+ ELContextImpl elContext = new ELContextImpl();
+ elContext.setResource(project.getFile(".project"));
+
+ CdiElResolver resolver = new CdiElResolver();
+ ELResolution resolution = resolver.resolve(elContext, resolver.parseOperand("${" + bean.getName() + "}"), 0);
+ if (resolution.isResolved() && resolution.getNumberOfResolvedSegments() == 1) {
+ ELSegment segment = resolution.getLastSegment();
+ if (segment.isResolved()) {
+ IOpenableReference[] openables = segment.getOpenable();
+
+ if(openables.length == 0 || !openables[0].open()) {
+ ITextSourceReference ref = segment.getSourceReference();
+ if (ref.getResource() instanceof IFile) {
+ try {
+ IWorkbenchPage page = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ IEditorPart part = IDE.openEditor(page, (IFile)ref.getResource(), true);
+ if (ref.getStartPosition() >=0 && ref.getLength() > 0) {
+ if (part instanceof JavaEditor) {
+ EditorUtility.revealInEditor(part,
+ ref.getStartPosition(), ref.getLength());
+ } else if (part != null) {
+ // We have not to pass null argument here, because the following call will
+ // perform select and reveal on active editor which is wrong in part == null
+ //
+ StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(
+ new Region(ref.getStartPosition(), ref.getLength()));
}
-
- } catch (PartInitException pie) {
- CDICorePlugin.getDefault().logError(pie);
}
+
+ } catch (PartInitException pie) {
+ CDICorePlugin.getDefault().logError(pie);
}
}
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33794 - in trunk: common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/info and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-10 18:49:29 -0400 (Wed, 10 Aug 2011)
New Revision: 33794
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/info/ChainTextHover.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
Log:
Code review fixes for https://issues.jboss.org/browse/JBIDE-9448
dead blocks were removed, because control is never gets there
new ChainTextHover() is never called with null hovers parameter, so check for null is removed.
createDocumentationHovers(partitionType) never returns null, so there is no reason to check hovers for null and replace it with empty array.
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2011-08-10 21:56:21 UTC (rev 33793)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/XMLTextViewerConfiguration.java 2011-08-10 22:49:29 UTC (rev 33794)
@@ -210,11 +210,6 @@
protected IInformationProvider getInformationProvider(
ISourceViewer sourceViewer, String partitionType) {
ITextHover[] hovers = createDocumentationHovers(partitionType);
- if (hovers == null) {
- hovers = new ITextHover[] {new ChainTextHover(
- new ITextHover[0])};
- }
-
return new TextHoverInformationProvider(new ChainTextHover(
hovers));
}
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/info/ChainTextHover.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/info/ChainTextHover.java 2011-08-10 21:56:21 UTC (rev 33793)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/info/ChainTextHover.java 2011-08-10 22:49:29 UTC (rev 33794)
@@ -70,18 +70,16 @@
// hoverList.add(new ProblemAnnotationHoverProcessor());
hoverList.add(new MarkerProblemAnnotationHoverProcessor());
- if (fTagInfoHovers != null) {
- for (int i = 0; i < fTagInfoHovers.length; i++) {
+ for (int i = 0; i < fTagInfoHovers.length; i++) {
// if (fTagInfoHovers[i] instanceof FaceletTagInfoHoverProcessor) {
- if (fTagInfoHovers[i].getClass().getName().startsWith("org.jboss.tools.")) {
- hoverList.add(fTagInfoHovers[i]);
- }
+ if (fTagInfoHovers[i].getClass().getName().startsWith("org.jboss.tools.")) {
+ hoverList.add(fTagInfoHovers[i]);
}
- for (int i = 0; i < fTagInfoHovers.length; i++) {
+ }
+ for (int i = 0; i < fTagInfoHovers.length; i++) {
// if (!(fTagInfoHovers[i] instanceof FaceletTagInfoHoverProcessor)) {
- if (!(fTagInfoHovers[i].getClass().getName().startsWith("org.jboss.tools."))) {
- hoverList.add(fTagInfoHovers[i]);
- }
+ if (!(fTagInfoHovers[i].getClass().getName().startsWith("org.jboss.tools."))) {
+ hoverList.add(fTagInfoHovers[i]);
}
}
hoverList.add(new AnnotationHoverProcessor());
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2011-08-10 21:56:21 UTC (rev 33793)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/HTMLTextViewerConfiguration.java 2011-08-10 22:49:29 UTC (rev 33794)
@@ -201,11 +201,6 @@
protected IInformationProvider getInformationProvider(
ISourceViewer sourceViewer, String partitionType) {
ITextHover[] hovers = createDocumentationHovers(partitionType);
- if (hovers == null) {
- hovers = new ITextHover[] {new ChainTextHover(
- new ITextHover[0])};
- }
-
return new TextHoverInformationProvider(new ChainTextHover(
hovers));
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2011-08-10 21:56:21 UTC (rev 33793)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/JSPTextViewerConfiguration.java 2011-08-10 22:49:29 UTC (rev 33794)
@@ -208,11 +208,6 @@
protected IInformationProvider getInformationProvider(
ISourceViewer sourceViewer, String partitionType) {
ITextHover[] hovers = createDocumentationHovers(partitionType);
- if (hovers == null) {
- hovers = new ITextHover[] {new ChainTextHover(
- new ITextHover[0])};
- }
-
return new TextHoverInformationProvider(new ChainTextHover(
hovers));
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33793 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test: projects/Seam3DependentPersistenceTest and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-10 17:56:21 -0400 (Wed, 10 Aug 2011)
New Revision: 33793
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/EntityManager2Test.class
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java
Log:
JBIDE-9484
https://issues.jboss.org/browse/JBIDE-9484
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath 2011-08-10 21:56:21 UTC (rev 33793)
@@ -0,0 +1,13 @@
+<?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="/Seam3PersistenceTest/lib/cdi-api.jar"/>
+ <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar"/>
+ <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/hibernate3.jar"/>
+ <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/javax.inject.jar"/>
+ <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/seam-persistence.jar"/>
+ <classpathentry kind="lib" path="/Seam3PersistenceTest/lib/seam-solder.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/Seam3PersistenceTest"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.classpath
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project 2011-08-10 21:56:21 UTC (rev 33793)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Seam3DependentPersistenceTest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.cdi.core.cdibuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.jboss.tools.cdi.core.cdinature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.project
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs 2011-08-10 21:56:21 UTC (rev 33793)
@@ -0,0 +1,12 @@
+#Wed Aug 10 13:45:00 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/EntityManager2Test.class
===================================================================
(Binary files differ)
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/bin/test/EntityManager2Test.class
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java 2011-08-10 21:56:21 UTC (rev 33793)
@@ -0,0 +1,17 @@
+package test;
+
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+import org.hibernate.Session;
+
+public class EntityManager2Test {
+
+ @Inject
+ @MyQualifier
+ EntityManager manager;
+
+ @Inject
+ Session session;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/projects/Seam3DependentPersistenceTest/src/test/EntityManager2Test.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-10 21:44:12 UTC (rev 33792)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTest.java 2011-08-10 21:56:21 UTC (rev 33793)
@@ -20,6 +20,7 @@
public class SeamPersistenceTest extends TestCase {
protected IProject project;
+ protected IProject dependentProject;
public IProject getTestProject() throws IOException, CoreException, InvocationTargetException, InterruptedException {
if(project==null) {
@@ -32,6 +33,17 @@
return project;
}
+ public IProject getDependentTestProject() throws IOException, CoreException, InvocationTargetException, InterruptedException {
+ if(dependentProject==null) {
+ dependentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(SeamPersistenceTestSetup.DEPENDENT_PROJECT_NAME);
+ if(!dependentProject.exists()) {
+ dependentProject = ResourcesUtils.importProject(SeamPersistenceTestSetup.PLUGIN_ID, SeamPersistenceTestSetup.DEPENDENT_PROJECT_PATH);
+ TestUtil.waitForValidation();
+ }
+ }
+ return dependentProject;
+ }
+
public void testEntityManagerInjection() throws Exception {
ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManagerTest.java", "manager");
@@ -41,6 +53,15 @@
assertEquals(1, bs.size());
}
+ public void testEntityManagerInjectionInDependentProject() throws Exception {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getDependentTestProject(), true);
+ IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManager2Test.java", "manager");
+ assertNotNull(p);
+
+ Set<IBean> bs = cdi.getBeans(false, p);
+ assertEquals(1, bs.size());
+ }
+
public void testSessionInjection() throws Exception {
ICDIProject cdi = CDICorePlugin.getCDIProject(getTestProject(), true);
IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManagerTest.java", "session");
@@ -49,4 +70,13 @@
Set<IBean> bs = cdi.getBeans(false, p);
assertFalse(bs.isEmpty());
}
-}
\ No newline at end of file
+
+ public void testSessionInjectionInDependentProject() throws Exception {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(getDependentTestProject(), true);
+ IInjectionPoint p = DependentProjectTest.getInjectionPointField(cdi, "/src/test/EntityManager2Test.java", "session");
+ assertNotNull(p);
+
+ Set<IBean> bs = cdi.getBeans(false, p);
+ assertEquals(1, bs.size());
+ }
+}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java 2011-08-10 21:44:12 UTC (rev 33792)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/persistence/SeamPersistenceTestSetup.java 2011-08-10 21:56:21 UTC (rev 33793)
@@ -27,8 +27,11 @@
public static final String PLUGIN_ID = "org.jboss.tools.cdi.seam.core.test";
public static final String PROJECT_NAME = "Seam3PersistenceTest";
public static final String PROJECT_PATH = "/projects/Seam3PersistenceTest";
+ public static final String DEPENDENT_PROJECT_NAME = "Seam3DependentPersistenceTest";
+ public static final String DEPENDENT_PROJECT_PATH = "/projects/" + DEPENDENT_PROJECT_NAME;
protected IProject project;
+ protected IProject dependentProject;
public SeamPersistenceTestSetup(Test test) {
super(test);
@@ -41,12 +44,18 @@
project = ResourcesUtils.importProject(PLUGIN_ID, PROJECT_PATH);
project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
}
+ dependentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(DEPENDENT_PROJECT_NAME);
+ if(!dependentProject.exists()) {
+ dependentProject = ResourcesUtils.importProject(PLUGIN_ID, DEPENDENT_PROJECT_PATH);
+ dependentProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
+ }
}
@Override
protected void tearDown() throws Exception {
boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false);
project.delete(true, true, null);
+ dependentProject.delete(true, true, null);
JobUtils.waitForIdle();
ResourcesUtils.setBuildAutomatically(saveAutoBuild);
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33792 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-10 17:44:12 -0400 (Wed, 10 Aug 2011)
New Revision: 33792
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIPlugin.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
Log:
JBIDE-7892
Search for @Named beans.
Open CDI Named Bean Dialog is added
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIPlugin.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIPlugin.java 2011-08-10 21:43:23 UTC (rev 33791)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIPlugin.java 2011-08-10 21:44:12 UTC (rev 33792)
@@ -10,10 +10,6 @@
******************************************************************************/
package org.jboss.tools.cdi.ui;
-import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.internal.core.event.CDIProjectChangeEvent;
-import org.jboss.tools.cdi.internal.core.event.ICDIProjectChangeListener;
-import org.jboss.tools.cdi.ui.wizard.OpenCDINamedBeanDialog;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.osgi.framework.BundleContext;
@@ -34,13 +30,6 @@
public CDIUIPlugin() {
}
- private final static ICDIProjectChangeListener cdiProjectListener =
- new ICDIProjectChangeListener() {
- public void projectChanged(CDIProjectChangeEvent event) {
- OpenCDINamedBeanDialog.validateHistory(event.getProject());
- }
- };
-
/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
@@ -48,8 +37,6 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
- CDICorePlugin.addCDIProjectListener(cdiProjectListener);
-
}
/*
@@ -57,7 +44,6 @@
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
public void stop(BundleContext context) throws Exception {
- CDICorePlugin.removeCDIProjectListener(cdiProjectListener);
plugin = null;
super.stop(context);
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-10 21:43:23 UTC (rev 33791)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-10 21:44:12 UTC (rev 33792)
@@ -16,7 +16,6 @@
import java.io.IOException;
import java.util.Collections;
import java.util.Comparator;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -43,6 +42,8 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.internal.core.event.CDIProjectChangeEvent;
+import org.jboss.tools.cdi.internal.core.event.ICDIProjectChangeListener;
import org.jboss.tools.cdi.internal.core.impl.CDIElement;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
@@ -72,12 +73,60 @@
setListLabelProvider(new CDINamedBeanLabelProvider());
setDetailsLabelProvider(new CDINamedBeanLabelProvider());
+ }
+ private final static ICDIProjectChangeListener cdiProjectListener =
+ new ICDIProjectChangeListener() {
+ public void projectChanged(CDIProjectChangeEvent event) {
+ validateHistory(event.getProject());
+ }
+ };
+
+
+ @Override
+ public boolean close() {
+ CDICorePlugin.removeCDIProjectListener(cdiProjectListener);
+ return super.close();
+ }
+
+ @Override
+ public int open() {
XMLMemento memento = loadMemento();
- if (memento != null)
+ if (memento != null) {
getSelectionHistory().load(memento);
+ updateHistory(memento);
+ saveMemento(memento);
+ }
+ CDICorePlugin.addCDIProjectListener(cdiProjectListener);
+ return super.open();
}
+ private static void updateHistory(XMLMemento memento) {
+ XMLMemento historyMemento = (XMLMemento) memento
+ .getChild(ROOT_NODE);
+
+ if (historyMemento == null)
+ return;
+
+ IMemento[] mementoElements = historyMemento.getChildren(INFO_NODE);
+ for (int i = 0; i < mementoElements.length; ++i) {
+ IMemento mem = mementoElements[i];
+ String projectName = mem.getString(PROJECT_NAME);
+ if (projectName == null) {
+ mem.putString(DELETED, YES);
+ continue;
+ }
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ ICDIProject cdiProject = CDICorePlugin.getCDIProject(project, true);
+ if (cdiProject == null) {
+ mem.putString(DELETED, YES);
+ continue;
+ }
+ validateHistory(cdiProject, memento);
+ }
+ }
+
+
public void startSearch() {
applyFilter();
}
@@ -357,55 +406,52 @@
}
return bean;
}
-
}
-
+
public static void validateHistory(ICDIProject cdiProject) {
- String cdiProjectName = cdiProject.getNature().getProject().getName();
-
XMLMemento memento = loadMemento();
if (memento != null) {
- XMLMemento historyMemento = (XMLMemento) memento
- .getChild(ROOT_NODE);
+ validateHistory(cdiProject, memento);
+ saveMemento(memento);
+ }
+ }
+
+ public static void validateHistory(ICDIProject cdiProject, XMLMemento memento) {
+ String cdiProjectName = cdiProject.getNature().getProject().getName();
+ XMLMemento historyMemento = (XMLMemento) memento
+ .getChild(ROOT_NODE);
- if (historyMemento == null) {
- return;
+ if (historyMemento == null) {
+ return;
+ }
+
+ IMemento[] mementoElements = historyMemento.getChildren(INFO_NODE);
+ for (int i = 0; i < mementoElements.length; ++i) {
+ IMemento mem = mementoElements[i];
+ String projectName = mem.getString(PROJECT_NAME);
+ if (projectName == null) {
+ mem.putString(DELETED, YES);
+ continue;
}
-
- IMemento[] mementoElements = historyMemento.getChildren(INFO_NODE);
- for (int i = 0; i < mementoElements.length; ++i) {
- IMemento mem = mementoElements[i];
- String projectName = mem.getString(PROJECT_NAME);
- if (projectName == null) {
+ if (projectName.equals(cdiProjectName)) {
+ if (!cdiProject.getNature().getProject().exists()) {
mem.putString(DELETED, YES);
continue;
}
- if (projectName.equals(cdiProjectName)) {
- String beanName = mem.getString(BEAN_NAME);
- if (beanName == null) {
- mem.putString(DELETED, YES);
- continue;
- }
- IProject project = ResourcesPlugin.getWorkspace().getRoot()
- .getProject(projectName);
- if (project != null) {
- ICDIProject cCDIProject = CDICorePlugin
- .getCDIProject(project, true);
- if (cCDIProject != null) {
- Set<IBean> beans = cdiProject
- .getBeans(beanName, true);
- IBean bean = (beans == null || beans.isEmpty() ? null : beans.iterator().next());
- if (bean == null)
- mem.putString(DELETED, YES);
- else
- mem.putString(DELETED, NO);
- } else
- mem.putString(DELETED, YES);
- } else
- mem.putString(DELETED, YES);
+
+ String beanName = mem.getString(BEAN_NAME);
+ if (beanName == null) {
+ mem.putString(DELETED, YES);
+ continue;
}
+ Set<IBean> beans = cdiProject
+ .getBeans(beanName, true);
+ IBean bean = (beans == null || beans.isEmpty() ? null : beans.iterator().next());
+ if (bean == null)
+ mem.putString(DELETED, YES);
+ else
+ mem.putString(DELETED, NO);
}
- saveMemento(memento);
}
}
}
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33791 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core: persistence and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-08-10 17:43:23 -0400 (Wed, 10 Aug 2011)
New Revision: 33791
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
Log:
JBIDE-9484
https://issues.jboss.org/browse/JBIDE-9484
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java 2011-08-10 20:48:21 UTC (rev 33790)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java 2011-08-10 21:43:23 UTC (rev 33791)
@@ -16,6 +16,7 @@
import java.util.Set;
import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.seam.core.international.scanner.BundleFileSet;
import org.jboss.tools.common.model.XModelObject;
@@ -82,7 +83,16 @@
}
public Set<XModelObject> getAllBundles() {
- return allBundles;
+ Set<XModelObject> result = new HashSet<XModelObject>();
+ result.addAll(allBundles);
+ Set<CDICoreNature> ns = root.getProject().getCDIProjects(true);
+ for (CDICoreNature n: ns) {
+ CDISeamInternationalExtension extension = CDISeamInternationalExtension.getExtension(n);
+ if(extension != null) {
+ result.addAll(extension.getContext().allBundles);
+ }
+ }
+ return result;
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-10 20:48:21 UTC (rev 33790)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-10 21:43:23 UTC (rev 33791)
@@ -74,6 +74,10 @@
@Override
public void buildBeans(CDIProject target) {
+ if(target.getNature() != context.getRootContext().getProject()) {
+ //because we getAll type definitions
+ return;
+ }
List<TypeDefinition> definitions = target.getNature().getAllTypeDefinitions();
if(definitions.isEmpty()) {
//no beans to build
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33790 - trunk/forge/plugins/org.jboss.tools.forge.runtime.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-10 16:48:21 -0400 (Wed, 10 Aug 2011)
New Revision: 33790
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/
Log:
forge runtime swith to jboss modules
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33789 - trunk/forge/plugins/org.jboss.tools.forge.runtime/lib.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-10 16:43:15 -0400 (Wed, 10 Aug 2011)
New Revision: 33789
Removed:
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/activation.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-connector-wagon.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-impl.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-spi.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-util.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/args4j.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/cal10n-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/cdi-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/common.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/commons-cli.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/commons-codec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/commons-logging.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/contenttype.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/core.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/el-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-dev-plugins.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-event-bus.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-git-tools.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-javaee-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-javaee-impl.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-maven-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-parser-java-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-parser-java.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-parser-xml.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-project-model-maven.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-scaffold-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-scaffold-plugins.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-shell-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-shell.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/fpak.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/guava.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/hibernate-jpa-2.0-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/httpclient.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/httpcore.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jansi.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/javassist.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/javax.inject.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jaxrs-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-annotations-api_1.1_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-connector-api_1.5_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-ejb-api_3.1_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-el-api_2.2_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-interceptor-core.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-interceptor-spi.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-interceptors-api_1.1_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jacc-api_1.4_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jad-api_1.2_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaspi-api_1.0_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-javaee-6.0.pom
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaxb-api_2.2_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaxr-api_1.0_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaxrpc-api_1.1_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaxws-api_2.2_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jms-api_1.1_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jsp-api_2.2_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-logging.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-saaj-api_1.3_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-servlet-api_3.0_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-transaction-api_1.1_spec.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jline.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jobs.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jsch.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jsf-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jsr181-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jsr250-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jstl.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/log4j.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/mail.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-aether-provider.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-artifact.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-compat.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-core.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-embedder.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-model-builder.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-model.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-plugin-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-repository-metadata.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-settings-builder.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-settings.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/metawidget-forge.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/metawidget.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/mvel2.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.console.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.iplog.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.pgm.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.ui.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/osgi.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-cipher.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-classworlds.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-component-annotations.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-interpolation.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-sec-dispatcher.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-utils.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plugin-repository.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/preferences.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/resources.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/runtime.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/seam-render.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/seam-solder.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/shrinkwrap-descriptors-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/shrinkwrap-descriptors-impl.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/sisu-guice-no_aop.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/sisu-inject-bean.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/sisu-inject-plexus.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/slf4j-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/slf4j-ext.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/slf4j-log4j12.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/snakeyaml.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/stax-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/text.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/validation-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/wagon-file.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/wagon-http-lightweight.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/wagon-http-shared.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/wagon-provider-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/weld-api.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/weld-core.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/weld-se-core.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/weld-spi.jar
Log:
forge runtime swith to jboss modules
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/activation.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-connector-wagon.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-impl.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-spi.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/aether-util.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/args4j.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/cal10n-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/cdi-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/common.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/commons-cli.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/commons-codec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/commons-logging.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/contenttype.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/core.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/el-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-dev-plugins.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-event-bus.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-git-tools.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-javaee-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-javaee-impl.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-maven-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-parser-java-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-parser-java.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-parser-xml.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-project-model-maven.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-scaffold-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-scaffold-plugins.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-shell-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/forge-shell.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/fpak.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/guava.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/hibernate-jpa-2.0-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/httpclient.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/httpcore.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jansi.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/javassist.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/javax.inject.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jaxrs-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-annotations-api_1.1_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-connector-api_1.5_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-ejb-api_3.1_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-el-api_2.2_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-interceptor-core.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-interceptor-spi.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-interceptors-api_1.1_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jacc-api_1.4_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jad-api_1.2_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaspi-api_1.0_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-javaee-6.0.pom
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-javaee-6.0.pom 2011-08-10 20:40:27 UTC (rev 33788)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-javaee-6.0.pom 2011-08-10 20:43:15 UTC (rev 33789)
@@ -1,176 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-specs-parent</artifactId>
- <version>1.0.0.Beta2</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jboss-javaee-6.0</artifactId>
- <version>1.0.0.Final</version>
- <packaging>pom</packaging>
- <name>JBoss Java EE 6.0 API Aggregate</name>
- <description>Java EE 6.0 APIs for use with JBoss AS 6</description>
-
- <!-- Properties -->
- <properties>
- <version.jboss.javaee6.bom>1.0.1.Final</version.jboss.javaee6.bom>
- </properties>
-
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/specs/tags/jboss-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/specs/tags/jboss-jav...</developerConnection>
- <url>http://fisheye.jboss.org/browse/JBossAS/projects/specs/tags/jboss-javaee-...</url>
- </scm>
-
- <!-- This repository declaration exists so that Maven 2.2.x clients will download the Spec BOM. -->
- <!-- If you do not include it, projects consuming this artifact and built in Maven 3.x will build correctly, -->
- <!-- but will throw an error if built with 2.2.x. If your project has the jboss-public-repository as one of it's -->
- <!-- declared repositories and consumes this spec jar, it will download the spec artifact correctly, -->
- <!-- but won't find the org.jboss.spec:jboss-javaee6-specs-bom artifact. -->
- <!-- This declaration can be removed once all the spec POM's dependencies are in the Maven Central Repo. -->
- <!-- Since the spec POM is consumed by end-users via the archetypes, it needs to be work with projects built under Maven 2.x. -->
- <repositories>
- <repository>
- <id>jboss-public-repository</id>
- <name>JBoss Repository</name>
- <url>https://repository.jboss.org/nexus/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee6-specs-bom</artifactId>
- <version>${version.jboss.javaee6.bom}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- </dependency>
- <!-- JavaEE 6 requires Connector API 1.6 -->
- <dependency>
- <groupId>org.jboss.spec.javax.resource</groupId>
- <artifactId>jboss-connector-api_1.5_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.4_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.enterprise.deploy</groupId>
- <artifactId>jboss-jad-api_1.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.security.auth.message</groupId>
- <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.xml.registry</groupId>
- <artifactId>jboss-jaxr-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
- <artifactId>jboss-jsp-api_2.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.xml.bind</groupId>
- <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.xml.rpc</groupId>
- <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.xml.soap</groupId>
- <artifactId>jboss-saaj-api_1.3_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.jws</groupId>
- <artifactId>jsr181-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
- </dependencies>
-</project>
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaxb-api_2.2_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaxr-api_1.0_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaxrpc-api_1.1_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jaxws-api_2.2_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jms-api_1.1_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-jsp-api_2.2_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-logging.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-saaj-api_1.3_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-servlet-api_3.0_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jboss-transaction-api_1.1_spec.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jline.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jobs.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jsch.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jsf-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jsr181-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jsr250-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/jstl.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/log4j.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/mail.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-aether-provider.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-artifact.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-compat.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-core.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-embedder.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-model-builder.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-model.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-plugin-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-repository-metadata.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-settings-builder.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/maven-settings.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/metawidget-forge.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/metawidget.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/mvel2.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.console.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.iplog.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.pgm.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/org.eclipse.jgit.ui.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/osgi.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-cipher.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-classworlds.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-component-annotations.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-interpolation.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-sec-dispatcher.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plexus-utils.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/plugin-repository.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/preferences.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/resources.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/runtime.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/seam-render.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/seam-solder.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/shrinkwrap-descriptors-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/shrinkwrap-descriptors-impl.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/sisu-guice-no_aop.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/sisu-inject-bean.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/sisu-inject-plexus.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/slf4j-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/slf4j-ext.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/slf4j-log4j12.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/snakeyaml.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/stax-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/text.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/validation-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/wagon-file.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/wagon-http-lightweight.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/wagon-http-shared.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/wagon-provider-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/weld-api.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/weld-core.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/weld-se-core.jar
===================================================================
(Binary files differ)
Deleted: trunk/forge/plugins/org.jboss.tools.forge.runtime/lib/weld-spi.jar
===================================================================
(Binary files differ)
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33788 - trunk/forge/plugins/org.jboss.tools.forge.runtime.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-08-10 16:40:27 -0400 (Wed, 10 Aug 2011)
New Revision: 33788
Added:
trunk/forge/plugins/org.jboss.tools.forge.runtime/jboss-modules.jar
trunk/forge/plugins/org.jboss.tools.forge.runtime/licence.txt
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath
trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
Log:
forge runtime swith to jboss modules
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath 2011-08-10 20:37:49 UTC (rev 33787)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/.classpath 2011-08-10 20:40:27 UTC (rev 33788)
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/javax.inject.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdi-api.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/forge-shell-api.jar"/>
+ <classpathentry exported="true" kind="lib" path="modules/org/jboss/forge/shell-api/main/forge-shell-api.jar"/>
+ <classpathentry exported="true" kind="lib" path="modules/javax/enterprise/cdi-api/main/cdi-api.jar"/>
+ <classpathentry exported="true" kind="lib" path="modules/javax/enterprise/cdi-api/main/javax.inject.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="lib" path="lib/weld-core.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2011-08-10 20:37:49 UTC (rev 33787)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2011-08-10 20:40:27 UTC (rev 33788)
@@ -1,7 +1,6 @@
bin.includes = META-INF/,\
.,\
- lib/,\
- lib/cdi-api.jar,\
- lib/javax.inject.jar
+ modules/,\
+ jboss-modules.jar
\
\ No newline at end of file
Added: trunk/forge/plugins/org.jboss.tools.forge.runtime/jboss-modules.jar
===================================================================
(Binary files differ)
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime/jboss-modules.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/forge/plugins/org.jboss.tools.forge.runtime/licence.txt
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/licence.txt (rev 0)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/licence.txt 2011-08-10 20:40:27 UTC (rev 33788)
@@ -0,0 +1,84 @@
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT’S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+ a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+ b) in the case of each subsequent Contributor:
+
+ i)changes to the Program, and
+
+ ii)additions to the Program;
+
+ where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor’s behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient’s responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+ a) it complies with the terms and conditions of this Agreement; and
+
+ b) its license agreement:
+
+ i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+ iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+ iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+ a) it must be made available under this Agreement; and
+
+ b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any clai!
ms or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor’s responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient’s patent(s), then such Recipient’s rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient’s rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient’s rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient’s obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) !
and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33787 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-10 16:37:49 -0400 (Wed, 10 Aug 2011)
New Revision: 33787
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDINamedBeanReferencedFilter.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
Log:
JBIDE-7892
Search for @Named beans.
Open CDI Named Bean Dialog is added
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDINamedBeanReferencedFilter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDINamedBeanReferencedFilter.java 2011-08-10 20:07:03 UTC (rev 33786)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDINamedBeanReferencedFilter.java 2011-08-10 20:37:49 UTC (rev 33787)
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.cdi.ui.wizard;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.jboss.tools.cdi.core.CDICorePlugin;
-import org.jboss.tools.cdi.core.IBean;
-import org.jboss.tools.cdi.core.ICDIProject;
-import org.jboss.tools.common.text.ITextSourceReference;
-
-/**
- * CDI Named Bean Filter
- *
- * @author Victor V. Rubezhny
- */
-public class CDINamedBeanReferencedFilter extends ViewerFilter {
-
- @Override
- public boolean select(Viewer viewer, Object parentElement, Object element) {
- if(element instanceof IBean) {
- IBean bean = (IBean)element;
- return isBeanDeclaredInThisProject(bean);
- }
-
- return true;
- }
-
- public static boolean isBeanDeclaredInThisProject(IBean bean) {
- ICDIProject beanProject = bean.getCDIProject();
- IResource beanResource = null;
-
- //1. Get @Named declared directly, not in stereotype.
- ITextSourceReference nameLocation = bean.getNameLocation(false);
- //2. Get stereotype declaration declaring @Named, if @Named is not declared directly.
- ITextSourceReference stereotypeLocation = nameLocation != null ? null : bean.getNameLocation(true);
- if (nameLocation != null) {
- beanResource = nameLocation.getResource();
- } else if (stereotypeLocation != null) {
- beanResource = stereotypeLocation.getResource();
- }
- if (beanResource == null)
- return false;
-
- ICDIProject cdiProject = CDICorePlugin.getCDIProject(beanResource.getProject(),
- true);
- return cdiProject == beanProject;
- }
-}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-10 20:07:03 UTC (rev 33786)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-10 20:37:49 UTC (rev 33787)
@@ -16,6 +16,7 @@
import java.io.IOException;
import java.util.Collections;
import java.util.Comparator;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -42,6 +43,7 @@
import org.jboss.tools.cdi.core.CDICorePlugin;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.internal.core.impl.CDIElement;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
import org.jboss.tools.cdi.ui.CDIUiImages;
@@ -125,16 +127,15 @@
IProject project = projects[i];
progressMonitor.subTask(project.getName());
- ICDIProject cdiProject = CDICorePlugin.getCDIProject(project,
- true);
+ ICDIProject cdiProject = CDICorePlugin.getCDIProject(project, true);
if (cdiProject != null) {
Set<IBean> iter = cdiProject.getNamedBeans(false);
for (IBean bean: iter) {
- if (CDINamedBeanReferencedFilter
- .isBeanDeclaredInThisProject(bean))
+ if (bean instanceof CDIElement && cdiProject == ((CDIElement)bean).getDeclaringProject()) {
contentProvider.add(new CDINamedBeanWrapper(bean
.getName(), project.getName(), bean),
itemsFilter);
+ }
}
}
progressMonitor.worked(1);
14 years, 8 months
- 1
- 0
JBoss Tools SVN: r33786 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-08-10 16:07:03 -0400 (Wed, 10 Aug 2011)
New Revision: 33786
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
Log:
JBIDE-7892
Search for @Named beans.
Open CDI Named Bean Dialog is added
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java 2011-08-10 19:20:32 UTC (rev 33785)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java 2011-08-10 20:07:03 UTC (rev 33786)
@@ -74,29 +74,32 @@
ELResolution resolution = resolver.resolve(elContext, resolver.parseOperand("${" + bean.getName() + "}"), 0);
if (resolution.isResolved() && resolution.getNumberOfResolvedSegments() == 1) {
ELSegment segment = resolution.getLastSegment();
- if (segment != null && segment.isResolved()) {
+ if (segment.isResolved()) {
IOpenableReference[] openables = segment.getOpenable();
if(openables.length == 0 || !openables[0].open()) {
ITextSourceReference ref = segment.getSourceReference();
- if (ref.getResource() != null && ref.getResource() instanceof IFile) {
- IEditorPart part = null;
+ if (ref.getResource() instanceof IFile) {
try {
IWorkbenchPage page = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow().getActivePage();
- part = IDE.openEditor(page, (IFile)ref.getResource(), true);
+ IEditorPart part = IDE.openEditor(page, (IFile)ref.getResource(), true);
+ if (ref.getStartPosition() >=0 && ref.getLength() > 0) {
+ if (part instanceof JavaEditor) {
+ EditorUtility.revealInEditor(part,
+ ref.getStartPosition(), ref.getLength());
+ } else if (part != null) {
+ // We have not to pass null argument here, because the following call will
+ // perform select and reveal on active editor which is wrong in part == null
+ //
+ StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(
+ new Region(ref.getStartPosition(), ref.getLength()));
+ }
+ }
+
} catch (PartInitException pie) {
CDICorePlugin.getDefault().logError(pie);
}
- if (part != null && ref.getStartPosition() >=0 && ref.getLength() > 0) {
- if (part instanceof JavaEditor) {
- EditorUtility.revealInEditor(part,
- ref.getStartPosition(), ref.getLength());
- } else {
- StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(
- new Region(ref.getStartPosition(), ref.getLength()));
- }
- }
}
}
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-10 19:20:32 UTC (rev 33785)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-10 20:07:03 UTC (rev 33786)
@@ -348,7 +348,7 @@
if (cdiProject != null) {
Set<IBean> beans = cdiProject
.getBeans(beanName, true);
- if (beans != null && !beans.isEmpty())
+ if (!beans.isEmpty())
return beans.iterator().next();
}
}
14 years, 8 months
- 1
- 0