JBoss Tools SVN: r5736 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE: 1613 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-01-16 06:53:16 -0500 (Wed, 16 Jan 2008)
New Revision: 5736
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1613/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1613/JBIDE-1613.xhtml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1613
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1613/JBIDE-1613.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/JBIDE/1613/JBIDE-1613.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
16 years, 8 months
JBoss Tools SVN: r5735 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-01-16 06:51:24 -0500 (Wed, 16 Jan 2008)
New Revision: 5735
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataListTemplate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1613
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-01-16 11:51:18 UTC (rev 5734)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/HtmlComponentUtil.java 2008-01-16 11:51:24 UTC (rev 5735)
@@ -74,6 +74,9 @@
/** HTML_TAG_B */
public static final String HTML_TAG_B = "B";
+
+ /** HTML_TAG_LI */
+ public static final String HTML_TAG_LI = "LI";
/** HTML_TABLE_COLSPAN * */
public static final String HTML_TABLE_COLSPAN = "colspan";
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataListTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataListTemplate.java 2008-01-16 11:51:18 UTC (rev 5734)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataListTemplate.java 2008-01-16 11:51:24 UTC (rev 5735)
@@ -28,6 +28,7 @@
public class RichFacesDataListTemplate extends VpeAbstractTemplate {
/** CSS_FILE_NAME */
final static private String CSS_FILE_NAME = "dataList/dataList.css";
+ final static private int NUMBER_OF_ROWS_TO_DISPLAY = 1;
public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
@@ -48,15 +49,10 @@
VpeCreationData creatorInfo = new VpeCreationData(unorderedList);
- int rows = -1;
- try {
- rows = Integer.valueOf(sourceElement.getAttribute(HtmlComponentUtil.HTML_ROW_ATTR));
- } catch (Exception x) {
- rows = -1;
- }
+ int rows = NUMBER_OF_ROWS_TO_DISPLAY;
- for (int i = 0; i < (rows == -1 ? 3 : rows); i++) {
- nsIDOMElement listItem = visualDocument.createElement("li");
+ for (int i = 0; i < rows; i++) {
+ nsIDOMElement listItem = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_LI);
listItem.setAttribute(HtmlComponentUtil.HTML_CLASS_ATTR, "dr-list-item rich-list-item");
unorderedList.appendChild(listItem);
16 years, 8 months
JBoss Tools SVN: r5734 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test: jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2008-01-16 06:51:18 -0500 (Wed, 16 Jan 2008)
New Revision: 5734
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java
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-1613
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-01-16 11:34:04 UTC (rev 5733)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/RichFacesAllTests.java 2008-01-16 11:51:18 UTC (rev 5734)
@@ -16,6 +16,7 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import org.jboss.tools.jsf.vpe.richfaces.test.jbide.JBIDE1579Test;
+import org.jboss.tools.jsf.vpe.richfaces.test.jbide.JBIDE1613Test;
import org.jboss.tools.jsf.vpe.richfaces.test.jbide.Jbide1580Test;
import org.jboss.tools.vpe.ui.test.VpeTestSetup;
import org.jboss.tools.vpe.ui.test.beans.ImportBean;
@@ -37,6 +38,8 @@
suite.addTestSuite(RichFacesComponentTest.class);
suite.addTestSuite(JBIDE1579Test.class);
suite.addTestSuite(Jbide1580Test.class);
+ suite.addTestSuite(JBIDE1613Test.class);
+
// $JUnit-END$
List<ImportBean> projectToImport = new ArrayList<ImportBean>();
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/src/org/jboss/tools/jsf/vpe/richfaces/test/jbide/JBIDE1613Test.java 2008-01-16 11:51:18 UTC (rev 5734)
@@ -0,0 +1,65 @@
+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;
+
+public class JBIDE1613Test extends VpeTest {
+
+ public static final String IMPORT_PROJECT_NAME = "richFacesTest";
+
+ private static final String TEST_PAGE_NAME = "JBIDE/1613/JBIDE-1613.xhtml";
+
+ public JBIDE1613Test(String name) {
+ super(name);
+ }
+
+ public void testJBIDE_1613() throws Throwable{
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath(
+ TEST_PAGE_NAME, 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 "li" elements
+ TestUtil.findElementsByName(node, elements, HTML.TAG_LI);
+ 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/JBIDE1613Test.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
16 years, 8 months
JBoss Tools SVN: r5733 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-01-16 06:34:04 -0500 (Wed, 16 Jan 2008)
New Revision: 5733
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
Log:
code adjusment
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-01-16 10:36:39 UTC (rev 5732)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/ComponentUtil.java 2008-01-16 11:34:04 UTC (rev 5733)
@@ -24,6 +24,7 @@
import org.mozilla.interfaces.nsIDOMElement;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsIDOMNodeList;
+import org.mozilla.xpcom.XPCOMException;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@@ -248,8 +249,13 @@
NamedNodeMap namedNodeMap = sourceNode.getAttributes();
for (int i = 0; i < namedNodeMap.getLength(); i++) {
Node attribute = namedNodeMap.item(i);
+ //added by Max Areshkau fix for JBIDE-1568
+ try {
visualElement.setAttribute(attribute.getNodeName(), attribute
.getNodeValue());
+ } catch(XPCOMException ex) {
+ //Just ignore this exception
+ }
}
}
16 years, 8 months
JBoss Tools SVN: r5732 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-01-16 05:36:39 -0500 (Wed, 16 Jan 2008)
New Revision: 5732
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagrammTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1571
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagrammTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagrammTest.java 2008-01-16 08:19:43 UTC (rev 5731)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagrammTest.java 2008-01-16 10:36:39 UTC (rev 5732)
@@ -10,15 +10,12 @@
******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
-import java.lang.reflect.Field;
-
import junit.framework.TestCase;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.internal.ErrorEditorPart;
+import org.hibernate.InvalidMappingException;
+import org.hibernate.MappingException;
import org.hibernate.cfg.Configuration;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
@@ -32,25 +29,37 @@
*
*/
public class OpenMappingDiagrammTest extends TestCase {
- public void testOpenMappingDiagramm() throws Throwable{
+ public void testOpenMappingDiagramm() {
KnownConfigurations knownConfigurations = KnownConfigurations.getInstance();
final ConsoleConfiguration consCFG = knownConfigurations.find(ProjectUtil.ConsoleCFGName);
assertNotNull(consCFG);
consCFG.reset();
- Object[] configs = new ConsoleConfigurationWorkbenchAdapter().getChildren(consCFG);
- assertTrue(configs[0] instanceof Configuration);
- Object[] persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]);
+ Object[] configs = null;
+ Object[] persClasses = null;
+ try {
+ configs = new ConsoleConfigurationWorkbenchAdapter().getChildren(consCFG);
+ assertTrue(configs[0] instanceof Configuration);
+ persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]);
+ } catch (InvalidMappingException ex){
+ fail("Mapping Diagramms for package " + HibernateAllMappingTests.getActivePackage().getElementName()
+ + " can't be opened:\n " + ex.getMessage());
+ }
+
if (persClasses.length > 0){
for (int i = 0; i < persClasses.length; i++) {
assertTrue(persClasses[0] instanceof PersistentClass);
PersistentClass persClass = (PersistentClass) persClasses[i];
+
+ IEditorPart editor = null;
+ Throwable ex = null;
try {
- IEditorPart editor = new OpenDiagramActionDelegate().openEditor(persClass, consCFG);
- ProjectUtil.throwExceptionIfItOccured(editor);
+ editor = new OpenDiagramActionDelegate().openEditor(persClass, consCFG);
} catch (PartInitException e) {
- fail("Error opening Mapping Diagramm for class " + persClass.getNodeName()
- + ".\n"+ e.getMessage());
- }
+ ex = e;
+ }
+ if (ex == null ) ex = ProjectUtil.getExceptionIfItOccured(editor);
+ if (ex != null) fail("Mapping Diagramm for " + persClass.getClassName()
+ + " not opened:\n" + ex.getMessage());
}
}
//close all editors
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2008-01-16 08:19:43 UTC (rev 5731)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2008-01-16 10:36:39 UTC (rev 5732)
@@ -10,16 +10,18 @@
******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
+import java.io.FileNotFoundException;
+
import junit.framework.TestCase;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
+import org.hibernate.InvalidMappingException;
import org.hibernate.cfg.Configuration;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
import org.hibernate.eclipse.console.actions.OpenMappingAction;
-import org.hibernate.eclipse.console.actions.OpenSourceAction;
import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapter;
import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter;
import org.hibernate.mapping.PersistentClass;
@@ -30,21 +32,39 @@
*/
public class OpenMappingFileTest extends TestCase {
- public void testOpenMappingFileTest() throws Throwable{
+ public void testOpenMappingFileTest() {
KnownConfigurations knownConfigurations = KnownConfigurations.getInstance();
final ConsoleConfiguration consCFG = knownConfigurations.find(ProjectUtil.ConsoleCFGName);
assertNotNull(consCFG);
consCFG.reset();
- Object[] configs = new ConsoleConfigurationWorkbenchAdapter().getChildren(consCFG);
- assertTrue(configs[0] instanceof Configuration);
- Object[] persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]);
+ Object[] configs = null;
+ Object[] persClasses = null;
+ try {
+ configs = new ConsoleConfigurationWorkbenchAdapter().getChildren(consCFG);
+ assertTrue(configs[0] instanceof Configuration);
+ persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]);
+ } catch (InvalidMappingException ex){
+ fail("Mapping Files for package " + HibernateAllMappingTests.getActivePackage().getElementName()
+ + " can't be opened:\n " + ex.getMessage());
+ }
if (persClasses.length > 0){
for (int i = 0; i < persClasses.length; i++) {
assertTrue(persClasses[0] instanceof PersistentClass);
PersistentClass persClass = (PersistentClass) persClasses[i];
- IEditorPart editor = OpenMappingAction.run(persClass, consCFG);
- if (editor == null) fail("Editor not opened.");
- ProjectUtil.throwExceptionIfItOccured(editor);
+ IEditorPart editor = null;
+ Throwable ex = null;
+ try {
+ editor = OpenMappingAction.run(persClass, consCFG);
+ } catch (PartInitException e) {
+ ex = e;
+ } catch (JavaModelException e) {
+ ex = e;
+ } catch (FileNotFoundException e) {
+ ex = e;
+ }
+ if (ex == null ) ex = ProjectUtil.getExceptionIfItOccured(editor);
+ if (ex != null) fail("Mapping file for " + persClass.getClassName()
+ + " not opened:\n" + ex.getMessage());
}
}
//close all editors
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2008-01-16 08:19:43 UTC (rev 5731)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenSourceFileTest.java 2008-01-16 10:36:39 UTC (rev 5732)
@@ -10,44 +10,63 @@
******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
+import java.io.FileNotFoundException;
+
+import junit.framework.TestCase;
+
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PartInitException;
+import org.hibernate.InvalidMappingException;
import org.hibernate.cfg.Configuration;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
-import org.hibernate.console.execution.ExecutionContext;
-import org.hibernate.eclipse.console.actions.OpenFileActionUtils;
import org.hibernate.eclipse.console.actions.OpenSourceAction;
import org.hibernate.eclipse.console.workbench.ConfigurationWorkbenchAdapter;
import org.hibernate.eclipse.console.workbench.ConsoleConfigurationWorkbenchAdapter;
import org.hibernate.mapping.PersistentClass;
-import junit.framework.TestCase;
-
/**
* @author Dmitry Geraskov
*
*/
public class OpenSourceFileTest extends TestCase {
- public void testOpenSourceFileTest() throws Throwable{
+ public void testOpenSourceFileTest() {
//fail("test fail");
KnownConfigurations knownConfigurations = KnownConfigurations.getInstance();
final ConsoleConfiguration consCFG = knownConfigurations.find(ProjectUtil.ConsoleCFGName);
assertNotNull(consCFG);
consCFG.reset();
- Object[] configs = new ConsoleConfigurationWorkbenchAdapter().getChildren(consCFG);
- assertTrue(configs[0] instanceof Configuration);
- Object[] persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]);
+ Object[] configs = null;
+ Object[] persClasses = null;
+ try {
+ configs = new ConsoleConfigurationWorkbenchAdapter().getChildren(consCFG);
+ assertTrue(configs[0] instanceof Configuration);
+ persClasses = new ConfigurationWorkbenchAdapter().getChildren(configs[0]);
+ } catch (InvalidMappingException ex){
+ fail("Source files for package " + HibernateAllMappingTests.getActivePackage().getElementName()
+ + " can't be opened:\n " + ex.getMessage());
+ }
if (persClasses.length > 0){
for (int i = 0; i < persClasses.length; i++) {
assertTrue(persClasses[0] instanceof PersistentClass);
PersistentClass persClass = (PersistentClass) persClasses[i];
- IEditorPart editor = new OpenSourceAction().run(persClass, MappingTestProject.getTestProject().getIJavaProject(),
- persClass.getClassName());
- if (editor == null) fail("Editor not opened.");
- ProjectUtil.throwExceptionIfItOccured(editor);
+ IEditorPart editor = null;
+ Throwable ex = null;
+ try {
+ editor = new OpenSourceAction().run(persClass, MappingTestProject.getTestProject().getIJavaProject(),
+ persClass.getClassName());
+ } catch (PartInitException e) {
+ ex = e;
+ } catch (JavaModelException e) {
+ ex = e;
+ } catch (FileNotFoundException e) {
+ ex = e;
+ }
+ if (ex == null ) ex = ProjectUtil.getExceptionIfItOccured(editor);
+ if (ex != null) fail("Source file for " + persClass.getClassName()
+ + " not opened:\n" + ex.getMessage());
}
}
//close all editors
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-01-16 08:19:43 UTC (rev 5731)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/ProjectUtil.java 2008-01-16 10:36:39 UTC (rev 5732)
@@ -119,9 +119,10 @@
* It gets occurred exception from the editor if it was and passes it up.
*
* @param editor
+ * @return
* @throws Throwable
*/
- public static void throwExceptionIfItOccured(IEditorPart editor) throws Throwable {
+ public static Throwable getExceptionIfItOccured(IEditorPart editor){
if (editor instanceof ErrorEditorPart){
Class<ErrorEditorPart> clazz = ErrorEditorPart.class;
Field field;
@@ -134,20 +135,21 @@
if (error instanceof IStatus) {
IStatus err_status = (IStatus) error;
if (err_status.getSeverity() == Status.ERROR){
- throw err_status.getException();
+ return err_status.getException();
}
}
// catch close means that exception occurred but we can't get it
} catch (SecurityException e) {
- throw new RuntimeException("Can't get exception from ErrorEditorPart. " + e.getMessage());
+ return new RuntimeException("Can't get exception from ErrorEditorPart. " + e.getMessage());
} catch (NoSuchFieldException e) {
- throw new RuntimeException("Can't get error field from ErrorEditorPart. " + e.getMessage());
+ return new RuntimeException("Can't get error field from ErrorEditorPart. " + e.getMessage());
} catch (IllegalArgumentException e) {
- throw new RuntimeException("Can't get error field from ErrorEditorPart. " + e.getMessage());
+ return new RuntimeException("Can't get error field from ErrorEditorPart. " + e.getMessage());
} catch (IllegalAccessException e) {
- throw new RuntimeException("Can't get error field from ErrorEditorPart. " + e.getMessage());
+ return new RuntimeException("Can't get error field from ErrorEditorPart. " + e.getMessage());
}
}
+ return null;
}
}
16 years, 8 months
JBoss Tools SVN: r5731 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-01-16 03:19:43 -0500 (Wed, 16 Jan 2008)
New Revision: 5731
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1502
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2008-01-15 20:25:42 UTC (rev 5730)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/DeleteConfigurationAction.java 2008-01-16 08:19:43 UTC (rev 5731)
@@ -24,12 +24,14 @@
import java.util.Iterator;
import java.util.List;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.StructuredViewer;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.actions.SelectionListenerAction;
import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.console.KnownConfigurations;
+import org.hibernate.eclipse.console.utils.ProjectUtils;
/**
* @author max
@@ -47,14 +49,23 @@
public void run() {
List selectedNonResources = getSelectedNonResources();
+ String question = "Do you wish to delete the selected console configuration";
+ String title = "Delete console configuration";
+ if (selectedNonResources.size() > 1){
+ question += "s";
+ title += "s";
+ }
+ question += "?";
- Iterator iter = selectedNonResources.iterator();
- while (iter.hasNext() ) {
- ConsoleConfiguration element = (ConsoleConfiguration) iter.next();
- KnownConfigurations.getInstance().removeConfiguration(element, false);
+ if( MessageDialog.openConfirm( null, title, question)) {
+ Iterator iter = selectedNonResources.iterator();
+ while (iter.hasNext() ) {
+ ConsoleConfiguration element = (ConsoleConfiguration) iter.next();
+ KnownConfigurations.getInstance().removeConfiguration(element, false);
+ }
+
+ part.refresh();
}
-
- part.refresh();
}
protected boolean updateSelection(IStructuredSelection selection) {
16 years, 8 months
JBoss Tools SVN: r5730 - in trunk/seam: plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-01-15 15:25:42 -0500 (Tue, 15 Jan 2008)
New Revision: 5730
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ELStringToken.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELStringTokenizer.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.xhtml
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1631
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ELStringToken.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ELStringToken.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/ELStringToken.java 2008-01-15 20:25:42 UTC (rev 5730)
@@ -0,0 +1,123 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.internal.core.el;
+
+import org.eclipse.jface.text.rules.IToken;
+
+/**
+ * Token of the string with EL expression.
+ * @author Alexey Kazakov
+ */
+public class ELStringToken implements IToken {
+ public static final ELStringToken EOF = new ELStringToken(-1, -1, null);
+
+ private int start;
+ private int length;
+ private CharSequence chars;
+ private String body;
+
+ /**
+ * Constructs the ELStringToken object
+ *
+ * @param start
+ * @param length
+ * @param chars
+ */
+ public ELStringToken(int start, int length, CharSequence chars) {
+ this.start = start;
+ this.length = length;
+ this.chars = chars;
+ }
+
+ /**
+ * Returns string representation for the token
+ */
+ public String toString() {
+ return "ELStringToken(" + start + ", " + length + ") [" + (chars == null ? "<Empty>" : chars.toString()) + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
+ }
+
+ /*
+ * @see org.eclipse.jface.text.rules.IToken#getData()
+ */
+ public Object getData() {
+// return (chars == null ? null : chars.subSequence(start, start+length).toString());
+ return getText();
+ }
+
+ /**
+ * @return offset of token
+ */
+ public int getStart() {
+ return start;
+ }
+
+ /**
+ * @param start
+ */
+ public void setStart(int start) {
+ this.start = start;
+ }
+
+ /**
+ * @return length of token
+ */
+ public int getLength() {
+ return length;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.rules.IToken#isEOF()
+ */
+ public boolean isEOF() {
+ return (start == -1 && length == -1 && chars == null);
+ }
+
+ /*
+ * @see org.eclipse.jface.text.rules.IToken#isOther()
+ */
+ public boolean isOther() {
+ return false;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.rules.IToken#isUndefined()
+ */
+ public boolean isUndefined() {
+ return false;
+ }
+
+ /*
+ * @see org.eclipse.jface.text.rules.IToken#isWhitespace()
+ */
+ public boolean isWhitespace() {
+ return false;
+ }
+
+ /*
+ * Returns the token text
+ */
+ public String getText() {
+ return chars.toString();
+ }
+
+ /*
+ * Returns text of EL without brackets
+ */
+ public String getBody() {
+ if(chars.length()<4) {
+ return "";
+ }
+ if(body==null) {
+ body = chars.subSequence(2, chars.length()-1).toString();
+ }
+ return body;
+ }
+}
\ No newline at end of file
Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELStringTokenizer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELStringTokenizer.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELStringTokenizer.java 2008-01-15 20:25:42 UTC (rev 5730)
@@ -0,0 +1,152 @@
+ /*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.internal.core.el;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.seam.core.SeamCorePlugin;
+
+/**
+ * Parses string and creates list of tokens for each EL of this string.
+ * @author Alexey Kazakov
+ */
+public class SeamELStringTokenizer {
+
+ private String sourceString;
+ private List<ELStringToken> fTokens;
+ private int index;
+ private int offset = 0;
+
+ private static final int START_EL_FIRST_SYMBOL = '#';
+ private static final int START_EL_LAST_SYMBOL = '{';
+ private static final int END_EL_SYMBOL = '}';
+
+ /**
+ * Constructs SeamELStringTokenizer object.
+ * Parse string and get all EL from it.
+ * For example: string is '#{var1.pr != var2.pr} #{f1.pr1}'
+ * then tokens are ["#{var1.pr != var2.pr}","#{f1.pr1}"]
+ * @param sourceString
+ */
+ public SeamELStringTokenizer(String sourceString) {
+ this(sourceString, 0);
+ }
+
+ private SeamELStringTokenizer(String sourceString, int offset) {
+ this.offset = offset;
+ this.sourceString = sourceString;
+ index = 0;
+ fTokens = new ArrayList<ELStringToken>();
+ parse();
+ }
+
+ /**
+ * Returns list of tokens for the parsed string
+ *
+ * @return
+ */
+ public List<ELStringToken> getTokens() {
+ return fTokens;
+ }
+
+ /*
+ * Performs parsing of string
+ */
+ private void parse() {
+ ELStringToken token;
+ while ((token = getNextToken()) != ELStringToken.EOF) {
+ fTokens.add(token);
+ }
+ }
+
+ /*
+ * Calculates and returns next token of string
+ *
+ * @return
+ */
+ private ELStringToken getNextToken() {
+ int ch = readNextChar();
+ while(ch!=-1) {
+ int secondCh = readNextChar();
+ if (secondCh == -1) {
+ return ELStringToken.EOF;
+ }
+ releaseChar();
+
+ if(ch == START_EL_FIRST_SYMBOL && secondCh == START_EL_LAST_SYMBOL) {
+ releaseChar();
+ return readELToken();
+ }
+ ch = readNextChar();
+ }
+ return ELStringToken.EOF;
+ }
+
+ /*
+ * Returns the CharSequence object
+ *
+ * @param start
+ * @param length
+ * @return
+ */
+ private CharSequence getCharSequence(int start, int length) {
+ String text = ""; //$NON-NLS-1$
+ try {
+ text = sourceString.substring(start, start + length);
+ } catch (StringIndexOutOfBoundsException e) {
+ SeamCorePlugin.getDefault().logError(e);
+ }
+ return text.subSequence(0, text.length());
+ }
+ /*
+ * Reads and returns the string token from the expression
+ * @return
+ */
+ private ELStringToken readELToken() {
+ int startOfToken = index;
+ readNextChar();
+ readNextChar();
+ int ch;
+ while((ch = readNextChar()) != -1) {
+ if (ch==END_EL_SYMBOL) {
+ int length = index - startOfToken;
+ return new ELStringToken(offset + startOfToken, length, getCharSequence(startOfToken, length));
+ }
+ }
+ return ELStringToken.EOF;
+ }
+
+ /* Reads the next character
+ * @return
+ */
+ private int readNextChar() {
+ int c = -1;
+ try {
+ if (index < sourceString.length()) {
+ c = sourceString.charAt(index);
+ }
+ } catch (StringIndexOutOfBoundsException e) {
+ SeamCorePlugin.getPluginLog().logError(e);
+ }
+ index++;
+ return c;
+ }
+
+ /*
+ * returns the character to the document
+ */
+ private void releaseChar() {
+ if (index > 0) {
+ index--;
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java 2008-01-15 20:13:04 UTC (rev 5729)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/el/SeamELTokenizer.java 2008-01-15 20:25:42 UTC (rev 5730)
@@ -16,8 +16,7 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
/**
- * EL string parser.
- * Creates list of tokens for the operands and operators
+ * Parses EL and creates list of tokens for the operands and operators within one EL.
* @author Alexey Kazakov
*/
public class SeamELTokenizer {
@@ -44,10 +43,9 @@
/**
* Constructs SeamELTokenizer object.
- * Constructs SeamELTokenizer object
* Parse an expression.
* For example: expression is '#{var1.pr != var2.pr}'
- * then tokens are {"var1.pr"," ", "!=", " ", "var2",}
+ * then tokens are ["var1.pr"," ", "!=", " ", "var2.pr"]
* @param expression
*/
public SeamELTokenizer(String expression) {
@@ -63,7 +61,7 @@
}
/**
- * Returns list of tokens for the expression parsed
+ * Returns list of tokens for the parsed expression
*
* @return
*/
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2008-01-15 20:13:04 UTC (rev 5729)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamELValidator.java 2008-01-15 20:25:42 UTC (rev 5730)
@@ -11,7 +11,6 @@
package org.jboss.tools.seam.internal.core.validation;
import java.io.IOException;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -46,8 +45,10 @@
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamPreferences;
import org.jboss.tools.seam.internal.core.el.ELOperandToken;
+import org.jboss.tools.seam.internal.core.el.ELStringToken;
import org.jboss.tools.seam.internal.core.el.ELToken;
import org.jboss.tools.seam.internal.core.el.SeamELCompletionEngine;
+import org.jboss.tools.seam.internal.core.el.SeamELStringTokenizer;
import org.jboss.tools.seam.internal.core.el.SeamELTokenizer;
import org.jboss.tools.seam.internal.core.el.TypeInfoCollector;
@@ -217,41 +218,27 @@
* @param length - length of string in file
*/
private void validateString(IFile file, String string, int offset) {
- Set<EL> els = new HashSet<EL>();
- String localString = string;
- while(!reporter.isCancelled()) {
- int startEl = localString.indexOf("#{"); //$NON-NLS-1$
- int endEl = -1;
-// if(startEl==-1) {
-// startEl = localString.indexOf("${");
-// }
- if(startEl>-1) {
- endEl = localString.lastIndexOf('}');
- if(endEl>-1) {
- String value = localString.substring(startEl+2, endEl);
- int os = offset + startEl + 2;
- int ln = value.length();
- els.add(new EL(value, ln, os));
- localString = localString.substring(endEl);
- offset = offset + endEl;
- continue;
+ int startEl = string.indexOf("#{"); //$NON-NLS-1$
+ if(startEl>-1) {
+ SeamELStringTokenizer st = new SeamELStringTokenizer(string);
+ List<ELStringToken> tokens = st.getTokens();
+ for (ELStringToken stringToken : tokens) {
+ if(reporter.isCancelled()) {
+ return;
}
+ stringToken.setStart(offset + stringToken.getStart() + 2);
+ validateEl(file, stringToken);
}
- break;
}
-
- for(EL el: els) {
- validateEl(file, el);
- }
}
- private void validateEl(IFile file, EL el) {
- String exp = el.value;
+ private void validateEl(IFile file, ELStringToken el) {
+ String exp = el.getBody();
SeamELTokenizer elTokenizer = new SeamELTokenizer(exp);
List<ELToken> tokens = elTokenizer.getTokens();
for (ELToken token : tokens) {
if(token.getType()==ELToken.EL_VARIABLE_TOKEN) {
- validateElOperand(file, token, el.getOffset());
+ validateElOperand(file, token, el.getStart());
}
}
}
@@ -329,40 +316,4 @@
addError(UNKNOWN_EL_VARIABLE_PROPERTY_NAME_MESSAGE_ID, SeamPreferences.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new String[]{varName}, lengthOfVarName, offsetOfVarName, file);
}
}
-
- public static class EL {
- private String value;
- private int length;
- private int offset;
-
- public EL(String value, int length, int offset) {
- this.value = value;
- this.length = length;
- this.offset = offset;
- }
-
- public String getValue() {
- return value;
- }
-
- public void setValue(String value) {
- this.value = value;
- }
-
- public int getLength() {
- return length;
- }
-
- public void setLength(int length) {
- this.length = length;
- }
-
- public int getOffset() {
- return offset;
- }
-
- public void setOffset(int offset) {
- this.offset = offset;
- }
- }
}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.xhtml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.xhtml (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/JBIDE-1631.xhtml 2008-01-15 20:25:42 UTC (rev 5730)
@@ -0,0 +1,32 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.ajax4jsf.org/rich"
+ template="layout/template.xhtml">
+
+<ui:define name="body">
+
+ <h:messages globalOnly="true" styleClass="message"/>
+
+ <rich:panel>
+ #{authenticator.foo1} #{authenticator.foo2}
+ <f:facet name="header">Welcome!</f:facet>
+ <p>This empty shell application includes:</p>
+ <ul>
+ <li>Ant build script</li>
+ <li>Deployment to JBoss AS</li>
+ <li>Integration testing using TestNG and JBoss Embeddable EJB3</li>
+ <li>EJB 3.0 Seam components</li>
+ <li>Templated Facelets views</li>
+ <li>HSQL (or MySQL) Datasource</li>
+ <li>Default CSS stylesheet</li>
+ <li>Internationalization support</li>
+ </ul>
+ </rich:panel>
+
+</ui:define>
+</ui:composition>
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-01-15 20:13:04 UTC (rev 5729)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2008-01-15 20:25:42 UTC (rev 5730)
@@ -824,22 +824,29 @@
JUnitUtils.fail("Error in changing 'abcComponent.java' content to " +
"'abcComponent.3'", ex);
}
-
+
refreshProject(project);
-
+
number = getMarkersNumber(abcComponentXHTMLFile);
assertFalse("Problem marker 'Unpaired Getter/Setter' not found' not found' not found' not found", number == 0);
messages = getMarkersMessage(abcComponentXHTMLFile);
assertTrue("Problem marker 'Unpaired Getter/Setter' not found", "Property \"actionType\" has only Getter. Setter is missing.".equals(messages[0]));
-
+
lineNumbers = getMarkersNumbersOfLine(abcComponentXHTMLFile);
-
+
assertTrue("Problem marker has wrong line number", lineNumbers[0] == 22);
+ // Test for http://jira.jboss.com/jira/browse/JBIDE-1631
+ IFile jbide1631XHTMLFile = project.getFile("WebContent/JBIDE-1631.xhtml");
+ lineNumbers = getMarkersNumbersOfLine(jbide1631XHTMLFile);
+ String errorMessage = "Seam tools doesn't validate string with a few EL properly. There should be two markers in string '#{authenticator.foo1} #{authenticator.foo2}'.";
+ assertTrue(errorMessage, lineNumbers.length>1);
+ assertTrue(errorMessage, lineNumbers[0] == 16);
+ assertTrue(errorMessage, lineNumbers[1] == 16);
}
-
+
private void modifyPreferences(){
IPreferenceStore store = SeamCorePlugin.getDefault().getPreferenceStore();
store.putValue(SeamPreferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferences.ERROR);
16 years, 8 months
JBoss Tools SVN: r5729 - in trunk/core/plugins: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-01-15 15:13:04 -0500 (Tue, 15 Jan 2008)
New Revision: 5729
Removed:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/GenerateArchivesTask.java
trunk/core/plugins/org.jboss.ide.eclipse.jdt.test.core/
trunk/core/plugins/org.jboss.ide.eclipse.jdt.test.ui/
Log:
stuff already moved to legacy
Deleted: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/GenerateArchivesTask.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/GenerateArchivesTask.java 2008-01-15 19:18:51 UTC (rev 5728)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/GenerateArchivesTask.java 2008-01-15 20:13:04 UTC (rev 5729)
@@ -1,56 +0,0 @@
-package org.jboss.ide.eclipse.archives.core.ant;
-
-import java.util.Iterator;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.jboss.ide.eclipse.archives.core.ArchivesCore;
-import org.jboss.ide.eclipse.archives.core.StandaloneArchivesCore;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
-import org.jboss.ide.eclipse.archives.core.model.ArchivesModelCore;
-import org.jboss.ide.eclipse.archives.core.model.internal.xb.XMLBinding;
-
-public class GenerateArchivesTask extends Task {
-
- private String projectPath;
-
- public void init() throws BuildException {
- // Force standalone mode
- ArchivesCore standalone = new StandaloneArchivesCore();
- }
-
- public void execute() throws BuildException {
- IPath projectPath = new Path(this.projectPath);
- IProgressMonitor monitor = new NullProgressMonitor();
-
- for (Iterator iter = getProject().getProperties().keySet().iterator(); iter.hasNext(); )
- {
- String property = (String) iter.next();
- if (property.endsWith(".dir")) {
- System.setProperty(property, getProject().getProperty(property));
- }
- }
-
- // needed so the correct XML binding / TrueZIP jars are loaded
- ClassLoader original = Thread.currentThread().getContextClassLoader();
- ClassLoader myCL = getClass().getClassLoader();
- Thread.currentThread().setContextClassLoader(myCL);
-
- ArchivesModel.instance().registerProject(projectPath, monitor);
- ArchivesModelCore.buildProject(projectPath, monitor);
-
- Thread.currentThread().setContextClassLoader(original);
- }
-
- public String getProjectPath() {
- return projectPath;
- }
-
- public void setProjectPath(String projectPath) {
- this.projectPath = projectPath;
- }
-}
16 years, 8 months
JBoss Tools SVN: r5728 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format.
by jbosstools-commits＠lists.jboss.org
Author: dsakovich
Date: 2008-01-15 14:18:51 -0500 (Tue, 15 Jan 2008)
New Revision: 5728
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1359
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2008-01-15 19:06:54 UTC (rev 5727)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2008-01-15 19:18:51 UTC (rev 5728)
@@ -7,7 +7,7 @@
*
* Contributors:
* Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.tools.vpe.editor.toolbar.format;
import java.util.HashMap;
@@ -24,88 +24,103 @@
*/
public class BlockFormatController extends ComboFormatController {
- public static String TYPE = "BlockFormat";
- public static HashMap TAGS = new HashMap();
- static {
- TAGS.put("address", "Address");
- TAGS.put("h1", "Heading 1");
- TAGS.put("h2", "Heading 2");
- TAGS.put("h3", "Heading 3");
- TAGS.put("h4", "Heading 4");
- TAGS.put("h5", "Heading 5");
- TAGS.put("h6", "Heading 6");
- }
- public static HashMap TEXTS = new HashMap();
- static {
- TEXTS.put("Address", "address");
- TEXTS.put("Heading 1", "h1");
- TEXTS.put("Heading 2", "h2");
- TEXTS.put("Heading 3", "h3");
- TEXTS.put("Heading 4", "h4");
- TEXTS.put("Heading 5", "h5");
- TEXTS.put("Heading 6", "h6");
- }
+ public static String TYPE = "BlockFormat";
+ public static HashMap TAGS = new HashMap();
+ static {
+ TAGS.put("address", "Address");
+ TAGS.put("h1", "Heading 1");
+ TAGS.put("h2", "Heading 2");
+ TAGS.put("h3", "Heading 3");
+ TAGS.put("h4", "Heading 4");
+ TAGS.put("h5", "Heading 5");
+ TAGS.put("h6", "Heading 6");
+ }
+ public static HashMap TEXTS = new HashMap();
+ static {
+ TEXTS.put("Address", "address");
+ TEXTS.put("Heading 1", "h1");
+ TEXTS.put("Heading 2", "h2");
+ TEXTS.put("Heading 3", "h3");
+ TEXTS.put("Heading 4", "h4");
+ TEXTS.put("Heading 5", "h5");
+ TEXTS.put("Heading 6", "h6");
+ }
- private String tagName;
+ private String tagName;
- /**
- * @param manager
- * @param comboBlockFormat
- */
- public BlockFormatController(FormatControllerManager manager, Combo comboBlockFormat) {
- super(manager, comboBlockFormat);
- }
+ /**
+ * @param manager
+ * @param comboBlockFormat
+ */
+ public BlockFormatController(FormatControllerManager manager,
+ Combo comboBlockFormat) {
+ super(manager, comboBlockFormat);
+ }
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.editor.toolbar.format.IFormatController#getType()
- */
- public String getType() {
- return TYPE;
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.tools.vpe.editor.toolbar.format.IFormatController#getType()
+ */
+ public String getType() {
+ return TYPE;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
+ */
+ public void handleEvent(Event event) {
+ selectionIndex = comboBlockFormat.getSelectionIndex();
+ selectionText = comboBlockFormat.getText();
+ tagName = (String) TEXTS.get(selectionText);
+ if (tagName == null) {
+ tagName = "normal";
}
+ super.handleEvent(event);
+ }
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
- public void handleEvent(Event event) {
- selectionIndex = comboBlockFormat.getSelectionIndex();
- selectionText = comboBlockFormat.getText();
- tagName = (String)TEXTS.get(selectionText);
- if(tagName == null) {
- tagName = "normal";
- }
- super.handleEvent(event);
+ protected void setStyle(Attr styleAttribute,
+ FormatAttributeData templateData) {
}
- protected void setStyle(Attr styleAttribute, FormatAttributeData templateData) {
- }
+ /**
+ * @return Returns the tagName.
+ */
+ public String getTagName() {
+ return tagName;
+ }
- /**
- * @return Returns the tagName.
- */
- public String getTagName() {
- return tagName;
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.tools.vpe.editor.toolbar.format.IFormatController#setToolbarItemEnabled(boolean
+ * enabled)
+ */
+ public void setToolbarItemEnabled(boolean enabled) {
+ comboBlockFormat.setEnabled(enabled);
+ if (enabled) {
- /* (non-Javadoc)
- * @see org.jboss.tools.vpe.editor.toolbar.format.IFormatController#setToolbarItemEnabled(boolean enabled)
- */
- public void setToolbarItemEnabled(boolean enabled) {
- comboBlockFormat.setEnabled(enabled);
- if(enabled) {
- Node selectedNode = manager.getCurrentSelectedNode();
- String nodeName = selectedNode.getNodeName().toLowerCase();
- String text = (String)TAGS.get(nodeName);
- if(text!=null && text.equals(getComboBlockFormat().getText())) {
- return;
- }
- String[] items = this.getComboBlockFormat().getItems();
- for (int i = 0; i < items.length; i++) {
- if(items[i].equalsIgnoreCase(text)) {
- this.getComboBlockFormat().select(i);
- return;
- }
- }
+ Node selectedNode = manager.getCurrentSelectedNode();
+ String nodeName = selectedNode.getParentNode().getNodeName()
+ .toLowerCase();
+ String text = (String) TAGS.get(nodeName);
+ if (text == null) {
+ this.getComboBlockFormat().select(0);
+ return;
+ }
+ if (text != null && text.equals(getComboBlockFormat().getText())) {
+ return;
+ }
+ String[] items = this.getComboBlockFormat().getItems();
+ for (int i = 0; i < items.length; i++) {
+ if (items[i].equalsIgnoreCase(text)) {
+ this.getComboBlockFormat().select(i);
+ return;
}
- getComboBlockFormat().deselectAll();
+ }
}
+ getComboBlockFormat().deselectAll();
+ }
}
\ No newline at end of file
16 years, 8 months