JBoss Tools SVN: r29991 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2011-03-24 10:11:37 -0400 (Thu, 24 Mar 2011)
New Revision: 29991
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeAllStringsWizard.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
Log:
https://issues.jboss.org/browse/JBIDE-7004 , Adding f:loadBundle element into f:view is finished.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeAllStringsWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeAllStringsWizard.java 2011-03-24 11:05:50 UTC (rev 29990)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeAllStringsWizard.java 2011-03-24 14:11:37 UTC (rev 29991)
@@ -30,6 +30,9 @@
import org.jboss.tools.jst.jsp.messages.JstUIMessages;
import org.jboss.tools.jst.jsp.util.Constants;
+/**
+ * The Wizard to Externalize All Strings on the page.
+ */
public class ExternalizeAllStringsWizard extends Wizard {
private ITextEditor editor = null;
@@ -38,6 +41,12 @@
ExternalizeAllStringsKeysListPage page2;
ExternalizeStringsWizardRegisterBundlePage page3;
+ /**
+ * Instantiates a new externalize all strings wizard.
+ *
+ * @param editor the editor with the opened file
+ * @param bm the BundleMap
+ */
public ExternalizeAllStringsWizard(ITextEditor editor, BundleMap bm) {
super();
setHelpAvailable(false);
@@ -49,6 +58,9 @@
}
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.wizard.Wizard#addPages()
+ */
@Override
public void addPages() {
super.addPages();
@@ -63,14 +75,27 @@
addPage(page3);
}
+ /**
+ * Gets the editor.
+ *
+ * @return the editor
+ */
protected ITextEditor getEditor() {
return editor;
}
+ /**
+ * Gets the document.
+ *
+ * @return the document
+ */
protected IDocument getDocument() {
return editor.getDocumentProvider().getDocument(editor.getEditorInput());
}
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.wizard.Wizard#performFinish()
+ */
@Override
public boolean performFinish() {
File bundleFile = page1.getBundleFile();
@@ -167,16 +192,33 @@
var = bundlePath.substring(bundlePath.lastIndexOf("/") + 1); //$NON-NLS-1$
bundleName = var;
}
+ /*
+ * Replace strings with new bundle name
+ */
+ page2.replaceAllStrings(bundleName);
+ /*
+ * Register the bundle if required.
+ */
if (page3.isInFacesConfig()) {
ExternalizeStringsUtils.registerInFacesConfig(editor, bundlePath, var);
} else if (page3.isViaLoadBundle()) {
ExternalizeStringsUtils.registerViaLoadBundle(editor, bundlePath, var);
}
+ } else {
+ /*
+ * Simply replace the string with exited bundle and existed name.
+ */
+ page2.replaceAllStrings(bundleName);
}
- page2.replaceAllStrings(bundleName);
return true;
}
+ /**
+ * Find bundle prefix for the file
+ * user selected on the page1.
+ *
+ * @return the string
+ */
public String findBundlePrefix() {
String bundlePrefix = Constants.EMPTY;
if (page1.getBundleFile() != null) {
@@ -192,21 +234,48 @@
return bundlePrefix;
}
+ /**
+ * Gets the original properties.
+ *
+ * @return the original properties
+ */
public Properties getOriginalProperties() {
if (null != page1) {
return page1.getOriginalProperties();
}
return null;
}
+
+ /**
+ * Sets the updated properties.
+ *
+ * @param p the new updated properties
+ */
public void setUpdatedProperties(Properties p) {
page2.updateTable(p);
}
+
+ /**
+ * Sets the page3 bundle name.
+ */
public void setPage3BundleName() {
page3.setBundleName(findBundlePrefix());
}
+
+ /**
+ * Gets the project.
+ *
+ * @return the project
+ */
protected IProject getProject() {
return ExternalizeStringsUtils.getProject(editor);
}
+
+ /**
+ * Gets the user defined file.
+ *
+ * @return the user defined file
+ */
protected File getUserDefinedFile() {
return page1.getBundleFile();
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java 2011-03-24 11:05:50 UTC (rev 29990)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsUtils.java 2011-03-24 14:11:37 UTC (rev 29991)
@@ -53,6 +53,7 @@
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
import org.eclipse.wst.xml.core.internal.document.AttrImpl;
+import org.eclipse.wst.xml.core.internal.document.ElementImpl;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
import org.eclipse.wst.xml.ui.internal.provisional.IDOMSourceEditingTextTools;
@@ -83,6 +84,7 @@
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
import org.jboss.tools.jst.web.tld.TaglibData;
import org.jboss.tools.jst.web.tld.URIConstants;
+import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -128,6 +130,13 @@
return isSelectionCorrect;
}
+ /**
+ * Find faces config xml file using XModel.
+ *
+ * @param model
+ * the XModel
+ * @return the x-model-object for faces-config.xml
+ */
public static XModelObject findFacesConfig(XModel model) {
IWebPromptingProvider provider = (IWebPromptingProvider)ModelFeatureFactory.getInstance().createFeatureInstance("org.jboss.tools.jsf.model.pv.JSFPromptingProvider"); //$NON-NLS-1$
if(provider == null) {
@@ -269,6 +278,15 @@
return bm;
}
+ /**
+ * Creates the properties table.
+ *
+ * @param parent
+ * the visual parent
+ * @param style
+ * the table style constraint
+ * @return the created table
+ */
public static Table createPropertiesTable(Composite parent, int style) {
Table table = new Table(parent, style);
TableLayout layout = new TableLayout();
@@ -291,11 +309,14 @@
}
/**
- * Update resource bundle table according to the selected file:
- * put key and value pairs to the table
- *
- * @param table the UI table
- * @param propertiesFile resource bundle file
+ * Update resource bundle table according to the selected file:
+ * put key and value pairs to the table.
+ *
+ * @param table
+ * the UI table
+ * @param propertiesFile
+ * resource bundle file
+ * @return the java properties list generated from the propertiesFile
*/
public static Properties populatePropertiesTable(Table table, IFile propertiesFile) {
Properties properties = null;
@@ -308,7 +329,7 @@
String encoding = FileUtil.getEncoding(propertiesFile);
in = new BufferedReader(new InputStreamReader(
propertiesFile.getContents(), encoding));
- properties = readFileToProperies(table, in);
+ properties = readFileToProperties(table, in);
in.close();
} catch (CoreException e) {
JspEditorPlugin.getDefault().logError(
@@ -327,6 +348,16 @@
return properties;
}
+ /**
+ * Update resource bundle table according to the selected file:
+ * put key and value pairs to the table.
+ *
+ * @param table
+ * the table
+ * @param propertiesFile
+ * the properties file
+ * @return the java properties list generated from the propertiesFile
+ */
public static Properties populatePropertiesTable(Table table, File propertiesFile) {
Properties properties = null;
if ((propertiesFile != null) && (propertiesFile.exists())) {
@@ -336,7 +367,7 @@
FileReader fr = null;
try {
fr = new FileReader(propertiesFile);
- properties = readFileToProperies(table, fr);
+ properties = readFileToProperties(table, fr);
fr.close();
} catch (FileNotFoundException e) {
JspEditorPlugin.getDefault().logError(e);
@@ -353,7 +384,19 @@
return properties;
}
- private static Properties readFileToProperies(Table table, Reader r) {
+
+ /**
+ * Read properties file from the reader.
+ * Create java properties file.
+ * Populate the table with this properties values.
+ *
+ * @param table
+ * the table to populate
+ * @param r
+ * the reader
+ * @return the java properties list generated from the reader file
+ */
+ private static Properties readFileToProperties(Table table, Reader r) {
Properties properties = new Properties();
try {
properties.load(r);
@@ -431,6 +474,16 @@
return result;
}
+ /**
+ * Register the resource bundle in faces-config.xml file.
+ *
+ * @param editor
+ * the editor
+ * @param bundlePath
+ * the base-name for resource-bundle element
+ * @param var
+ * the var for resource-bundle element
+ */
public static void registerInFacesConfig(ITextEditor editor, String bundlePath, String var) {
/*
* Register new bundle in the faces-config.xml
@@ -461,6 +514,16 @@
}
+ /**
+ * Register the resource bundle via load bundle tag on the current page.
+ *
+ * @param editor
+ * the editor
+ * @param bundlePath
+ * the basename for f:loadBundle tag
+ * @param var
+ * the var for f:loadBundle tag
+ */
public static void registerViaLoadBundle(ITextEditor editor, String bundlePath, String var) {
/*
* Add <f:loadBundle> tag to the current page.
@@ -510,10 +573,8 @@
jsfCoreTaglibPrefix + Constants.COLON + "loadBundle"); //$NON-NLS-1$
loadBundle.setAttribute("var", var); //$NON-NLS-1$
loadBundle.setAttribute("basename", bundlePath); //$NON-NLS-1$
- Node firstChild = node.getFirstChild();
- if (firstChild != null) {
- firstChild.insertBefore(loadBundle, node);
- }
+ Node n = node.getFirstChild();
+ ExternalizeStringsUtils.insertLoadBundleTag(node, n, loadBundle);
}
}
} else {
@@ -523,7 +584,11 @@
}
/**
- * Register Message Taglibs on page
+ * Register jsf core taglib on current page.
+ *
+ * @param editor
+ * the editor
+ * @return the jsf core taglib prefix
*/
public static String registerMessageTaglib(ITextEditor editor) {
List<TaglibData> taglibs = null;
@@ -570,6 +635,13 @@
return jsfCoreTaglibPrefix;
}
+ /**
+ * Gets the file in the editor.
+ *
+ * @param editor
+ * the editor
+ * @return the file or null
+ */
public static IFile getFile(ITextEditor editor) {
if (editor.getEditorInput() instanceof IFileEditorInput) {
return ((IFileEditorInput)editor.getEditorInput()).getFile();
@@ -577,6 +649,13 @@
return null;
}
+ /**
+ * Gets the project for the file in the editor.
+ *
+ * @param editor
+ * the editor
+ * @return the project or null
+ */
public static IProject getProject(ITextEditor editor) {
IFile file = getFile(editor);
if (file != null) {
@@ -585,4 +664,38 @@
return null;
}
+ /**
+ * Insert load bundle tag.
+ *
+ * @param elementToInsertBefore
+ * the element to insert before
+ * @param refChild
+ * the referenced child
+ * @param loadBundle
+ * the load bundle element
+ * @return true, if the insertion was successful
+ */
+ public static boolean insertLoadBundleTag(Node elementToInsertBefore, Node refChild, Element loadBundle) {
+ boolean success = false;
+ /*
+ * elementToInsertBefore should be a container tag.
+ * Its isContainer() method should return true.
+ * refChild should be the element next to inserting loadBundle.
+ * Otherwise exception will be thrown.
+ */
+ if ((elementToInsertBefore != null) && (refChild != null) && (loadBundle != null)) {
+ try {
+ elementToInsertBefore.insertBefore(loadBundle, refChild);
+ success = true;
+ } catch (DOMException e) {
+ JspEditorPlugin.getDefault().logError(
+ JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_CANNOT_ADD_LOAD_BUNDLE_TAG,
+ e);
+ }
+ } else {
+ JspEditorPlugin.getDefault().logWarning(
+ JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_CANNOT_ADD_LOAD_BUNDLE_TAG);
+ }
+ return success;
+ }
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2011-03-24 11:05:50 UTC (rev 29990)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/ExternalizeStringsWizard.java 2011-03-24 14:11:37 UTC (rev 29991)
@@ -306,12 +306,7 @@
elementToInsertBefore = attr.getOwnerElement().getParentNode();
}
}
- if ((elementToInsertBefore != null) && (refChild != null)){
- elementToInsertBefore.insertBefore(loadBundle, refChild);
- } else {
- JspEditorPlugin.getDefault().logWarning(
- JstUIMessages.EXTERNALIZE_STRINGS_DIALOG_CANNOT_ADD_LOAD_BUNDLE_TAG);
- }
+ ExternalizeStringsUtils.insertLoadBundleTag(elementToInsertBefore, refChild, loadBundle);
}
}
}
@@ -326,6 +321,11 @@
return true;
}
+ /**
+ * Gets the document for the given editor.
+ *
+ * @return the document
+ */
private IDocument getDocument(){
IDocumentProvider prov = editor.getDocumentProvider();
return prov.getDocument(editor.getEditorInput());
@@ -356,13 +356,29 @@
return containerFullPath;
}
+ /**
+ * Gets the user defined path.
+ *
+ * @return the user defined path
+ */
protected IPath getUserDefinedPath() {
return page2.getContainerFullPath();
}
+ /**
+ * Gets the file name.
+ *
+ * @return the file name
+ */
protected String getFileName() {
return editor.getEditorInput().getName();
}
+
+ /**
+ * Gets the project.
+ *
+ * @return the project
+ */
protected IProject getProject() {
return ExternalizeStringsUtils.getProject(editor);
}
13 years, 9 months
JBoss Tools SVN: r29990 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-03-24 07:05:50 -0400 (Thu, 24 Mar 2011)
New Revision: 29990
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java
Log:
[JBIDE-8622] corrected retrieval of available actions for instances
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-03-24 11:03:41 UTC (rev 29989)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-03-24 11:05:50 UTC (rev 29990)
@@ -1,3 +1,9 @@
+2011-03-24 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java (getByName):
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java (getActions):
+ [JBIDE-8622] corrected retrieval of available actions for instances
+
2011-03-16 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/internal/deltacloud/core/observable/ObservablePojo.java
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-03-24 11:03:41 UTC (rev 29989)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-03-24 11:05:50 UTC (rev 29990)
@@ -100,11 +100,14 @@
}
public List<DeltaCloudResourceAction> getActions() {
- List<DeltaCloudResourceAction> actions = new ArrayList<DeltaCloudResourceAction>();
+ List<DeltaCloudResourceAction> deltaCloudActions = new ArrayList<DeltaCloudResourceAction>();
for (Action<Instance> action : instance.getActions()) {
- actions.add(DeltaCloudResourceAction.valueOf(action.getName()));
+ DeltaCloudResourceAction deltaCloudAction = DeltaCloudResourceAction.getByName(action.getName());
+ if (deltaCloudAction != null) {
+ deltaCloudActions.add(deltaCloudAction);
+ }
}
- return actions;
+ return deltaCloudActions;
}
public String getProfileId() {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java 2011-03-24 11:03:41 UTC (rev 29989)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudResourceAction.java 2011-03-24 11:05:50 UTC (rev 29990)
@@ -34,4 +34,16 @@
return name;
}
+ public static DeltaCloudResourceAction getByName(String name) {
+ DeltaCloudResourceAction action = null;
+ if (name != null) {
+ for (DeltaCloudResourceAction availableAction : values()) {
+ if (name.equalsIgnoreCase(availableAction.name)) {
+ action = availableAction;
+ break;
+ }
+ }
+ }
+ return action;
+ }
}
13 years, 9 months
JBoss Tools SVN: r29989 - in branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core: src/org/jboss/tools/deltacloud/core and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: adietish
Date: 2011-03-24 07:03:41 -0400 (Thu, 24 Mar 2011)
New Revision: 29989
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
Log:
[JBIDE-8622] corrected retrieval of available actions for instances
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-03-24 07:23:15 UTC (rev 29988)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2011-03-24 11:03:41 UTC (rev 29989)
@@ -1,3 +1,10 @@
+2011-03-24 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
+ (getActions):
+ (Action.getByName):
+ [JBIDE-8622] corrected retrieval of available actions for instances
+
2011-03-16 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
* src/org/jboss/tools/internal/deltacloud/core/observable/ObservablePojo.java
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-03-24 07:23:15 UTC (rev 29988)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudInstance.java 2011-03-24 11:03:41 UTC (rev 29989)
@@ -71,6 +71,19 @@
public String getName() {
return name;
}
+
+ public static Action getByName(String name) {
+ Action action = null;
+ if (name != null) {
+ for (Action availableAction : values()) {
+ if (name.equalsIgnoreCase(availableAction.name)) {
+ action = availableAction;
+ break;
+ }
+ }
+ }
+ return action;
+ }
}
private Instance instance;
@@ -117,15 +130,18 @@
public String getKeyId() {
return instance.getKeyId();
}
-
+
public List<Action> getActions() {
List<Action> actions = new ArrayList<Action>();
for (InstanceAction action : instance.getActions()) {
- actions.add(Action.valueOf(action.getName()));
+ Action deltaCloudAction = Action.getByName(action.getName());
+ if (deltaCloudAction != null) {
+ actions.add(deltaCloudAction);
+ }
}
return actions;
}
-
+
public String getProfileId() {
return instance.getProfileId();
}
@@ -165,7 +181,7 @@
public boolean isRunning() {
return instance.isRunning();
}
-
+
protected void setInstance(Instance instance) {
this.instance = instance;
}
13 years, 9 months
JBoss Tools SVN: r29988 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2011-03-24 03:23:15 -0400 (Thu, 24 Mar 2011)
New Revision: 29988
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
Log:
fix for junit test errors with lib folder not being found
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2011-03-24 00:29:40 UTC (rev 29987)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2011-03-24 07:23:15 UTC (rev 29988)
@@ -24,6 +24,7 @@
<configuration>
<explodedBundles>
<bundle>org.hibernate.eclipse.console.test</bundle>
+ <bundle>org.hibernate.eclipse</bundle>
</explodedBundles>
</configuration>
</plugin>
13 years, 9 months
JBoss Tools SVN: r29987 - trunk/jsf/docs/userguide/en-US/images/palette.
by jbosstools-commits@lists.jboss.org
Author: mcaspers
Date: 2011-03-23 20:29:40 -0400 (Wed, 23 Mar 2011)
New Revision: 29987
Modified:
trunk/jsf/docs/userguide/en-US/images/palette/palette_9.png
Log:
"Updated Screenshots"
Modified: trunk/jsf/docs/userguide/en-US/images/palette/palette_9.png
===================================================================
(Binary files differ)
13 years, 9 months
JBoss Tools SVN: r29986 - trunk/birt/docs/en-US.
by jbosstools-commits@lists.jboss.org
Author: mcaspers
Date: 2011-03-23 18:40:25 -0400 (Wed, 23 Mar 2011)
New Revision: 29986
Modified:
trunk/birt/docs/en-US/hibernate_datasource.xml
Log:
"Spelling Fixes"
Modified: trunk/birt/docs/en-US/hibernate_datasource.xml
===================================================================
--- trunk/birt/docs/en-US/hibernate_datasource.xml 2011-03-23 22:30:01 UTC (rev 29985)
+++ trunk/birt/docs/en-US/hibernate_datasource.xml 2011-03-23 22:40:25 UTC (rev 29986)
@@ -153,7 +153,7 @@
</note>
- <para>You can also use parameters in the query to add dynamics to your report. In the previous example we hardcoded the selection criterion in the <code>where</code> clause. </para>
+ <para>You can also use parameters in the query to add dynamics to your report. In the previous example we hard coded the selection criterion in the <code>where</code> clause. </para>
<para>To specify the job title on-the-fly your query should look like this:</para>
<programlisting role="XML"><![CDATA[
select jobtitle,firstname, lastname,email
13 years, 9 months
JBoss Tools SVN: r29985 - trunk/jsf/docs/userguide/en-US.
by jbosstools-commits@lists.jboss.org
Author: mcaspers
Date: 2011-03-23 18:30:01 -0400 (Wed, 23 Mar 2011)
New Revision: 29985
Modified:
trunk/jsf/docs/userguide/en-US/palette.xml
Log:
"Spelling Fixes"
Modified: trunk/jsf/docs/userguide/en-US/palette.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/palette.xml 2011-03-23 22:27:41 UTC (rev 29984)
+++ trunk/jsf/docs/userguide/en-US/palette.xml 2011-03-23 22:30:01 UTC (rev 29985)
@@ -346,7 +346,7 @@
</figure>
<para>
- In the <guilabel>Add Palette Macro</guilabel> window you can configure the tag element. The <guilabel>Name</guilabel> attribute is mandatory, as it defines the name of the tag element. Other settings are optional. You can choose the icon and set the <guilabel>Start Text</guilabel> and the <guilabel>End Text</guilabel> for your tag element. If your tag text is too long, use the <guibutton> Change... </guibutton> button to see it all. The pipe ("|") symbole can be used to control the cursors position for the <guilabel>start text</guilabel> and <guilabel>end text</guilabel> values.
+ In the <guilabel>Add Palette Macro</guilabel> window you can configure the tag element. The <guilabel>Name</guilabel> attribute is mandatory, as it defines the name of the tag element. Other settings are optional. You can choose the icon and set the <guilabel>Start Text</guilabel> and the <guilabel>End Text</guilabel> for your tag element. If your tag text is too long, use the <guibutton> Change... </guibutton> button to see it all. The pipe ("|") symbol can be used to control the cursors position for the <guilabel>start text</guilabel> and <guilabel>end text</guilabel> values.
</para>
<figure>
13 years, 9 months
JBoss Tools SVN: r29984 - in trunk/jsf/docs/userguide/en-US: images/palette and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: mcaspers
Date: 2011-03-23 18:27:41 -0400 (Wed, 23 Mar 2011)
New Revision: 29984
Modified:
trunk/jsf/docs/userguide/en-US/images/palette/palette_1.png
trunk/jsf/docs/userguide/en-US/palette.xml
Log:
"Spelling Fixes"
Modified: trunk/jsf/docs/userguide/en-US/images/palette/palette_1.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/palette.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/palette.xml 2011-03-23 21:58:14 UTC (rev 29983)
+++ trunk/jsf/docs/userguide/en-US/palette.xml 2011-03-23 22:27:41 UTC (rev 29984)
@@ -525,7 +525,7 @@
</figure>
<para>
- Above you can see where the cursor position for <menuchoice><guimenuitem>HTML</guimenuitem><guimenuitem>Form</guimenuitem><guimenuitem>input</guimenuitem></menuchoice> is set. After adding this tag into your file the cursor will be in the attribute <code>type</code>. At this point you can straight use the <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo> keyboard shortcut to display alist of possible values.
+ Above you can see where the cursor position for <menuchoice><guimenuitem>HTML</guimenuitem><guimenuitem>Form</guimenuitem><guimenuitem>input</guimenuitem></menuchoice> is set. After adding this tag into your file the cursor will be in the attribute <code>type</code>. At this point you can straight use the <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo> keyboard shortcut to display a list of possible values.
</para>
<figure>
13 years, 9 months
JBoss Tools SVN: r29983 - in trunk/examples/tests/org.jboss.tools.project.examples.test: src/org/jboss/tools/project/examples/test and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2011-03-23 17:58:14 -0400 (Wed, 23 Mar 2011)
New Revision: 29983
Modified:
trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml
trunk/examples/tests/org.jboss.tools.project.examples.test/requirements.properties
trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectExamplesUtil.java
trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java
Log:
JBIDE-8618 Add JUnit tests for Project Examples
Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml
===================================================================
--- trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml 2011-03-23 21:39:25 UTC (rev 29982)
+++ trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml 2011-03-23 21:58:14 UTC (rev 29983)
@@ -12,7 +12,7 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.2.SP1</systemProperties>
+ <systemProperties>-Djbosstools.test.jboss.home.4.2=${requirement.build.root}/jboss-4.2.3.GA -Djbosstools.test.seam.2.0.1.GA.home=${requirement.build.root}/jboss-seam-2.0.1.GA</systemProperties>
</properties>
<build>
<plugins>
Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/requirements.properties
===================================================================
--- trunk/examples/tests/org.jboss.tools.project.examples.test/requirements.properties 2011-03-23 21:39:25 UTC (rev 29982)
+++ trunk/examples/tests/org.jboss.tools.project.examples.test/requirements.properties 2011-03-23 21:58:14 UTC (rev 29983)
@@ -1 +1 @@
-requirements=jbossas,seam-2.0.2.SP1
\ No newline at end of file
+requirements=jbossas,seam-2.0.1.GA
\ No newline at end of file
Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectExamplesUtil.java
===================================================================
--- trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectExamplesUtil.java 2011-03-23 21:39:25 UTC (rev 29982)
+++ trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectExamplesUtil.java 2011-03-23 21:58:14 UTC (rev 29983)
@@ -92,33 +92,13 @@
public static final String JBOSS_AS_SERVER_ID = "org.jboss.ide.eclipse.as.42";
- public static final String SEAM_HOME_PROPERTY = System.getProperty("jbosstools.test.seam.2.0.1.GA.home", "E:\\jboss-seam-2.0.2.SP1");
+ public static final String SEAM_HOME_PROPERTY = System.getProperty("jbosstools.test.seam.2.0.1.GA.home", "E:\\JBossRuntimes\\jboss-seam-2.0.1.GA");
public static final String HSQLDB_DRIVER_JAR_NAME = "hsqldb.jar"; //$NON-NLS-1$
public static final String HSQLDB_DRIVER_LOCATION = "/common/lib/" + HSQLDB_DRIVER_JAR_NAME; //$NON-NLS-1$
- public static final String PROJECT_NAME_WAR = "MavenizedSeamProjectWar";
-
- public static final String TEST_PROJECT_NAME_WAR = "MavenizedSeamProjectWar-test";
-
- public static final String PARENT_PROJECT_NAME_WAR = "MavenizedSeamProjectWar-parent";
-
-
- public static final String PROJECT_NAME = "MavenizedSeamProject";
-
- public static final String EAR_PROJECT_NAME = "MavenizedSeamProject-ear";
-
- public static final String EJB_PROJECT_NAME = "MavenizedSeamProject-ejb";
-
- public static final String TEST_PROJECT_NAME = "MavenizedSeamProject-test";
-
- public static final String PARENT_PROJECT_NAME = "MavenizedSeamProject-parent";
-
- public static final String DEPLOY_TYPE_EAR = "EAR";
-
- public static final String DEPLOY_TYPE_WAR = "WAR";
-
+
public static void initRuntimes() throws Exception {
switchPerspective("org.jboss.tools.seam.ui.SeamPerspective");
Modified: trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java
===================================================================
--- trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java 2011-03-23 21:39:25 UTC (rev 29982)
+++ trunk/examples/tests/org.jboss.tools.project.examples.test/src/org/jboss/tools/project/examples/test/ProjectTest.java 2011-03-23 21:58:14 UTC (rev 29983)
@@ -119,9 +119,17 @@
}
@Test
- public void testErrors() throws Exception {
+ public void testWarErrors() throws Exception {
checkErrors("numberguess");
+ }
+
+ @Test
+ public void testEjbErrors() throws Exception {
checkErrors("numberguess-ejb");
+ }
+
+ @Test
+ public void testEarErrors() throws Exception {
checkErrors("numberguess-ear");
}
@@ -137,6 +145,6 @@
markers.add(projectMarkers[i]);
}
}
- assertTrue("The '" + projectName + "' contains errors.", markers.size() == 0);
+ assertTrue("The '" + projectName + "' contains " + markers.size() + " error(s).", markers.size() == 0);
}
}
13 years, 9 months
JBoss Tools SVN: r29982 - in trunk/jsf/docs/userguide/en-US: images/preferences and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: mcaspers
Date: 2011-03-23 17:39:25 -0400 (Wed, 23 Mar 2011)
New Revision: 29982
Modified:
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_41.png
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_42.png
trunk/jsf/docs/userguide/en-US/images/preferences/preferences_43.png
trunk/jsf/docs/userguide/en-US/preferences.xml
Log:
"Updated screenshots, general editing"
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_41.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_42.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_43.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en-US/preferences.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/preferences.xml 2011-03-23 20:40:23 UTC (rev 29981)
+++ trunk/jsf/docs/userguide/en-US/preferences.xml 2011-03-23 21:39:25 UTC (rev 29982)
@@ -1433,7 +1433,7 @@
<?dbhtml filename="XDoclet.html"?>
<title>XDoclet</title>
<para>
- The preferences for XDoclet can be changed if you click <guilabel>XDoclet</guilabel> on the left navigation bar.
+ The preferences for XDoclet can be changed if you click <menuchoice><guimenuitem>Java EE</guimenuitem><guimenuitem>XDocklet</guimenuitem></menuchoice> on the left navigation bar.
</para>
<para>
@@ -1450,7 +1450,7 @@
</figure>
<para>
- Switch to <menuchoice><guimenuitem>XDoclet</guimenuitem><guimenuitem>ejbdoclet</guimenuitem></menuchoice> page in order to adjust settings for EJB-specific sub-tasks.
+ Switch to <menuchoice><guimenuitem>Java EE</guimenuitem><guimenuitem>XDoclet</guimenuitem><guimenuitem>ejbdoclet</guimenuitem></menuchoice> page in order to adjust settings for EJB-specific sub-tasks.
</para>
<figure>
@@ -1463,7 +1463,7 @@
</figure>
<para>
- To configure settings for various web-specific XDoclet sub-tasks, follow to <menuchoice><guimenuitem>XDoclet</guimenuitem><guimenuitem>webdoclet</guimenuitem></menuchoice> page.
+ To configure settings for various web-specific XDoclet sub-tasks, follow to <menuchoice><guimenuitem>Java EE</guimenuitem><guimenuitem>XDoclet</guimenuitem><guimenuitem>webdoclet</guimenuitem></menuchoice> page.
</para>
<figure>
13 years, 9 months