JBoss Tools SVN: r6272 - in trunk/jbpm/docs/reference/en/images: The_JBoss_jBPM_Int_Mech and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-02-12 12:09:45 -0500 (Tue, 12 Feb 2008)
New Revision: 6272
Modified:
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_1a.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2a.png
trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2b.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_1.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_3.png
trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_4.png
trunk/jbpm/docs/reference/en/images/the_views/the_views.png
trunk/jbpm/docs/reference/en/images/the_views/the_views1.png
trunk/jbpm/docs/reference/en/images/the_views/the_views10.png
trunk/jbpm/docs/reference/en/images/the_views/the_views2.png
trunk/jbpm/docs/reference/en/images/the_views/the_views3.png
trunk/jbpm/docs/reference/en/images/the_views/the_views4.png
trunk/jbpm/docs/reference/en/images/the_views/the_views5.png
trunk/jbpm/docs/reference/en/images/the_views/the_views7.png
trunk/jbpm/docs/reference/en/images/the_views/the_views8.png
trunk/jbpm/docs/reference/en/images/the_views/the_views9.png
Log:
http://jira.jboss.com/jira/browse/JBDS-155- screenshots are updated because of the wrong resolutions
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_1a.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2a.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/Test_Drive_Proc/test_driv_proc_2b.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_1.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_3.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/The_JBoss_jBPM_Int_Mech/jboss_jbpm_int_mech_4.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views1.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views10.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views2.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views3.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views4.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views5.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views7.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views8.png
===================================================================
(Binary files differ)
Modified: trunk/jbpm/docs/reference/en/images/the_views/the_views9.png
===================================================================
(Binary files differ)
16 years, 4 months
JBoss Tools SVN: r6271 - in trunk/seam/plugins/org.jboss.tools.seam.ui: icons and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-02-12 11:43:51 -0500 (Tue, 12 Feb 2008)
New Revision: 6271
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui/icons/open_seam_component.gif
Removed:
trunk/seam/plugins/org.jboss.tools.seam.ui/icons/open_seam_project.gif
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-518
Copied: trunk/seam/plugins/org.jboss.tools.seam.ui/icons/open_seam_component.gif (from rev 6259, trunk/seam/plugins/org.jboss.tools.seam.ui/icons/open_seam_project.gif)
===================================================================
(Binary files differ)
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui/icons/open_seam_component.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/seam/plugins/org.jboss.tools.seam.ui/icons/open_seam_project.gif
===================================================================
(Binary files differ)
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-02-12 15:40:59 UTC (rev 6270)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2008-02-12 16:43:51 UTC (rev 6271)
@@ -429,7 +429,7 @@
class="org.jboss.tools.seam.ui.actions.OpenSeamComponentAction"
definitionId="org.jboss.tools.seam.ui.open.component"
helpContextId="org.eclipse.jdt.ui.open_type_action"
- icon="icons/open_seam_project.gif"
+ icon="icons/open_seam_component.gif"
id="openComponent"
label="Open Seam Component"
menubarPath="navigate/open.ext2"
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-02-12 15:40:59 UTC (rev 6270)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2008-02-12 16:43:51 UTC (rev 6271)
@@ -199,6 +199,6 @@
OPEN_SEAM_COMPONENT_ACTION_ACTION_NAME=Open Seam Component
OPEN_SEAM_COMPONENT_ACTION_DESCRIPTION=Open Seam Component
OPEN_SEAM_COMPONENT_ACTION_TOOL_TIP=Open Seam Component
-OPEN_SEAM_COMPONENT_ACTION_MESSAGE=&Choose a name of the seam component (? = any character, * = any string):
+OPEN_SEAM_COMPONENT_ACTION_MESSAGE=&Choose a name of the seam component or pattern (? = any character, * = any string):
OPEN_SEAM_COMPONENT_DIALOG_LOADING=Seam components loading
OPEN_SEAM_COMPONENT_DIALOG_NAME=OpenSeamComponentDialog
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-02-12 15:40:59 UTC (rev 6270)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/OpenSeamComponentDialog.java 2008-02-12 16:43:51 UTC (rev 6271)
@@ -28,6 +28,7 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IMemento;
+import org.eclipse.ui.XMLMemento;
import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
@@ -45,15 +46,11 @@
public OpenSeamComponentDialog(Shell shell) {
super(shell);
+ setSelectionHistory(new SeamComponentSelectionHistory());
setListLabelProvider(new SeamComponentLabelProvider());
setDetailsLabelProvider(new SeamComponentLabelProvider());
- setSelectionHistory(new SeamComponentSelectionHistory());
}
- protected void computeResult() {
- super.computeResult();
- }
-
protected Control createExtendedContentArea(Composite parent) {
return null;
}
@@ -159,6 +156,8 @@
}
public boolean isOK() {
+ if(getSelectedItems().size() < 0) return false;
+
return true;
}
@@ -169,12 +168,32 @@
}
public class SeamComponentSelectionHistory extends SelectionHistory{
+ public SeamComponentSelectionHistory(){
+ super();
+ }
+
protected Object restoreItemFromMemento(IMemento memento) {
- return null;
+ System.out.println("restoreItemFromMemento memento - "+memento.getClass());
+ XMLMemento mem = (XMLMemento)memento;
+ String projectName = mem.getString("ProjectName");
+ if(projectName == null) return null;
+ String componentName = mem.getString("ComponentName");
+ if(componentName == null) return null;
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true);
+ ISeamComponent component = seamProject.getComponent(componentName);
+
+ return component;
}
@Override
protected void storeItemToMemento(Object item, IMemento memento) {
+
+ System.out.println("storeItemToMemento item - "+item.getClass()+" memento - "+memento.getClass());
+ SeamComponent component = (SeamComponent)item;
+ XMLMemento mem = (XMLMemento)memento;
+ mem.putString("ProjectName", component.getSeamProject().getProject().getName());
+ mem.putString("ComponentName", component.getName());
}
}
16 years, 4 months
JBoss Tools SVN: r6270 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1682.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-02-12 10:40:59 -0500 (Tue, 12 Feb 2008)
New Revision: 6270
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1682/JBIDE-1682-with-popup.xhtml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1682, junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1682/JBIDE-1682-with-popup.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1682/JBIDE-1682-with-popup.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
16 years, 4 months
JBoss Tools SVN: r6269 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects: JsfJbide1641Test and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-02-12 10:40:28 -0500 (Tue, 12 Feb 2008)
New Revision: 6269
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.classpath
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.project
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.classpath
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/.classpath
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/.project
Log:
fix exceptions during test:
1. Jboss as container was removed from class path
2. validation builder was removed from .project
3. java was changed to default one
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.classpath 2008-02-12 15:40:24 UTC (rev 6268)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.classpath 2008-02-12 15:40:28 UTC (rev 6269)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="JavaSource"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_07"/>
- <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
</classpath>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.project 2008-02-12 15:40:24 UTC (rev 6268)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1585Test/.project 2008-02-12 15:40:28 UTC (rev 6269)
@@ -1,36 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>JsfJbide1585Test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.jboss.tools.jsf.jsfnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JsfJbide1585Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.classpath 2008-02-12 15:40:24 UTC (rev 6268)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.classpath 2008-02-12 15:40:28 UTC (rev 6269)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="JavaSource"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_07"/>
- <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
</classpath>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project 2008-02-12 15:40:24 UTC (rev 6268)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1641Test/.project 2008-02-12 15:40:28 UTC (rev 6269)
@@ -1,36 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>JsfJbide1641Test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.jboss.tools.jsf.jsfnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JsfJbide1641Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath 2008-02-12 15:40:24 UTC (rev 6268)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.classpath 2008-02-12 15:40:28 UTC (rev 6269)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="JavaSource"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_07"/>
- <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
</classpath>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project 2008-02-12 15:40:24 UTC (rev 6268)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/.project 2008-02-12 15:40:28 UTC (rev 6269)
@@ -15,16 +15,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/.classpath 2008-02-12 15:40:24 UTC (rev 6268)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/.classpath 2008-02-12 15:40:28 UTC (rev 6269)
@@ -3,7 +3,6 @@
<classpathentry kind="src" path="JavaSource"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_07"/>
- <classpathentry kind="con" path="org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer/JBoss 4.2 Runtime"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
</classpath>
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/.project 2008-02-12 15:40:24 UTC (rev 6268)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Test/.project 2008-02-12 15:40:28 UTC (rev 6269)
@@ -1,36 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>StrutsJbide1648Test</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.jboss.tools.common.verification.verifybuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.jboss.tools.struts.strutsnature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>StrutsJbide1648Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ </natures>
+</projectDescription>
16 years, 4 months
JBoss Tools SVN: r6268 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-02-12 10:40:24 -0500 (Tue, 12 Feb 2008)
New Revision: 6268
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1682, junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java 2008-02-12 15:40:24 UTC (rev 6268)
@@ -0,0 +1,115 @@
+/**
+ *
+ */
+package org.jboss.tools.jsf.vpe.richfaces.test.jbide;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
+
+/**
+ * @author dmaliarevich
+ *
+ */
+public class Jbide1682Test extends VpeTest {
+ public static final String IMPORT_PROJECT_NAME = "richFacesTest";
+
+ public static final String TEST_PAGE_WITH_POPUP = "JBIDE/1682/JBIDE-1682-with-popup.xhtml";
+ public static final String TEST_PAGE_WITHOUT_POPUP = "JBIDE/1682/JBIDE-1682-without-popup.xhtml";
+
+ public Jbide1682Test(String name) {
+ super(name);
+ }
+
+ public void testJBIDE_1682_With_Popup() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(
+ TEST_PAGE_WITH_POPUP, IMPORT_PROJECT_NAME);
+
+ assertNotNull("Could not open specified file " + file.getFullPath(),
+ file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get dom document
+ nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMElement element = document.getDocumentElement();
+
+ //check that element is not null
+ assertNotNull(element);
+
+ // get root node
+ nsIDOMNode node = (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
+
+ // find "img" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_IMG);
+ assertEquals(1, elements.size());
+
+ // find "input" elements
+ elements.clear();
+ TestUtil.findElementsByName(node, elements, HTML.TAG_INPUT);
+ assertEquals(1, elements.size());
+
+ }
+
+ public void testJBIDE_1682_Without_Popup() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(
+ TEST_PAGE_WITHOUT_POPUP, IMPORT_PROJECT_NAME);
+
+ assertNotNull("Could not open specified file " + file.getFullPath(),
+ file);
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input);
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ // get dom document
+ nsIDOMDocument document = getVpeVisualDocument(part);
+ nsIDOMElement element = document.getDocumentElement();
+
+ //check that element is not null
+ assertNotNull(element);
+
+ // get root node
+ nsIDOMNode node = (nsIDOMNode) element
+ .queryInterface(nsIDOMNode.NS_IDOMNODE_IID);
+
+ List<nsIDOMNode> elements = new ArrayList<nsIDOMNode>();
+
+ // find "table" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_TABLE);
+ assertEquals(1, elements.size());
+
+ }
+
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/Jbide1682Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
16 years, 4 months
JBoss Tools SVN: r6267 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE: 1682 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-02-12 10:39:58 -0500 (Tue, 12 Feb 2008)
New Revision: 6267
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1682/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1682/JBIDE-1682-without-popup.xhtml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1682, junit tests
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1682/JBIDE-1682-without-popup.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1682/JBIDE-1682-without-popup.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
16 years, 4 months
JBoss Tools SVN: r6266 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-02-12 10:36:15 -0500 (Tue, 12 Feb 2008)
New Revision: 6266
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1682, junit tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-02-12 15:35:10 UTC (rev 6265)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-02-12 15:36:15 UTC (rev 6266)
@@ -20,6 +20,7 @@
import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1580Test;
import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1614Test;
import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1639Test;
+import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1682Test;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
import org.jboss.tools.vpe.ui.test.beans.ImportBean;
@@ -42,6 +43,7 @@
suite.addTestSuite(JBIDE1613Test.class);
suite.addTestSuite(Jbide1614Test.class);
suite.addTestSuite(Jbide1639Test.class);
+ suite.addTestSuite(Jbide1682Test.class);
// $JUnit-END$
16 years, 4 months
JBoss Tools SVN: r6265 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-02-12 10:35:10 -0500 (Tue, 12 Feb 2008)
New Revision: 6265
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1682, code style adjustment
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-02-12 15:31:13 UTC (rev 6264)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesCalendarTemplate.java 2008-02-12 15:35:10 UTC (rev 6265)
@@ -166,6 +166,9 @@
static Map<String, Integer> directions;
private boolean showPopupCalendar = false;
+ /**
+ * Instantiates a new rich faces calendar template.
+ */
public RichFacesCalendarTemplate() {
super();
directions = new HashMap<String, Integer>(4);
@@ -190,120 +193,117 @@
* @return The information on the created node of the visual tree.
*/
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
- nsIDOMDocument visualDocument) {
- Element source = (Element) sourceNode;
-
- readAttributes(sourceNode);
- initCalendar();
-
- ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "calendar");
- nsIDOMElement div = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_DIV);
- VpeCreationData creationData = new VpeCreationData(div);
- nsIDOMElement calendar;
- nsIDOMElement calendarWithPopup;
- if ("false".equalsIgnoreCase(popup)) {
- if ("true".equalsIgnoreCase(disabled)) {
- calendar = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_DIV);
- } else {
- calendar = createCalendar(visualDocument, creationData, source);
- }
- div.appendChild(calendar);
- } else {
- calendarWithPopup = createCalendarWithPopup(visualDocument, source);
- calendar = createCalendar(visualDocument, creationData, source);
-
-// calendar.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, calculateCalendarPositionStryle());
-
- if (showPopupCalendar) {
- if (attrPresents(direction) && directions.keySet().contains(direction)) {
- nsIDOMElement table = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
- nsIDOMElement top_tr = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TR);
- nsIDOMElement bottom_tr = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TR);
- nsIDOMElement top_left_td = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- nsIDOMElement top_right_td = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- nsIDOMElement bottom_left_td = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- nsIDOMElement bottom_right_td = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
-
- top_tr.appendChild(top_left_td);
- top_tr.appendChild(top_right_td);
- bottom_tr.appendChild(bottom_left_td);
- bottom_tr.appendChild(bottom_right_td);
- table.appendChild(top_tr);
- table.appendChild(bottom_tr);
- div.appendChild(table);
-
- top_left_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_TOP_LEFT);
- top_right_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_TOP_RIGHT);
- bottom_left_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_BOTTOM_LEFT);
- bottom_right_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_BOTTOM_RIGHT);
-
- switch (directions.get(direction)) {
- case DIRECTIONS_BOTTOM_RIGHT_INT:
- top_right_td.appendChild(calendarWithPopup);
- bottom_right_td.appendChild(calendar);
- break;
- case DIRECTIONS_BOTTOM_LEFT_INT:
- top_right_td.appendChild(calendarWithPopup);
- bottom_left_td.appendChild(calendar);
- break;
- case DIRECTIONS_TOP_RIGHT_INT:
- top_right_td.appendChild(calendar);
- top_right_td.appendChild(calendarWithPopup);
- break;
- case DIRECTIONS_TOP_LEFT_INT:
- top_right_td.appendChild(calendarWithPopup);
- top_left_td.appendChild(calendar);
- break;
- default:
- break;
- }
-
- } else {
- // no direction. simple display.
- //calendar.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, calculateCalendarPositionStryle());
- div.appendChild(calendarWithPopup);
- div.appendChild(calendar);
- }
-
- } else {
- // display input field with button
- div.appendChild(calendarWithPopup);
- // hide unparsed facets
- nsIDOMElement hiddenDiv = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_DIV);
- hiddenDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
- HtmlComponentUtil.HTML_ATR_WIDTH + " : " + CALENDAR_WIDTH
- + "px; overflow: hidden; display: none;");
-
- nsIDOMElement hiddenTable = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
-
- Element headerFacet = ComponentUtil.getFacet(source, HEADER);
- nsIDOMElement optionalHeader = null;
- if (null != headerFacet) {
- optionalHeader = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, headerFacet, true);
- hiddenTable.appendChild(optionalHeader);
- }
- Element footerFacet = ComponentUtil.getFacet(source, FOOTER);
- nsIDOMElement optionalFooter = null;
- if (null != footerFacet) {
- optionalFooter = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, footerFacet, false);
- hiddenTable.appendChild(optionalFooter);
- }
- hiddenDiv.appendChild(hiddenTable);
- }
-
- }
- return creationData;
+ nsIDOMDocument visualDocument) {
+ Element source = (Element) sourceNode;
+
+ readAttributes(sourceNode);
+ initCalendar();
+
+ ComponentUtil.setCSSLink(pageContext, STYLE_PATH, "calendar");
+ nsIDOMElement div = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ VpeCreationData creationData = new VpeCreationData(div);
+ nsIDOMElement calendar;
+ nsIDOMElement calendarWithPopup;
+ if ("false".equalsIgnoreCase(popup)) {
+ if ("true".equalsIgnoreCase(disabled)) {
+ calendar = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ } else {
+ calendar = createCalendar(visualDocument, creationData, source);
+ }
+ div.appendChild(calendar);
+ } else {
+ calendarWithPopup = createCalendarWithPopup(visualDocument, source);
+ calendar = createCalendar(visualDocument, creationData, source);
+
+ if (showPopupCalendar) {
+ if (attrPresents(direction) && directions.keySet().contains(direction)) {
+ nsIDOMElement table = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
+ nsIDOMElement top_tr = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+ nsIDOMElement bottom_tr = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+ nsIDOMElement top_left_td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement top_right_td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement bottom_left_td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ nsIDOMElement bottom_right_td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+
+ top_tr.appendChild(top_left_td);
+ top_tr.appendChild(top_right_td);
+ bottom_tr.appendChild(bottom_left_td);
+ bottom_tr.appendChild(bottom_right_td);
+ table.appendChild(top_tr);
+ table.appendChild(bottom_tr);
+ div.appendChild(table);
+
+ top_left_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_TOP_LEFT);
+ top_right_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_TOP_RIGHT);
+ bottom_left_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_BOTTOM_LEFT);
+ bottom_right_td.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, STYLE_BOTTOM_RIGHT);
+
+ switch (directions.get(direction)) {
+ case DIRECTIONS_BOTTOM_RIGHT_INT:
+ top_right_td.appendChild(calendarWithPopup);
+ bottom_right_td.appendChild(calendar);
+ break;
+ case DIRECTIONS_BOTTOM_LEFT_INT:
+ top_right_td.appendChild(calendarWithPopup);
+ bottom_left_td.appendChild(calendar);
+ break;
+ case DIRECTIONS_TOP_RIGHT_INT:
+ top_right_td.appendChild(calendar);
+ top_right_td.appendChild(calendarWithPopup);
+ break;
+ case DIRECTIONS_TOP_LEFT_INT:
+ top_right_td.appendChild(calendarWithPopup);
+ top_left_td.appendChild(calendar);
+ break;
+ default:
+ break;
+ }
+
+ } else {
+ // no direction. simple display.
+ div.appendChild(calendarWithPopup);
+ div.appendChild(calendar);
+ }
+
+ } else {
+ // display input field with button
+ div.appendChild(calendarWithPopup);
+ // hide unparsed facets
+ nsIDOMElement hiddenDiv = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ hiddenDiv.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
+ HtmlComponentUtil.HTML_ATR_WIDTH + " : " + CALENDAR_WIDTH
+ + "px; overflow: hidden; display: none;");
+
+ nsIDOMElement hiddenTable = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
+
+ Element headerFacet = ComponentUtil.getFacet(source, HEADER);
+ nsIDOMElement optionalHeader = null;
+ if (null != headerFacet) {
+ optionalHeader = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, headerFacet, true);
+ hiddenTable.appendChild(optionalHeader);
+ }
+ Element footerFacet = ComponentUtil.getFacet(source, FOOTER);
+ nsIDOMElement optionalFooter = null;
+ if (null != footerFacet) {
+ optionalFooter = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, footerFacet, false);
+ hiddenTable.appendChild(optionalFooter);
+ }
+ hiddenDiv.appendChild(hiddenTable);
+ }
+
+ }
+ return creationData;
}
/**
@@ -328,7 +328,6 @@
nsIDOMElement td2_1 = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TD);
-
table.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
HtmlComponentUtil.HTML_ATR_WIDTH + " : 100%");
@@ -425,12 +424,6 @@
public boolean isRecreateAtAttrChange(VpePageContext pageContext,
Element sourceElement, nsIDOMDocument visualDocument,
nsIDOMElement visualNode, Object data, String name, String value) {
-/*
- if (name.equalsIgnoreCase(POPUP)) {
- return true;
- }
- return false;
-*/
return true;
}
@@ -440,63 +433,73 @@
* @return Node of the visual tree.
*/
private nsIDOMElement createCalendar(nsIDOMDocument visualDocument, VpeCreationData creationData, Element sourceElement) {
- nsIDOMElement div = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_DIV);
- div.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
- HtmlComponentUtil.HTML_ATR_WIDTH + " : " + CALENDAR_WIDTH
- + "px; overflow: hidden;");
-
- nsIDOMElement table = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
- table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- CSS_R_C_EXTERIOR);
+ nsIDOMElement div = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_DIV);
+ div.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR,
+ HtmlComponentUtil.HTML_ATR_WIDTH + " : " + CALENDAR_WIDTH
+ + "px; overflow: hidden;");
- nsIDOMElement tbody = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TBODY);
- Element headerFacet = ComponentUtil.getFacet(sourceElement, HEADER);
- nsIDOMElement optionalHeader = null;
- if (null != headerFacet) {
- optionalHeader = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, headerFacet, true);
- }
- Element footerFacet = ComponentUtil.getFacet(sourceElement, FOOTER);
- nsIDOMElement optionalFooter = null;
- if (null != footerFacet) {
- optionalFooter = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, footerFacet, false);
- }
- nsIDOMElement header = null;
- nsIDOMElement calendarBody = createCalendarBody(visualDocument);
- nsIDOMElement footer = null;
-
- if (!"false".equals(showHeader)) {
- header = createCalendarHeader(visualDocument);
- }
- if (!"false".equals(showFooter)) {
- footer = createCalendarFooter(visualDocument);
- }
-
- if (null != optionalHeader) {
- tbody.appendChild(optionalHeader);
- }
- if (null != header) {
- tbody.appendChild(header);
- }
- tbody.appendChild(calendarBody);
- if (null != footer) {
- tbody.appendChild(footer);
- }
- if (null != optionalFooter) {
- tbody.appendChild(optionalFooter);
- }
+ nsIDOMElement table = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
+ table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
+ CSS_R_C_EXTERIOR);
- table.appendChild(tbody);
- div.appendChild(table);
+ nsIDOMElement tbody = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TBODY);
+ Element headerFacet = ComponentUtil.getFacet(sourceElement, HEADER);
+ nsIDOMElement optionalHeader = null;
+ if (null != headerFacet) {
+ optionalHeader = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, headerFacet, true);
+ }
+ Element footerFacet = ComponentUtil.getFacet(sourceElement, FOOTER);
+ nsIDOMElement optionalFooter = null;
+ if (null != footerFacet) {
+ optionalFooter = createCalendarOptionalHeaderOrFooter(visualDocument, creationData, footerFacet, false);
+ }
+ nsIDOMElement header = null;
+ nsIDOMElement calendarBody = createCalendarBody(visualDocument);
+ nsIDOMElement footer = null;
- return div;
+ if (!"false".equals(showHeader)) {
+ header = createCalendarHeader(visualDocument);
+ }
+ if (!"false".equals(showFooter)) {
+ footer = createCalendarFooter(visualDocument);
+ }
+
+ if (null != optionalHeader) {
+ tbody.appendChild(optionalHeader);
+ }
+ if (null != header) {
+ tbody.appendChild(header);
+ }
+ tbody.appendChild(calendarBody);
+ if (null != footer) {
+ tbody.appendChild(footer);
+ }
+ if (null != optionalFooter) {
+ tbody.appendChild(optionalFooter);
+ }
+
+ table.appendChild(tbody);
+ div.appendChild(table);
+
+ return div;
}
+ /**
+ * Creates the calendar optional header or footer.
+ *
+ * @param visualDocument the visual document
+ * @param creationData the creation data
+ * @param facetBody the facet body
+ * @param isHeader the is header
+ *
+ * @return the element
+ */
private nsIDOMElement createCalendarOptionalHeaderOrFooter(
nsIDOMDocument visualDocument, VpeCreationData creationData, Element facetBody, boolean isHeader) {
nsIDOMElement tr = visualDocument
@@ -524,85 +527,88 @@
* @return Node of the visual tree.
*/
private nsIDOMElement createCalendarHeader(nsIDOMDocument visualDocument) {
- nsIDOMElement tr = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TR);
- nsIDOMElement td = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, "" + COLUMN);
+ nsIDOMElement tr = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+ nsIDOMElement td = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, "" + COLUMN);
- String[] array;
- if ("false".equalsIgnoreCase(popup)) {
- array = HEADER_CONTENT;
- } else {
- array = HEADER_CONTENT_ON_POPUP;
- }
-
- SimpleDateFormat sdf = new SimpleDateFormat();
- Date date = getCalendarWithLocale().getTime();
- String dateStr = "";
- if (attrPresents(datePattern)) {
- try {
- sdf.applyPattern(datePattern);
- dateStr = sdf.format(date);
- } catch (Exception e) {
- sdf.applyPattern(DEFAULT_DATE_PATTERN);
- dateStr = sdf.format(date);
- }
- } else {
- sdf.applyPattern(DEFAULT_DATE_PATTERN);
- dateStr = sdf.format(date);
- }
- array[2] = dateStr;
+ String[] array;
+ if ("false".equalsIgnoreCase(popup)) {
+ array = HEADER_CONTENT;
+ } else {
+ array = HEADER_CONTENT_ON_POPUP;
+ }
- nsIDOMElement table = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
- table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, "0");
- table.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
+ SimpleDateFormat sdf = new SimpleDateFormat();
+ Date date = getCalendarWithLocale().getTime();
+ String dateStr = "";
+ if (attrPresents(datePattern)) {
+ try {
+ sdf.applyPattern(datePattern);
+ dateStr = sdf.format(date);
+ } catch (Exception e) {
+ sdf.applyPattern(DEFAULT_DATE_PATTERN);
+ dateStr = sdf.format(date);
+ }
+ } else {
+ sdf.applyPattern(DEFAULT_DATE_PATTERN);
+ dateStr = sdf.format(date);
+ }
+ array[2] = dateStr;
- nsIDOMElement tbody = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TBODY);
+ nsIDOMElement table = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TABLE);
+ table.setAttribute(HtmlComponentUtil.HTML_CELLPADDING_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_BORDER_ATTR, "0");
+ table.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
- nsIDOMElement tr1 = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TR);
- tr1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- CSS_R_C_HEADER);
-
- for (int i = 0; i < array.length; i++) {
- nsIDOMElement td1 = visualDocument
- .createElement(HtmlComponentUtil.HTML_TAG_TD);
- td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
- i == 2 ? CSS_R_C_MONTH : CSS_R_C_TOOL);
-
- // close tool
- if (i == 5) {
- td1.setAttribute(VPE_USER_TOGGLE_ID_ATTR, "0");
- td1.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "cursor: pointer;");
- }
+ nsIDOMElement tbody = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TBODY);
- nsIDOMText text1 = visualDocument.createTextNode(array[i]);
- td1.appendChild(text1);
- tr1.appendChild(td1);
- }
+ nsIDOMElement tr1 = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TR);
+ tr1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
+ CSS_R_C_HEADER);
- tbody.appendChild(tr1);
- table.appendChild(tbody);
- td.appendChild(table);
- tr.appendChild(td);
- return tr;
- }
+ for (int i = 0; i < array.length; i++) {
+ nsIDOMElement td1 = visualDocument
+ .createElement(HtmlComponentUtil.HTML_TAG_TD);
+ td1.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
+ i == 2 ? CSS_R_C_MONTH : CSS_R_C_TOOL);
+
+ // close tool
+ if (i == 5) {
+ td1.setAttribute(VPE_USER_TOGGLE_ID_ATTR, "0");
+ td1.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, "cursor: pointer;");
+ }
+
+ nsIDOMText text1 = visualDocument.createTextNode(array[i]);
+ td1.appendChild(text1);
+ tr1.appendChild(td1);
+ }
+
+ tbody.appendChild(tr1);
+ table.appendChild(tbody);
+ td.appendChild(table);
+ tr.appendChild(td);
+ return tr;
+ }
+ /**
+ * Creates the calendar footer.
+ *
+ * @param visualDocument the visual document
+ *
+ * @return the ns idom element
+ */
private nsIDOMElement createCalendarFooter(nsIDOMDocument visualDocument) {
- // Footer for calendar
-
nsIDOMElement tr = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TR);
-
nsIDOMElement td = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TD);
td.setAttribute(HtmlComponentUtil.HTML_TABLE_COLSPAN, "" + COLUMN);
-
nsIDOMElement table = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TABLE);
table.setAttribute(HtmlComponentUtil.HTML_CELLSPACING_ATTR, "0");
@@ -631,8 +637,6 @@
nsIDOMElement td2 = visualDocument
.createElement(HtmlComponentUtil.HTML_TAG_TD);
td2.setAttribute(HtmlComponentUtil.HTML_ATR_WIDTH, FILL_WIDTH);
-// td2.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR,
-// CSS_R_C_TOOLFOOTER);
tr1.appendChild(td2);
nsIDOMElement td3 = visualDocument
@@ -814,9 +818,10 @@
return tbody;
}
- /**
- *
- */
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#setAttribute(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMNode, java.lang.Object, java.lang.String, java.lang.String)
+ */
public void setAttribute(VpePageContext pageContext, Element sourceElement,
nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data,
String name, String value) {
@@ -837,8 +842,9 @@
}
- /**
- *
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.vpe.editor.template.VpeAbstractTemplate#removeAttribute(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Element, org.mozilla.interfaces.nsIDOMDocument, org.mozilla.interfaces.nsIDOMNode, java.lang.Object, java.lang.String)
*/
public void removeAttribute(VpePageContext pageContext,
Element sourceElement, nsIDOMDocument visualDocument,
@@ -859,6 +865,11 @@
}
}
+ /**
+ * Read attributes from the source element.
+ *
+ * @param sourceNode the source node
+ */
private void readAttributes(Node sourceNode) {
Element source = (Element) sourceNode;
buttonLabel = source.getAttribute(BUTTON_LABEL);
@@ -882,10 +893,21 @@
showFooter = source.getAttribute(SHOW_FOOTER);
}
+
+ /**
+ * Checks is attribute presents.
+ *
+ * @param attr the attribute
+ *
+ * @return true, if successful
+ */
private boolean attrPresents(String attr) {
return ((null != attr) && (!"".equals(attr)));
}
+ /**
+ * Inits the calendar.
+ */
private void initCalendar() {
Calendar cal = getCalendarWithLocale();
@@ -906,6 +928,12 @@
}
}
+
+ /**
+ * Gets the calendar with locale.
+ *
+ * @return the calendar with locale
+ */
private Calendar getCalendarWithLocale() {
Locale customLocale;
if (attrPresents(this.locale)) {
@@ -949,12 +977,4 @@
String toggleId) {
showPopupCalendar = !showPopupCalendar;
}
-
- private String calculateCalendarPositionStryle() {
- String position = "position: absolute; z-index: 10;";
- position += " top: " + verticalOffset + ";";
- position += " left: " + horizontalOffset + ";";
- return position;
- }
-
}
16 years, 4 months
JBoss Tools SVN: r6264 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/Test1-ejb/.settings and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-02-12 10:31:13 -0500 (Tue, 12 Feb 2008)
New Revision: 6264
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.jboss.tools.seam.core.prefs
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
Log:
JBIDE-1758
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-02-12 15:27:41 UTC (rev 6263)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/META-INF/MANIFEST.MF 2008-02-12 15:31:13 UTC (rev 6264)
@@ -24,5 +24,11 @@
org.eclipse.jface,
org.jboss.tools.jst.firstrun,
org.eclipse.wst.server.core,
- org.eclipse.datatools.connectivity
+ org.eclipse.datatools.connectivity,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.ltk.ui.refactoring,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.jface
Provide-Package: org.jboss.tools.seam.core.test
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.jboss.tools.seam.core.prefs
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.jboss.tools.seam.core.prefs (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/Test1-ejb/.settings/org.jboss.tools.seam.core.prefs 2008-02-12 15:31:13 UTC (rev 6264)
@@ -0,0 +1,3 @@
+#Tue Feb 12 16:24:00 MSK 2008
+eclipse.preferences.version=1
+seam.parent.project=Test1
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-02-12 15:27:41 UTC (rev 6263)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamEARTest.java 2008-02-12 15:31:13 UTC (rev 6264)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.seam.core.test;
+import java.lang.reflect.InvocationTargetException;
+
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
@@ -17,11 +19,16 @@
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.ui.refactoring.RenameSupport;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.test.util.JUnitUtils;
+import org.jboss.tools.test.util.WorkbenchUtils;
import org.jboss.tools.test.util.xpl.EditorTestHelper;
/**
@@ -33,7 +40,7 @@
IProject projectWAR = null;
IProject projectEJB = null;
- boolean makeCopy = false;
+ boolean makeCopy = true;
public SeamEARTest() {}
@@ -80,4 +87,27 @@
assertNotNull("War project must see component 'authenticator' declared in ejb project", c);
}
+
+ public void testRenameProject() throws CoreException {
+ getSeamProject(projectWAR);
+ ISeamProject seamProjectEJB = getSeamProject(projectEJB);
+
+ String parentName = seamProjectEJB.getParentProjectName();
+
+ RenameSupport support = RenameSupport.create(JavaCore.create(projectWAR), "newName", RenameSupport.UPDATE_REFERENCES);
+
+ Shell parent = WorkbenchUtils.getActiveShell();
+ IWorkbenchWindow context = WorkbenchUtils.getWorkbench().getActiveWorkbenchWindow();
+ try {
+ support.perform(parent, context);
+ } catch (InterruptedException e) {
+ JUnitUtils.fail("Rename failed", e);
+ } catch (InvocationTargetException e) {
+ JUnitUtils.fail("Rename failed", e);
+ }
+ String newParentName = seamProjectEJB.getParentProjectName();
+ System.out.println(parentName);
+ System.out.println(newParentName);
+ assertTrue("", "newName".equals(newParentName));
+ }
}
\ No newline at end of file
16 years, 4 months
JBoss Tools SVN: r6263 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-02-12 10:27:41 -0500 (Tue, 12 Feb 2008)
New Revision: 6263
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
Log:
code adjustment
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-02-12 15:26:24 UTC (rev 6262)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-02-12 15:27:41 UTC (rev 6263)
@@ -69,7 +69,7 @@
if ((refNode==null)||(refNode.equals(getReferenceNode()))) {
return;
}
- setReferenceNode(refNode);
+ referenceNode = refNode;
updateTagLibs();
}
16 years, 4 months