JBoss Tools SVN: r5500 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-03 20:54:54 -0500 (Thu, 03 Jan 2008)
New Revision: 5500
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml templates file in seam-gen.
JUnit tests also added.
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java 2008-01-04 01:54:51 UTC (rev 5499)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/wizards/special/DefaultSpecialWizard.java 2008-01-04 01:54:54 UTC (rev 5500)
@@ -88,11 +88,7 @@
} catch (Exception e) {
ModelUIPlugin.getPluginLog().logError(e);
}
- try {
- setStep();
- } catch (Exception t) {
- ModelUIPlugin.getPluginLog().logError("Error while executing action " + name, t);
- }
+ setStep();
}
private void setStep() {
17 years
JBoss Tools SVN: r5499 - in trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui: widget/field and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-03 20:54:51 -0500 (Thu, 03 Jan 2008)
New Revision: 5499
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/TextField.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml templates file in seam-gen.
JUnit tests also added.
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-01-04 01:54:47 UTC (rev 5498)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-01-04 01:54:51 UTC (rev 5499)
@@ -121,11 +121,11 @@
.getDialectNames()), getDefaultDbType(), false);
private IFieldEditor dbSchemaName = IFieldEditorFactory.INSTANCE.createTextEditor(
- ISeamFacetDataModelProperties.DB_SCHEMA_NAME,
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME,
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_SCHEMA_NAME, ""); //$NON-NLS-1$
private IFieldEditor dbCatalogName = IFieldEditorFactory.INSTANCE.createTextEditor(
- ISeamFacetDataModelProperties.DB_CATALOG_NAME,
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME,
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_DATABASE_CATALOG_NAME, ""); //$NON-NLS-1$
private IFieldEditor dbTablesExists = IFieldEditorFactory.INSTANCE
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/TextField.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/TextField.java 2008-01-04 01:54:47 UTC (rev 5498)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/TextField.java 2008-01-04 01:54:51 UTC (rev 5499)
@@ -27,7 +27,7 @@
}
public void modifyText(ModifyEvent e) {
- firePropertyChange(new Object(),((Text)e.widget).getText());
+ firePropertyChange(new Object(),((Text)e.widget).getText().trim());
}
public Text getTextControl() {
17 years
JBoss Tools SVN: r5498 - trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-03 20:54:47 -0500 (Thu, 03 Jan 2008)
New Revision: 5498
Modified:
trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml templates file in seam-gen.
JUnit tests also added.
Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java
===================================================================
--- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-01-04 01:54:44 UTC (rev 5497)
+++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-01-04 01:54:47 UTC (rev 5498)
@@ -12,9 +12,13 @@
import java.io.File;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
@@ -108,4 +112,18 @@
return project;
}
+
+ public static boolean findLineInFile(IFile file, String pattern) throws CoreException, IOException {
+ InputStream content = file.getContents(true);
+ LineNumberReader contentReader = new LineNumberReader(new InputStreamReader(content));
+ String line;
+ boolean patternIsFound = false;
+ do {
+ line = contentReader.readLine();
+ if(line!=null && !patternIsFound) {
+ patternIsFound = line.matches(pattern);
+ }
+ } while (line != null && !patternIsFound);
+ return patternIsFound;
+ }
}
17 years
JBoss Tools SVN: r5497 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-03 20:54:44 -0500 (Thu, 03 Jan 2008)
New Revision: 5497
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml templates file in seam-gen.
JUnit tests also added.
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2008-01-04 01:54:41 UTC (rev 5496)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2008-01-04 01:54:44 UTC (rev 5497)
@@ -24,6 +24,7 @@
import org.jboss.tools.seam.core.project.facet.SeamVersion;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
import org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider;
+import org.jboss.tools.seam.internal.core.project.facet.SeamFacetPreInstallDelegate;
/**
* Base class for facet related tests; based on the facet test class found in
@@ -68,16 +69,16 @@
super.setUp();
assertSeamHomeAvailable();
File folder = getSeamHomeFolder();
-
-
-
+
SeamRuntimeManager.getInstance().addRuntime(SEAM_1_2_0, folder.getAbsolutePath(), SeamVersion.SEAM_1_2, true);
seamRuntime = SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_1_2_0);
}
protected File getSeamHomeFolder() {
- return new File(System.getProperty("jbosstools.test.seam.1.2.1.eap.home", "/home/max/rhdevstudio/jboss-eap/seam"));
+ return new File(
+ System.getProperty("jbosstools.test.seam.1.2.1.eap.home",
+ "C:/jbdevstudio/jboss-eap/seam"));
}
@@ -152,7 +153,7 @@
null);
installDependentFacets(fproj);
-
+// new SeamFacetPreInstallDelegate().execute(fproj.getProject(), getSeamFacetVersion(), config, null);
fproj.installProjectFacet(getSeamFacetVersion(), config, null);
SeamProjectsSet seamProjectsSet = new SeamProjectsSet(fproj.getProject());
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2008-01-04 01:54:41 UTC (rev 5496)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/SeamFacetInstallDelegateTest.java 2008-01-04 01:54:44 UTC (rev 5497)
@@ -12,10 +12,14 @@
import java.io.IOException;
+import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
+import org.jboss.tools.seam.internal.core.project.facet.SeamFacetPreInstallDelegate;
+import org.jboss.tools.test.util.ResourcesUtils;
public class SeamFacetInstallDelegateTest extends AbstractSeamFacetTest {
@@ -46,4 +50,73 @@
}
+ public void testJiraJbide1544() throws CoreException, IOException {
+
+ final String catalogName = "catalog1";
+ final String schemaName = "schema1";
+
+ IDataModel createSeamDataModel = createSeamDataModel("war");
+ createSeamDataModel.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME, catalogName);
+ createSeamDataModel.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME, schemaName);
+ IFacetedProject fproj = createSeamProject("customSchemaAndCatalog",createSeamDataModel);
+ IFile persistence = (IFile)fproj.getProject().findMember("src/model/META-INF/persistence.xml");
+ assertTrue(persistence.exists());
+ boolean schemaExists = ResourcesUtils.findLineInFile(persistence, ".*" +
+ NLS.bind(
+ SeamFacetPreInstallDelegate.PROP_DECL,
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME.replace(".","\\."),
+ schemaName}));
+ boolean catalogExists = ResourcesUtils.findLineInFile(persistence, ".*" +
+ NLS.bind(
+ SeamFacetPreInstallDelegate.PROP_DECL,
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME.replace(".","\\."),
+ catalogName}));
+ assertTrue(
+ NLS.bind(
+ "Cannot find ''{0}'' property in persistence.xml file",
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME})
+ , schemaExists);
+
+ assertTrue(
+ NLS.bind(
+ "Cannot find ''{0}'' property in persistence.xml file",
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME})
+ , catalogExists);
+
+ createSeamDataModel = createSeamDataModel("war");
+ fproj = createSeamProject("noSchemaAndCatalog",createSeamDataModel);
+ persistence = (IFile)fproj.getProject().findMember("src/model/META-INF/persistence.xml");
+ assertTrue(persistence.exists());
+ schemaExists = ResourcesUtils.findLineInFile(persistence, ".*" +
+ NLS.bind(
+ SeamFacetPreInstallDelegate.PROP_DECL,
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME.replace(".","\\."),
+ ".*"}));
+ catalogExists = ResourcesUtils.findLineInFile(persistence, ".*" +
+ NLS.bind(
+ SeamFacetPreInstallDelegate.PROP_DECL,
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME.replace(".","\\."),
+ ".*"}));
+ assertTrue(
+ NLS.bind(
+ "''{0}'' property mustn't be in persistence.xml file",
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME})
+ , !schemaExists);
+
+ assertTrue(
+ NLS.bind(
+ "''{0}'' property mustn't be in persistence.xml file",
+ new String[]{
+ ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME})
+ , !catalogExists);
+
+ }
+
}
17 years
JBoss Tools SVN: r5496 - trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-03 20:54:41 -0500 (Thu, 03 Jan 2008)
New Revision: 5496
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml templates file in seam-gen.
JUnit tests also added.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java 2008-01-04 01:54:38 UTC (rev 5495)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.debug.ui/src/org/jboss/tools/jst/web/debug/ui/internal/views/properties/xpl/WebDataProperties.java 2008-01-04 01:54:41 UTC (rev 5496)
@@ -71,7 +71,7 @@
private static Map enablements = new HashMap(12);
private static Map filters = new HashMap(2);
- private IPreferenceStore fStore;
+ private final IPreferenceStore fStore;
public WebDataProperties (IPreferenceStore store) {
this.fStore = store;
@@ -87,7 +87,7 @@
try {
Boolean value = (Boolean)enablements.get(filter);
if (value == null && fStore != null) {
- value = new Boolean(fStore.getBoolean(filter));
+ value = Boolean.valueOf(fStore.getBoolean(filter));
synchronized (this) {
enablements.put(filter, value);
}
@@ -135,7 +135,7 @@
newValue= false;
}
- enablements.put(p, new Boolean(newValue));
+ enablements.put(p, Boolean.valueOf(newValue));
fireWebDataPropertyChanged(p);
}
if (filters.containsKey(p)) {
@@ -213,7 +213,7 @@
store.setDefault(SHOW_STRUTS_DYNAACTIONFORM_FILTER+VALUE_POSTFIX, "*");
}
- private List fListeners = new ArrayList();
+ private final List fListeners = new ArrayList();
public void addWebDataPropertyChangeListener (IWebDataPropertyChangeListener listener) {
if (!fListeners.contains(listener)) fListeners.add(listener);
}
17 years
JBoss Tools SVN: r5495 - trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-01-03 20:54:38 -0500 (Thu, 03 Jan 2008)
New Revision: 5495
Modified:
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbDinamicResource.java
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbDtdStore.java
trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbHtmlMap.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-1544
Need add @catalogProperty@@schemaProperty@ back to persistence.xml templates file in seam-gen.
JUnit tests also added.
Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbDinamicResource.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbDinamicResource.java 2008-01-03 17:47:02 UTC (rev 5494)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbDinamicResource.java 2008-01-04 01:54:38 UTC (rev 5495)
@@ -19,19 +19,19 @@
*/
public interface KbDinamicResource extends KbResource {
- public static final String BUNDLE_PROPERTY_TYPE = "bundleProperty";
- public static final String BEAN_PROPERTY_TYPE = "beanProperty";
- public static final String BEAN_METHOD_BY_SYGNATURE_TYPE = "beanMethodBySignature";
- public static final String JSP_PATH_TYPE = "jspPath";
- public static final String BUNDLE_NAME_TYPE = "bundleName";
- public static final String VIEW_ACTIONS_TYPE = "viewActions";
- public static final String IMAGE_FILE_TYPE = "file";
- public static final String ENUMERATION_TYPE = "enumeration";
- public static final String JSF_VARIABLES_TYPE = "jsfVariables";
- public static final String FACELETS_JSFC_TYPE = "faceletsJsfCTags";
- public static final String MANAGED_BEAN_NAME_TYPE = "managedBeanName";
- public static final String JSF_ID = "jsfID";
- public static final String TAGLIB_TYPE = "taglib";
+ String BUNDLE_PROPERTY_TYPE = "bundleProperty";
+ String BEAN_PROPERTY_TYPE = "beanProperty";
+ String BEAN_METHOD_BY_SYGNATURE_TYPE = "beanMethodBySignature";
+ String JSP_PATH_TYPE = "jspPath";
+ String BUNDLE_NAME_TYPE = "bundleName";
+ String VIEW_ACTIONS_TYPE = "viewActions";
+ String IMAGE_FILE_TYPE = "file";
+ String ENUMERATION_TYPE = "enumeration";
+ String JSF_VARIABLES_TYPE = "jsfVariables";
+ String FACELETS_JSFC_TYPE = "faceletsJsfCTags";
+ String MANAGED_BEAN_NAME_TYPE = "managedBeanName";
+ String JSF_ID = "jsfID";
+ String TAGLIB_TYPE = "taglib";
/**
* Sets a parameter for resource.
Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbDtdStore.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbDtdStore.java 2008-01-03 17:47:02 UTC (rev 5494)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbDtdStore.java 2008-01-04 01:54:38 UTC (rev 5495)
@@ -21,18 +21,18 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.List;
import java.util.StringTokenizer;
import java.util.Vector;
import org.apache.xml.serialize.OutputFormat;
import org.apache.xml.serialize.XMLSerializer;
+import org.jboss.tools.common.kb.configuration.KbConfigurationFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.jboss.tools.common.kb.configuration.KbConfigurationFactory;
-
/**
* @author eskimo
*/
@@ -41,9 +41,9 @@
public static final String XML_DECLARATION = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
private String schemaLocation;
- private Vector<Document> activeDocuments;
- private Vector<KbDtdResource> registratedResources;
- private Vector<KbDtdResource> downloadingResources;
+ private List<Document> activeDocuments;
+ private List<KbDtdResource> registratedResources;
+ private List<KbDtdResource> downloadingResources;
private static final KbDtdStore INSTANCE = new KbDtdStore();
@@ -83,7 +83,7 @@
}
InerDtdQuery inerDtdQuery = getInerDtdQery(new KbQuery(queryForLastTag, query.getResources()));
- ArrayList elementTypes = inerDtdQuery.getElementTypes();
+ List elementTypes = inerDtdQuery.getElementTypes();
return KbSchemaUtil.getTagInformationFromElementTypes(elementTypes, lastTag, new HashSet());
}
@@ -115,7 +115,7 @@
return proposals;
}
- ArrayList<KbProposal> proposals = queryTagProposal(getInerDtdQery(query));
+ List<KbProposal> proposals = queryTagProposal(getInerDtdQery(query));
KbProposal endTag = getEndTagProposal(query);
if(endTag != null) {
proposals.add(endTag);
@@ -141,7 +141,7 @@
throw new IllegalArgumentException("Bad query: " + strQuery + ". Query must starts with \"" + KbQuery.TAG_SEPARATOR + "\" or \"" + KbQuery.XML_DECLARATION_QUERY + "\"");
}
- ArrayList<Element> elementTypes = new ArrayList<Element>();
+ List<Element> elementTypes = new ArrayList<Element>();
String tagQuery = null;
int lastTagSeparator = strQuery.lastIndexOf(KbQuery.TAG_SEPARATOR);
if(lastTagSeparator > firstTagSeparator) {
@@ -325,7 +325,7 @@
}
}
- private ArrayList<Element> getChildElementTypes(Collection resources, StringTokenizer tagNames) {
+ private List<Element> getChildElementTypes(Collection resources, StringTokenizer tagNames) {
// KbPlugin.log("--> getChildElementTypes(Collection resources, StringTokenizer tagNames)");
// KbPlugin.log(" resources size = " + resources.size());
// KbPlugin.log(" tagNames = " + tagNames);
@@ -333,7 +333,7 @@
String tagName = tagNames.nextToken();
// KbPlugin.log(" tagName = " + tagName);
- ArrayList<Element> childElements = getChildElements(resources, tagName, true);
+ List<Element> childElements = getChildElements(resources, tagName, true);
// KbPlugin.log(" childElements size = " + childElements.size());
@@ -405,7 +405,7 @@
return null;
}
- private ArrayList<Element> addCollection(Collection<Element> col1, Collection<Element> col2) {
+ private List<Element> addCollection(Collection<Element> col1, Collection<Element> col2) {
ArrayList<Element> arrayList = new ArrayList<Element>();
Iterator<Element> iterator = col1.iterator();
while(iterator.hasNext()) {
@@ -418,7 +418,7 @@
return arrayList;
}
- private ArrayList<Element> getChildElements(Collection resources, String elementTypeName, boolean rootTag) {
+ private List<Element> getChildElements(Collection resources, String elementTypeName, boolean rootTag) {
// KbPlugin.log("--> getChildElements(Collection resources, String elementTypeName, boolean rootTag)");
// KbPlugin.log(" resources size = " + resources.size());
// KbPlugin.log(" elementTypeName = " + elementTypeName);
@@ -473,11 +473,11 @@
return elements;
}
- private ArrayList<KbProposal> queryTagProposal(InerDtdQuery query) {
+ private List<KbProposal> queryTagProposal(InerDtdQuery query) {
return queryTagProposal(query.getElementTypes(), query.getTagQuery());
}
- private ArrayList<KbProposal> queryTagProposal(ArrayList elementTypes, String query) {
+ private List<KbProposal> queryTagProposal(List elementTypes, String query) {
// KbPlugin.log("--> queryTagProposal(ArrayList elementTypes, String query)");
// KbPlugin.log(" Query = " + query);
// KbPlugin.log(" elementTypes size = " + elementTypes.size());
@@ -722,7 +722,7 @@
}
}
- private ArrayList<KbProposal> getTags(Collection elementTypes, String tagMask) {
+ private List<KbProposal> getTags(Collection elementTypes, String tagMask) {
// KbPlugin.log("--> getTags(Collection elementTypes, String tagMask)");
// KbPlugin.log(" elementTypes size = " + elementTypes.size());
// KbPlugin.log(" tagMask = " + tagMask);
@@ -730,7 +730,7 @@
return getTagProposal(getElementTypesByName(elementTypes, tagMask, true));
}
- private ArrayList<Element> getElementTypesByName(Collection elementTypes, String name, boolean mask) {
+ private List<Element> getElementTypesByName(Collection elementTypes, String name, boolean mask) {
// KbPlugin.log("--> getElementTypesByName(Collection elementTypes, String name, boolean mask)");
// KbPlugin.log(" elementTypes size = " + elementTypes.size());
// KbPlugin.log(" name = " + name);
@@ -755,7 +755,7 @@
return elements;
}
- private ArrayList<KbProposal> getAttributes(Collection elementTypes, String tagName, String attributeMask) {
+ private List<KbProposal> getAttributes(Collection elementTypes, String tagName, String attributeMask) {
// KbPlugin.log("--> getAttributes(String prefix, String tagName, String attributeMask)");
// KbPlugin.log(" prefix = " + prefix);
// KbPlugin.log(" tagName = " + tagName);
@@ -764,10 +764,10 @@
return getAttributeProposal(getAttributeTypesByName(elementTypes, tagName, attributeMask, true));
}
- private ArrayList<Element> getAttributeTypesByName(Collection elementTypes, String tagName, String attributeName, boolean mask) {
- ArrayList<Element> attributes = new ArrayList<Element>();
+ private List<Element> getAttributeTypesByName(Collection elementTypes, String tagName, String attributeName, boolean mask) {
+ List<Element> attributes = new ArrayList<Element>();
- ArrayList elements = getElementTypesByName(elementTypes, tagName, false);
+ List elements = getElementTypesByName(elementTypes, tagName, false);
if(!elements.isEmpty()) {
Element element = (Element)elements.get(0);
@@ -785,10 +785,10 @@
return attributes;
}
- private ArrayList<KbProposal> getEnumeration(Collection elementTypes, String tagName, String attributeName, String valueMask) {
- ArrayList<KbProposal> enumeration = new ArrayList<KbProposal>();
+ private List<KbProposal> getEnumeration(Collection elementTypes, String tagName, String attributeName, String valueMask) {
+ List<KbProposal> enumeration = new ArrayList<KbProposal>();
- ArrayList attributeTypes = new ArrayList();
+ List attributeTypes = new ArrayList();
attributeTypes = getAttributeTypesByName(elementTypes, tagName, attributeName, false);
if(!attributeTypes.isEmpty()) {
Element attributeType = (Element)attributeTypes.get(0);
@@ -814,15 +814,15 @@
return enumeration;
}
- private ArrayList<KbProposal> getTagProposal(ArrayList<Element> elements) {
+ private List<KbProposal> getTagProposal(List<Element> elements) {
return getProposal(elements, true);
}
- private ArrayList<KbProposal> getAttributeProposal(ArrayList elements) {
+ private List<KbProposal> getAttributeProposal(List elements) {
return getProposal(elements, false);
}
- private ArrayList<KbProposal> getProposal(ArrayList elements, boolean tag) {
+ private List<KbProposal> getProposal(List elements, boolean tag) {
// KbPlugin.log("--> getProposal(ArrayList elements, boolean tag)");
// KbPlugin.log(" elemnets size = " + elements.size());
// KbPlugin.log(" tag = " + tag);
@@ -959,10 +959,10 @@
private class InerDtdQuery {
- private ArrayList elementTypes;
+ private List elementTypes;
private String tagQuery;
- public InerDtdQuery(ArrayList elementTypes, String tagQuery) {
+ public InerDtdQuery(List elementTypes, String tagQuery) {
this.elementTypes = elementTypes;
this.tagQuery = tagQuery;
}
@@ -970,7 +970,7 @@
/**
* @return
*/
- public ArrayList getElementTypes() {
+ public List getElementTypes() {
return elementTypes;
}
Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbHtmlMap.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbHtmlMap.java 2008-01-03 17:47:02 UTC (rev 5494)
+++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/KbHtmlMap.java 2008-01-04 01:54:38 UTC (rev 5495)
@@ -22,6 +22,8 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Properties;
import org.apache.xml.serialize.OutputFormat;
@@ -39,13 +41,13 @@
public class KbHtmlMap {
private final static String ROOT_ELEMENT_ATTRIBUTE_VALUE = "HTML";
- private HashMap htmlMap;
+ private Map htmlMap;
private static File hashMapLocation = new File(KbConfigurationFactory.getInstance().getDefaultConfiguration().getHtmlMapFilePath());
/**
*
*/
- private KbHtmlMap(HashMap proposals) {
+ private KbHtmlMap(Map proposals) {
htmlMap = proposals;
}
@@ -56,7 +58,7 @@
HashMap<String,Element> children = new HashMap<String,Element>();
Element elementType = (Element)nodeList.item(i);
String tagName = elementType.getAttribute(SchemaNodeFactory.NAME_ATTRIBUTE);
- ArrayList childrenElementTypes = getChildElementTypes(schema, tagName);
+ List childrenElementTypes = getChildElementTypes(schema, tagName);
addOptionalTags(children, elementType);
for(int j=0; j<childrenElementTypes.size(); j++) {
Element childrenElementType = (Element)childrenElementTypes.get(j);
@@ -80,7 +82,7 @@
HashMap<String,Element> children = new HashMap<String,Element>();
Element elementType = (Element)nodeList.item(i);
String tagName = elementType.getAttribute(SchemaNodeFactory.NAME_ATTRIBUTE);
- ArrayList childrenElementTypes = getChildElementTypes(schema, tagName);
+ List childrenElementTypes = getChildElementTypes(schema, tagName);
addOptionalTags(children, elementType);
for(int j=0; j<childrenElementTypes.size(); j++) {
Element childrenElementType = (Element)childrenElementTypes.get(j);
@@ -158,7 +160,7 @@
String startTagType = elementType.getAttribute(SchemaNodeFactory.START_TAG_ATTRIBUTE);
if(SchemaNodeFactory.OPTIONAL_TAG_TYPE.equals(startTagType)) {
// KbPlugin.log(" Tag have optional start tag");
- ArrayList childElementTypes = getChildElementTypes(elementType.getOwnerDocument(), elementType.getAttribute(SchemaNodeFactory.NAME_ATTRIBUTE));
+ List childElementTypes = getChildElementTypes(elementType.getOwnerDocument(), elementType.getAttribute(SchemaNodeFactory.NAME_ATTRIBUTE));
for(Iterator iter = childElementTypes.iterator(); iter.hasNext();) {
Element childElementType = (Element)iter.next();
addOptionalTags(map, childElementType);
@@ -169,10 +171,10 @@
// KbPlugin.log(" map size=" + map.size());
}
- private static ArrayList<Element> getChildElementTypes(Document schema, String tagName) {
- ArrayList<Element> childElementTypes = new ArrayList<Element>();
+ private static List<Element> getChildElementTypes(Document schema, String tagName) {
+ List<Element> childElementTypes = new ArrayList<Element>();
- ArrayList childElements = getChildElements(schema, tagName);
+ List childElements = getChildElements(schema, tagName);
for(Iterator iter = childElements.iterator(); iter.hasNext();) {
Element element = (Element)iter.next();
17 years
JBoss Tools SVN: r5494 - trunk/hibernatetools/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-01-03 12:47:02 -0500 (Thu, 03 Jan 2008)
New Revision: 5494
Modified:
trunk/hibernatetools/docs/reference/en/modules/plugins.xml
Log:
http://jira.jboss.com/jira/browse/JBDS-185 - folder 'plugins' is added to 'images' folder
Modified: trunk/hibernatetools/docs/reference/en/modules/plugins.xml
===================================================================
--- trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-03 17:46:47 UTC (rev 5493)
+++ trunk/hibernatetools/docs/reference/en/modules/plugins.xml 2008-01-03 17:47:02 UTC (rev 5494)
@@ -65,11 +65,11 @@
<title>Hibernate Configuration File Wizard</title>
<mediaobject>
<imageobject role="fo">
- <imagedata contentwidth="5cm" fileref="images/hibernatecfgwizard.png" format="PNG"/>
+ <imagedata contentwidth="5cm" fileref="images/plugins/plugins_1.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/hibernatecfgwizard.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_1.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -80,7 +80,7 @@
</note>
<para>Enter your configuration information in this dialog. Details about the configuration
- options can be found in <property>Hibernate</property> reference documentation.</para>
+ options can be found in <property>Hibernate reference documentation</property>.</para>
<para>Press <emphasis>
<property>Finish</property>
@@ -121,11 +121,11 @@
<title> Creating Hibernate Console Configuration</title>
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="images/consolecfgwizard.png" format="PNG"/>
+ <imagedata fileref="images/plugins/plugins_2.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/consolecfgwizard.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_2.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -304,11 +304,11 @@
<title>Specifying Classpath in Hibernate Console Configuration</title>
<mediaobject>
<imageobject role="fo">
- <imagedata align="center" fileref="images/consolecfgclasspath.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_3.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/consolecfgclasspath.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_3.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -384,11 +384,11 @@
<title>Specifying additional Mappings in Hibernate Console Configuration</title>
<mediaobject>
<imageobject role="fo">
- <imagedata align="center" fileref="images/consolecfgmappings.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_4.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/consolecfgmappings.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_4.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -452,11 +452,11 @@
<title>Console Overview</title>
<mediaobject>
<imageobject role="fo">
- <imagedata align="center" fileref="images/consoleoutline-before-reveng.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_5.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/consoleoutline-before-reveng.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_5.png" format="PNG"/>
</imageobject>
</mediaobject>
@@ -484,7 +484,7 @@
<title>Code Generation Launcher</title>
<para>When you click on <emphasis>
- <property>Hibernate Code Generation...</property>
+ <property>Open Hibernate Code Generation Dialog...</property>
</emphasis> the standard Eclipse launcher dialog will appear. In this dialog you can create,
edit and delete named Hibernate code generation "launchers".</para>
@@ -492,11 +492,11 @@
<title>Getting Hibernate Code Generation Wizard</title>
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="images/codegendropdown.gif" format="GIF"/>
+ <imagedata fileref="images/plugins/plugins_6.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/codegendropdown.gif" format="GIF"/>
+ <imagedata align="center" fileref="images/plugins/plugins_6.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -507,11 +507,11 @@
<title>Hibernate Code Generation Wizard</title>
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="images/codegenmaintab.png" format="PNG"/>
+ <imagedata fileref="images/plugins/plugins_7.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/codegenmaintab.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_7.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -521,7 +521,7 @@
<property>New_Generation</property>
</emphasis> will be used.</para>
- <note>
+ <note><title>Tip:</title>
<para>The "At least one exporter option must be selected" is just a
warning stating that for this launch to work you need to select an exporter on the
Exporter tab. When an exporter has been selected the warning will disappear.</para>
@@ -656,17 +656,17 @@
</row>
<row>
- <entry>Detect optimistic lock columns</entry>
+ <entry><para>Detect optimistic lock columns</para></entry>
- <entry>Automatically detect optimistic lock columns. Controllable via reveng.
- strategy; the current default is to use columns named VERSION or TIMESTAMP.</entry>
+ <entry><para>Automatically detect optimistic lock columns. Controllable via reveng.
+ strategy; the current default is to use columns named VERSION or TIMESTAMP.</para></entry>
</row>
<row>
- <entry>Detect many-to-many tables</entry>
+ <entry><para>Detect many-to-many tables</para></entry>
- <entry>Automatically detect many-to-many tables. Controllable via reveng.
- strategy.</entry>
+ <entry><para>Automatically detect many-to-many tables. Controllable via reveng.
+ strategy.</para></entry>
</row>
<row>
@@ -708,11 +708,11 @@
<title>Selecting Exporters</title>
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="images/codegenexporters.png" format="PNG"/>
+ <imagedata fileref="images/plugins/plugins_8.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/codegenexporters.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_8.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1052,11 +1052,11 @@
<title>Property Completion</title>
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="images/cfgxml-propertycomplete.png" format="PNG"/>
+ <imagedata fileref="images/plugins/plugins_12.png" format="PNG"/>
</imageobject>
<imageobject role="html">
- <imagedata align="center" fileref="images/cfgxml-propertycomplete.png" format="PNG"/>
+ <imagedata align="center" fileref="images/plugins/plugins_12.png" format="PNG"/>
</imageobject>
</mediaobject>
</figure>
@@ -1074,7 +1074,7 @@
configure the reverse engineering process.</para>
<para>The editor is intended to allow easy definition of type mappings, table include/excludes
- and specific override settings for columns, e.g. define a explicit name for a column when the
+ and specific override settings for columns, e.g. define an explicit name for a column when the
default naming rules is not applicable.</para>
<para>Note that not all the features of the <emphasis>
@@ -1189,7 +1189,7 @@
</figure>
- <para><property>Hibernate Console</property> perspective showing entity structure, query editor and
+ <para><property>Hibernate Console</property> perspective shows entity structure, query editor and
result</para>
17 years
JBoss Tools SVN: r5493 - in trunk/hibernatetools/docs/reference/en/images: plugins and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2008-01-03 12:46:47 -0500 (Thu, 03 Jan 2008)
New Revision: 5493
Added:
trunk/hibernatetools/docs/reference/en/images/plugins/
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_1.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_2.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_3.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_5.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_6.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_7.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8.png
trunk/hibernatetools/docs/reference/en/images/plugins/plugins_9.png
Log:
http://jira.jboss.com/jira/browse/JBDS-185 - folder 'plugins' is added to 'images' folder
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_12.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_5.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_5.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_6.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_6.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_7.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_7.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_8.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_9.png
===================================================================
(Binary files differ)
Property changes on: trunk/hibernatetools/docs/reference/en/images/plugins/plugins_9.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years
JBoss Tools SVN: r5492 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-01-03 08:49:07 -0500 (Thu, 03 Jan 2008)
New Revision: 5492
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
Log:
update jsf junit
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2008-01-03 13:45:05 UTC (rev 5491)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/META-INF/MANIFEST.MF 2008-01-03 13:49:07 UTC (rev 5492)
@@ -10,6 +10,11 @@
org.junit,
org.eclipse.core.resources,
org.eclipse.ui.ide,
- org.jboss.tools.common
+ org.jboss.tools.common,
+ org.jboss.tools.jst.jsp,
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.common.model,
+ org.jboss.tools.vpe.xulrunner,
+ org.mozilla.xpcom
Eclipse-LazyStart: true
Bundle-ClassPath: jsf-test.jar
17 years
JBoss Tools SVN: r5491 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-01-03 08:45:05 -0500 (Thu, 03 Jan 2008)
New Revision: 5491
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/TestJsfUtil.java
Log:
update jsf junit
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-01-03 13:44:30 UTC (rev 5490)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2008-01-03 13:45:05 UTC (rev 5491)
@@ -26,8 +26,7 @@
private static void prepareTests() {
- TestJsfUtil.importJsfPages(JsfTestPlugin
- .getPluginResourcePath()
+ TestJsfUtil.importJsfPages(JsfTestPlugin.getPluginResourcePath()
+ TEST_PROJECT_PATH);
}
@@ -40,7 +39,7 @@
// $JUnit-BEGIN$
suite.addTestSuite(JsfComponentTest.class);
-// suite.addTestSuite(JsfJideTest.class);
+ suite.addTestSuite(JsfJbideTest.class);
// $JUnit-END$
return suite;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java 2008-01-03 13:44:30 UTC (rev 5490)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentTest.java 2008-01-03 13:45:05 UTC (rev 5491)
@@ -71,99 +71,99 @@
*/
public void testCommandButton() throws PartInitException, Throwable {
- performTestForJsfComponent("commandButton.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/commandButton.jsp"); // $NON-NLS-1$
}
public void testCommandLink() throws PartInitException, Throwable {
- performTestForJsfComponent("commandLink.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/commandLink.jsp"); // $NON-NLS-1$
}
public void testDataTable() throws PartInitException, Throwable {
- performTestForJsfComponent("dataTable.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/dataTable.jsp"); // $NON-NLS-1$
}
public void testForm() throws PartInitException, Throwable {
- performTestForJsfComponent("form.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/form.jsp"); // $NON-NLS-1$
}
public void testGraphicImage() throws PartInitException, Throwable {
- performTestForJsfComponent("graphicImage.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/graphicImage.jsp"); // $NON-NLS-1$
}
public void testInputHidden() throws PartInitException, Throwable {
- performTestForJsfComponent("inputHidden.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/inputHidden.jsp"); // $NON-NLS-1$
}
public void testInputSecret() throws PartInitException, Throwable {
- performTestForJsfComponent("inputSecret.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/inputSecret.jsp"); // $NON-NLS-1$
}
public void testInputText() throws PartInitException, Throwable {
- performTestForJsfComponent("inputText.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/inputText.jsp"); // $NON-NLS-1$
}
public void testInputTextArea() throws PartInitException, Throwable {
- performTestForJsfComponent("inputTextArea.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/inputTextArea.jsp"); // $NON-NLS-1$
}
public void testMessage() throws PartInitException, Throwable {
- performTestForJsfComponent("message.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/message.jsp"); // $NON-NLS-1$
}
public void testMessages() throws PartInitException, Throwable {
- performTestForJsfComponent("messages.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/messages.jsp"); // $NON-NLS-1$
}
public void testOutputFormat() throws PartInitException, Throwable {
- performTestForJsfComponent("outputFormat.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/outputFormat.jsp"); // $NON-NLS-1$
}
public void testOutputLabel() throws PartInitException, Throwable {
- performTestForJsfComponent("outputLabel.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/outputLabel.jsp"); // $NON-NLS-1$
}
public void testOutputLink() throws PartInitException, Throwable {
- performTestForJsfComponent("outputLink.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/outputLink.jsp"); // $NON-NLS-1$
}
public void testOutputText() throws PartInitException, Throwable {
- performTestForJsfComponent("outputText.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/outputText.jsp"); // $NON-NLS-1$
}
public void testPanelGrid() throws PartInitException, Throwable {
- performTestForJsfComponent("panelGrid.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/panelGrid.jsp"); // $NON-NLS-1$
}
public void testPanelGroup() throws PartInitException, Throwable {
- performTestForJsfComponent("panelGroup.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/panelGroup.jsp"); // $NON-NLS-1$
}
public void testSelectBooleanCheckbox() throws PartInitException, Throwable {
- performTestForJsfComponent("selectBooleanCheckbox.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectBooleanCheckbox.jsp"); // $NON-NLS-1$
}
public void testSelectManyCheckbox() throws PartInitException, Throwable {
- performTestForJsfComponent("selectManyCheckbox.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectManyCheckbox.jsp"); // $NON-NLS-1$
}
public void testSelectManyListbox() throws PartInitException, Throwable {
- performTestForJsfComponent("selectManyListbox.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectManyListbox.jsp"); // $NON-NLS-1$
}
public void testSelectManyMenu() throws PartInitException, Throwable {
- performTestForJsfComponent("selectManyMenu.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectManyMenu.jsp"); // $NON-NLS-1$
}
public void testSelectOneListbox() throws PartInitException, Throwable {
- performTestForJsfComponent("selectOneListbox.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectOneListbox.jsp"); // $NON-NLS-1$
}
public void testSelectOneMenu() throws PartInitException, Throwable {
- performTestForJsfComponent("selectOneMenu.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectOneMenu.jsp"); // $NON-NLS-1$
}
public void testSelectOneRadio() throws PartInitException, Throwable {
- performTestForJsfComponent("selectOneRadio.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectOneRadio.jsp"); // $NON-NLS-1$
}
/*
@@ -171,84 +171,84 @@
*/
public void testActionListener() throws PartInitException, Throwable {
- performTestForJsfComponent("actionListener.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/actionListener.jsp"); // $NON-NLS-1$
}
public void testAttribute() throws PartInitException, Throwable {
- performTestForJsfComponent("attribute.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/attribute.jsp"); // $NON-NLS-1$
}
public void testConvertDateTime() throws PartInitException, Throwable {
- performTestForJsfComponent("convertDateTime.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/convertDateTime.jsp"); // $NON-NLS-1$
}
public void testConvertNumber() throws PartInitException, Throwable {
- performTestForJsfComponent("convertNumber.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/convertNumber.jsp"); // $NON-NLS-1$
}
public void testConverter() throws PartInitException, Throwable {
- performTestForJsfComponent("converter.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/converter.jsp"); // $NON-NLS-1$
}
public void testFacet() throws PartInitException, Throwable {
- performTestForJsfComponent("facet.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/facet.jsp"); // $NON-NLS-1$
}
public void testLoadBundle() throws PartInitException, Throwable {
- performTestForJsfComponent("loadBundle.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/loadBundle.jsp"); // $NON-NLS-1$
}
public void testParam() throws PartInitException, Throwable {
- performTestForJsfComponent("param.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/param.jsp"); // $NON-NLS-1$
}
public void testPhaseListener() throws PartInitException, Throwable {
- performTestForJsfComponent("phaseListener.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/phaseListener.jsp"); // $NON-NLS-1$
}
public void testSelectItem() throws PartInitException, Throwable {
- performTestForJsfComponent("selectItem.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectItem.jsp"); // $NON-NLS-1$
}
public void testSelectItems() throws PartInitException, Throwable {
- performTestForJsfComponent("selectItems.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/selectItems.jsp"); // $NON-NLS-1$
}
public void testSetPropertyActionListener() throws PartInitException,
Throwable {
- performTestForJsfComponent("setPropertyActionListener.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/setPropertyActionListener.jsp"); // $NON-NLS-1$
}
public void testSubview() throws PartInitException, Throwable {
- performTestForJsfComponent("subview.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/subview.jsp"); // $NON-NLS-1$
}
public void testValidateDoubleRange() throws PartInitException, Throwable {
- performTestForJsfComponent("validateDoubleRange.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/validateDoubleRange.jsp"); // $NON-NLS-1$
}
public void testValidateLength() throws PartInitException, Throwable {
- performTestForJsfComponent("validateLength.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/validateLength.jsp"); // $NON-NLS-1$
}
public void testValidateLongRange() throws PartInitException, Throwable {
- performTestForJsfComponent("validateLongRange.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/validateLongRange.jsp"); // $NON-NLS-1$
}
public void testValidator() throws PartInitException, Throwable {
- performTestForJsfComponent("validator.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/validator.jsp"); // $NON-NLS-1$
}
public void testValueChangeListener() throws PartInitException, Throwable {
- performTestForJsfComponent("valueChangeListener.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/valueChangeListener.jsp"); // $NON-NLS-1$
}
public void testVerbatim() throws PartInitException, Throwable {
- performTestForJsfComponent("verbatim.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/verbatim.jsp"); // $NON-NLS-1$
}
public void testView() throws PartInitException, Throwable {
- performTestForJsfComponent("view.jsp"); // $NON-NLS-1$
+ performTestForJsfComponent("components/view.jsp"); // $NON-NLS-1$
}
private void performTestForJsfComponent(String componentPage)
@@ -256,15 +256,8 @@
TestJsfUtil.waitForJobs();
exception = null;
-
- // IPath componentPath = TestJsfComponentsUtil
- // .getComponentPath(componentPage);
- //
- // IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(
- // componentPath);
- IFile file = (IFile) TestJsfUtil
- .getComponentPath(componentPage);
+ IFile file = (IFile) TestJsfUtil.getComponentPath(componentPage);
IEditorInput input = new FileEditorInput(file);
@@ -273,6 +266,7 @@
TestJsfUtil.waitForJobs();
TestJsfUtil.delay(3000);
+
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.closeAllEditors(true);
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/TestJsfUtil.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/TestJsfUtil.java 2008-01-03 13:44:30 UTC (rev 5490)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/TestJsfUtil.java 2008-01-03 13:45:05 UTC (rev 5491)
@@ -100,9 +100,6 @@
PROJECT_NAME);
if (project != null) {
return project.getFolder(COMPONENTS_PATH).findMember(componentPage);
- // if (resource != null) {
- // return resource.getFullPath();
- // }
}
17 years