JBoss Tools SVN: r11281 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-29 08:54:18 -0400 (Wed, 29 Oct 2008)
New Revision: 11281
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
Log:
fix: menu disable with StructuredSelection
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-29 12:51:47 UTC (rev 11280)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/actions/JPAMapToolActor.java 2008-10-29 12:54:18 UTC (rev 11281)
@@ -24,6 +24,7 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragmentRoot;
+import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.core.dom.AST;
@@ -73,13 +74,6 @@
}
return actor;
}
-
- protected org.eclipse.jdt.core.dom.CompilationUnit getCompilationUnit(ICompilationUnit source) {
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(source);
- org.eclipse.jdt.core.dom.CompilationUnit result = (org.eclipse.jdt.core.dom.CompilationUnit) parser.createAST(null);
- return result;
- }
public void clearSelectionCU() {
selectionCU.clear();
@@ -87,6 +81,15 @@
public void addCompilationUnit(ICompilationUnit cu) {
if (cu != null) {
+ IType[] types = null;
+ try {
+ types = cu.getTypes();
+ } catch (JavaModelException e) {
+ // just ignore it
+ }
+ if (types != null) {
+
+ }
selectionCU.add(cu);
}
}
@@ -96,6 +99,12 @@
updateSelectedItems(selection);
selection = null;
}
+ else {
+ if (selectionCU.size() == 0) {
+ updateOpen();
+ return;
+ }
+ }
if (selectionCU.size() == 0) {
processor.modify(null, new HashMap<String, EntityInfo>(), true);
return;
@@ -155,7 +164,8 @@
synchronized public int getSelectedSourceSize() {
int res = 0;
if (selection == null) {
- res = selectionCU.size();
+ //res = selectionCU.size();
+ res = 1;
}
else if (selection instanceof TextSelection) {
res = 1;
@@ -316,12 +326,14 @@
}
synchronized public void setSelection(ISelection selection) {
- if ((selection instanceof StructuredSelection) && selection.isEmpty()) {
- // just miss this selection
+ //System.out.println("Blah! " + selection); //$NON-NLS-1$
+ if (selection instanceof StructuredSelection) {
+ //System.out.println("This! " + this.selection); //$NON-NLS-1$
+ clearSelectionCU();
+ this.selection = null;
return;
}
this.selection = selection;
- //System.out.println("Blah! " + selection); //$NON-NLS-1$
}
}
16 years, 2 months
JBoss Tools SVN: r11280 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-29 08:51:47 -0400 (Wed, 29 Oct 2008)
New Revision: 11280
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
Log:
fix: ignore EnumDeclaration & AnnotationTypeDeclaration
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2008-10-29 12:50:58 UTC (rev 11279)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2008-10-29 12:51:47 UTC (rev 11280)
@@ -17,6 +17,7 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.JPAConst;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.RefEntityInfo;
@@ -333,6 +334,16 @@
return;
}
org.eclipse.jdt.core.dom.CompilationUnit cu = Utils.getCompilationUnit(icu, true);
+ if (cu == null) {
+ return;
+ }
+ if (cu.types() != null && cu.types().size() > 0 ) {
+ Object tmp = cu.types().get(0);
+ if (!(tmp instanceof TypeDeclaration)) {
+ // ignore EnumDeclaration & AnnotationTypeDeclaration
+ return;
+ }
+ }
String fullyQualifiedName = cu.getTypeRoot().findPrimaryType().getFullyQualifiedName();
if (mapCUs_Info.containsKey(fullyQualifiedName)) {
return;
16 years, 2 months
JBoss Tools SVN: r11279 - branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-29 08:50:58 -0400 (Wed, 29 Oct 2008)
New Revision: 11279
Modified:
branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
Log:
fix: ignore EnumDeclaration & AnnotationTypeDeclaration
Modified: branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2008-10-29 12:12:15 UTC (rev 11278)
+++ branches/jbosstools-3.0.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/AllEntitiesInfoCollector.java 2008-10-29 12:50:58 UTC (rev 11279)
@@ -17,6 +17,7 @@
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.EntityInfo;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.JPAConst;
import org.hibernate.eclipse.jdt.ui.internal.jpa.common.RefEntityInfo;
@@ -333,6 +334,16 @@
return;
}
org.eclipse.jdt.core.dom.CompilationUnit cu = Utils.getCompilationUnit(icu, true);
+ if (cu == null) {
+ return;
+ }
+ if (cu.types() != null && cu.types().size() > 0 ) {
+ Object tmp = cu.types().get(0);
+ if (!(tmp instanceof TypeDeclaration)) {
+ // ignore EnumDeclaration & AnnotationTypeDeclaration
+ return;
+ }
+ }
String fullyQualifiedName = cu.getTypeRoot().findPrimaryType().getFullyQualifiedName();
if (mapCUs_Info.containsKey(fullyQualifiedName)) {
return;
16 years, 2 months
JBoss Tools SVN: r11278 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test: src/org/jboss/tools/jsf/vpe/ajax4jsf/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-10-29 08:12:15 -0400 (Wed, 29 Oct 2008)
New Revision: 11278
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/poll.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/push.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/region.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/region.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/repeat.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/repeat.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/support.xhtml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2985, JUnit tests for a4j components were added.
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml 2008-10-29 12:12:15 UTC (rev 11278)
@@ -0,0 +1,5 @@
+<tests>
+ <test id="page">
+
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/page.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/poll.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/poll.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml 2008-10-29 12:12:15 UTC (rev 11278)
@@ -0,0 +1,7 @@
+<tests>
+ <test id="portlet">
+ <SPAN STYLE="-moz-user-modify: read-only;">
+ <SPAN> ....</SPAN>
+ </SPAN>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/portlet.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/push.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/push.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/region.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/region.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/region.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/region.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/region.xhtml.xml 2008-10-29 12:12:15 UTC (rev 11278)
@@ -0,0 +1,5 @@
+<tests>
+ <test id="region">
+
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/region.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/repeat.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/repeat.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/repeat.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/repeat.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/repeat.xhtml.xml 2008-10-29 12:12:15 UTC (rev 11278)
@@ -0,0 +1,5 @@
+<tests>
+ <test id="repeat">
+
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/repeat.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml 2008-10-29 12:12:15 UTC (rev 11278)
@@ -0,0 +1,23 @@
+<tests>
+ <test id="status1">
+ <SPAN CLASS=";" STYLE="-moz-user-modify: read-only; cursor: pointer;">
+ Complete
+ <BR VPE:PSEUDO-ELEMENT="yes"
+ STYLE="font-style: italic; color: green; -moz-user-modify: read-only;" />
+ </SPAN>
+ </test>
+ <test id="status2">
+ <SPAN CLASS=";" STYLE="-moz-user-modify: read-only; cursor: pointer;">
+ <DIV>
+ <IMG HEIGHT="16"
+ SRC="/.*ve/unresolved_image.gif/"
+ STYLE="-moz-user-modify: read-write;"/>
+ </DIV>
+ <DIV>
+ <IMG
+ SRC="/.*ve/unresolved_image.gif/"
+ STYLE="-moz-user-modify: read-write;"/>
+ </DIV>
+ </SPAN>
+ </test>
+</tests>
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/status.xhtml.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:eol-style
+ native
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/support.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/resources/ajax4jsfTests/WebContent/pages/components/support.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2008-10-29 11:57:10 UTC (rev 11277)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/src/org/jboss/tools/jsf/vpe/ajax4jsf/test/Ajax4JsfComponentContentTest.java 2008-10-29 12:12:15 UTC (rev 11278)
@@ -68,39 +68,38 @@
}
public void testOutputPanel() throws Throwable {
- performContentTest("components/outputPanel.xhtml");//$NON-NLS-1$
}
- public void testPage() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ public void _testPage() throws Throwable {
+ performContentTest("components/page.xhtml");//$NON-NLS-1$
}
public void testPoll() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/poll.xhtml", "poll"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testPortlet() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/portlet.xhtml");//$NON-NLS-1$
}
public void testPush() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/push.xhtml", "push"); //$NON-NLS-1$ //$NON-NLS-2$
}
- public void testRegion() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ public void _testRegion() throws Throwable {
+ performContentTest("components/region.xhtml");//$NON-NLS-1$
}
public void testRepeat() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/repeat.xhtml", "repeat"); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testStatus() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performContentTest("components/status.xhtml");//$NON-NLS-1$
}
public void testSupport() throws Throwable {
- assertTrue("it is necessary to add a body of the test ", false);//$NON-NLS-1$
+ performInvisibleTagTest("components/support.xhtml", "support"); //$NON-NLS-1$ //$NON-NLS-2$
}
protected String getTestProjectName() {
16 years, 2 months
JBoss Tools SVN: r11277 - workspace/snjeza/seam-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-29 07:57:10 -0400 (Wed, 29 Oct 2008)
New Revision: 11277
Modified:
workspace/snjeza/seam-examples/dvdstore.zip
Log:
JBIDE-3031 Project examples (Seam Booking) don't start on server.
Modified: workspace/snjeza/seam-examples/dvdstore.zip
===================================================================
(Binary files differ)
16 years, 2 months
JBoss Tools SVN: r11276 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-10-29 07:56:36 -0400 (Wed, 29 Oct 2008)
New Revision: 11276
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
Log:
JBIDE-3030 fix
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-10-29 11:49:48 UTC (rev 11275)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ElService.java 2008-10-29 11:56:36 UTC (rev 11276)
@@ -141,6 +141,10 @@
*/
public boolean isCloneableNode(VpePageContext pageContext,Node sourceNode) {
boolean rst = false;
+ // fix for JBIDE-3030
+ if(pageContext.getVisualBuilder().getCurrentIncludeInfo()==null) {
+ return rst;
+ }
final IFile file = pageContext.getVisualBuilder().getCurrentIncludeInfo().getFile();
if (((this.isAvailable(file) && this.isAvailableForNode(sourceNode, file))) || isInResourcesBundle(pageContext, sourceNode)){
16 years, 2 months
JBoss Tools SVN: r11275 - trunk/as/docs/reference/en.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-10-29 07:49:48 -0400 (Wed, 29 Oct 2008)
New Revision: 11275
Modified:
trunk/as/docs/reference/en/master.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-463 - changing the URL for the DTD schema;
Modified: trunk/as/docs/reference/en/master.xml
===================================================================
--- trunk/as/docs/reference/en/master.xml 2008-10-29 11:24:07 UTC (rev 11274)
+++ trunk/as/docs/reference/en/master.xml 2008-10-29 11:49:48 UTC (rev 11275)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.docbook.org/xsd/4.3/docbook.xsd"
+"http://www.docbook.org/xml/4.3/docbookx.dtd"
[<!ENTITY quick_start SYSTEM "modules/quick_start.xml">
<!ENTITY runtimes_servers SYSTEM "modules/runtimes_servers.xml">
16 years, 2 months
JBoss Tools SVN: r11274 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-10-29 07:24:07 -0400 (Wed, 29 Oct 2008)
New Revision: 11274
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
Log:
junit for JBIDE-3030
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2008-10-29 11:11:17 UTC (rev 11273)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2008-10-29 11:24:07 UTC (rev 11274)
@@ -20,6 +20,8 @@
org.eclipse.jface.text,
org.jboss.tools.jsf.vpe.jsf,
org.jboss.tools.jst.web,
+ org.eclipse.core.filesystem,
+ org.eclipse.ui.ide,
org.jboss.tools.vpe.resref;bundle-version="2.0.0",
org.jboss.tools.common.el.ui;bundle-version="1.0.0",
org.jboss.tools.common.el.core;bundle-version="2.0.0"
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.html 2008-10-29 11:24:07 UTC (rev 11274)
@@ -0,0 +1,124 @@
+<html>
+<head>
+<title>
+html table
+</title>
+</head>
+<body>
+<table cellpadding="3" cellspacing="3" border="1">
+
+ <tr id="2row 1">
+ <td colspan="2" bgcolor="aqua" height="20">
+
+ </td>
+ <td bgcolor="yellow" width="70">
+ </td>
+ </tr>
+ <tr id="2row 2">
+ <td bgcolor="red">
+
+ </td>
+ <td bgcolor="green" height="50" width="200">
+
+ </td>
+ <td bgcolor="yellow" width="70">
+ </td>
+ </tr>
+
+ <tr id="2row 3">
+ <td colspan="2" bgcolor="aqua" height="20">
+
+ </td>
+ <td bgcolor="yellow" width="70">
+ </td>
+ </tr>
+
+ <tr id="2row 4">
+ <td bgcolor="orange" height="50" width="63">
+
+ </td>
+ <td bgcolor="blue" height="10" width="224">
+
+ </td>
+ <td bgcolor="yellow" width="70">
+ </td>
+ </tr>
+
+ <tr id="2row 5">
+ <td bgcolor="yellow" width="70">
+ </td>
+ <td colspan="2" bgcolor="aqua" height="20">
+
+ </td>
+ </tr>
+
+ </table>
+
+
+
+<table cellpadding="3" cellspacing="3" border="1">
+
+ <tr id="row 1">
+ <td bgcolor="yellow">
+ </td>
+ <td colspan="2" bgcolor="aqua" height="20">
+
+ </td>
+ <td bgcolor="yellow" width="70">
+ </td>
+ <td bgcolor="pink" width="70">
+ </td>
+ </tr>
+ <tr id="row 2">
+ <td bgcolor="red">
+
+ </td>
+ <td bgcolor="green" height="50" width="200">
+
+ </td>
+ <td bgcolor="pink" width="70">
+ </td>
+ <td bgcolor="pink" width="70">
+ </td>
+ </tr>
+
+ <tr id="row 3">
+ <td colspan="2" bgcolor="aqua" height="20">
+
+ </td>
+ <td bgcolor="yellow" width="70">
+ </td>
+ <td bgcolor="pink" width="70">
+ </td>
+ </tr>
+
+ <tr id="row 4">
+ <td bgcolor="yellow" width="70">
+ </td>
+ <td bgcolor="orange" height="50" width="63">
+
+ </td>
+ <td bgcolor="blue" height="10" width="224">
+
+ </td>
+ <td bgcolor="pink" width="70">
+ </td>
+ <td bgcolor="pink" width="70">
+ </td>
+ </tr>
+
+ <tr id="row 5">
+ <td bgcolor="yellow" width="70">
+ </td>
+ <td colspan="2" bgcolor="aqua" height="20">
+
+ </td>
+ <td bgcolor="yellow" width="70">
+ </td>
+ <td bgcolor="pink" width="70">
+ </td>
+ </tr>
+
+ </table>
+</body>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.jsp 2008-10-29 11:24:07 UTC (rev 11274)
@@ -0,0 +1,15 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:loadBundle basename="demo.resources" var="msg" />
+ <f:view>
+ <H1> JSP Test Page </H1>
+ <h:outputText value="#{msg.header}" />
+ </f:view>
+ </body>
+</html>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/JBIDE-3030/test.xhtml 2008-10-29 11:24:07 UTC (rev 11274)
@@ -0,0 +1,18 @@
+<!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">
+
+<f:loadBundle basename="demo.Messages" var="msg" />
+<head>
+<title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+</head>
+
+<body>
+ <!-- Comment Node -->
+ <h1>Text XHtml Page</h1>
+
+</body>
+
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-10-29 11:11:17 UTC (rev 11273)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-10-29 11:24:07 UTC (rev 11274)
@@ -39,6 +39,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2624Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2774Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2828Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3030Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
@@ -103,6 +104,7 @@
suite.addTestSuite(JsfComponentContentTest.class);
suite.addTestSuite(JBIDE2774Test.class);
suite.addTestSuite(JBIDE2828Test.class);
+ suite.addTestSuite(JBIDE3030Test.class);
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2008-10-29 11:24:07 UTC (rev 11274)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+* Copyright (c) 2007-2008 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
+*
+* Contributor:
+* Red Hat, Inc. - initial API and implementation
+******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileStore;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfTestPlugin;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+
+/**
+ * Test class for JBIDE-3030
+ *
+ * @author mareshkau
+ *
+ */
+public class JBIDE3030Test extends VpeTest {
+
+ private static Set<String> fileNames = new HashSet<String>();;
+
+ static {
+ String jbide3030Path= JsfTestPlugin.getPluginResourcePath()
+ +File.separator+"JBIDE-3030"+File.separator;//$NON-NLS-1$
+ fileNames.add(jbide3030Path+"test.jsp"); //$NON-NLS-1$
+ fileNames.add(jbide3030Path+"test.html"); //$NON-NLS-1$
+ fileNames.add(jbide3030Path+"test.xhtml"); //$NON-NLS-1$
+ }
+
+
+ public JBIDE3030Test(String name) {
+ super(name);
+ }
+
+ /**
+ *
+ * @throws Throwable
+ */
+ public void testJBIDE3030() throws Exception {
+
+ setException(null);
+
+ for (String fileName : fileNames) {
+
+ File file = new File(fileName);
+
+ assertTrue("File doesn't exists", file.isFile()); //$NON-NLS-1$
+
+ IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
+
+ IFileStore fileStore = EFS.getLocalFileSystem().getStore(file.toURI());
+
+ IEditorPart editorPart = IDE.openEditorOnFileStore(page, fileStore );
+
+ assertNotNull(editorPart);
+
+ assertTrue("Editor Part should be instance of JSPMultipageEditor", //$NON-NLS-1$
+ editorPart instanceof JSPMultiPageEditor);
+
+ page.closeAllEditors(false);
+
+ if(getException()!=null) {
+
+ throw new Exception(getException());
+ }
+ }
+ }
+
+}
16 years, 2 months
JBoss Tools SVN: r11273 - workspace/snjeza/seam-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-29 07:11:17 -0400 (Wed, 29 Oct 2008)
New Revision: 11273
Modified:
workspace/snjeza/seam-examples/booking.zip
Log:
JBIDE-3031 Project examples (Seam Booking) don't start on server.
Modified: workspace/snjeza/seam-examples/booking.zip
===================================================================
(Binary files differ)
16 years, 2 months
JBoss Tools SVN: r11272 - trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2008-10-29 07:07:40 -0400 (Wed, 29 Oct 2008)
New Revision: 11272
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/Foto.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/Person.java
Log:
JBIDE-3033 - change to Many2One as default annotation
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/Foto.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/Foto.java 2008-10-29 11:07:17 UTC (rev 11271)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/Foto.java 2008-10-29 11:07:40 UTC (rev 11272)
@@ -13,7 +13,7 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.OneToOne;
+import javax.persistence.ManyToOne;
@Entity
public class Foto {
@@ -23,7 +23,7 @@
@Id @GeneratedValue
protected Short id;
- @OneToOne(mappedBy="foto")
+ @ManyToOne
protected Person person;
protected Short width_IDtest;
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/Person.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/Person.java 2008-10-29 11:07:17 UTC (rev 11271)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/Person.java 2008-10-29 11:07:40 UTC (rev 11272)
@@ -15,8 +15,8 @@
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.OneToOne;
import javax.persistence.OneToMany;
+import javax.persistence.ManyToOne;
@Entity
public class Person {
@@ -27,7 +27,7 @@
@OneToMany(mappedBy="documentOwner")
protected Set<Document> documents;
- @OneToOne(mappedBy="person")
+ @ManyToOne
protected Foto foto;
protected Set someTestSet;
16 years, 2 months