JBoss Tools SVN: r3661 - trunk/documentation/qa.
by jbosstools-commits＠lists.jboss.org
Author: anis
Date: 2007-09-17 11:34:17 -0400 (Mon, 17 Sep 2007)
New Revision: 3661
Added:
trunk/documentation/qa/coverage13092007.zip
Log:
Report - Smoke Test with EMMA 13 09 2007
Added: trunk/documentation/qa/coverage13092007.zip
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/qa/coverage13092007.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 9 months
JBoss Tools SVN: r3660 - trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2007-09-17 11:26:56 -0400 (Mon, 17 Sep 2007)
New Revision: 3660
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF
Log:
added missing require-bundles to make the project compile
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2007-09-17 15:17:51 UTC (rev 3659)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2007-09-17 15:26:56 UTC (rev 3660)
@@ -14,6 +14,8 @@
org.eclipse.wst.server.core,
org.eclipse.jst.common.project.facet.core,
org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui
+ org.eclipse.wst.common.project.facet.ui,
+ org.eclipse.debug.core,
+ org.eclipse.jdt.launching
Eclipse-LazyStart: true
Bundle-ClassPath: archivestest.jar
16 years, 9 months
JBoss Tools SVN: r3659 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-17 11:17:51 -0400 (Mon, 17 Sep 2007)
New Revision: 3659
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java
trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java
Log:
JBIDE-895
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2007-09-17 15:03:58 UTC (rev 3658)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2007-09-17 15:17:51 UTC (rev 3659)
@@ -13,6 +13,7 @@
import java.util.Properties;
import org.eclipse.core.resources.IFile;
+import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IRegion;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
@@ -23,6 +24,7 @@
import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink;
import org.jboss.tools.common.text.ext.util.StructuredModelWrapper;
import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
@@ -37,22 +39,23 @@
protected void doHyperlink(IRegion region) {
XModel xModel = getXModel();
if (xModel == null) return;
- try {
- WebPromptingProvider provider = WebPromptingProvider.getInstance();
-
- region = getRegion(region.getOffset());
- String converterID = getDocument().get(region.getOffset(), region.getLength());
- Properties p = new Properties();
- IFile file = getFile();
- if(file != null) p.put(WebPromptingProvider.FILE, file);
- provider.getList(xModel, WebPromptingProvider.JSF_OPEN_CONVERTOR, converterID, p);
- String error = p.getProperty(WebPromptingProvider.ERROR);
- if ( error != null && error.length() > 0) {
- openFileFailed();
- }
- } catch (Exception x) {
- //ignore
+ WebPromptingProvider provider = WebPromptingProvider.getInstance();
+ Properties p = new Properties();
+ region = getRegion(region.getOffset());
+ String converterID = null;
+ String error = null;
+ if(getDocument() != null && region != null) try {
+ converterID = getDocument().get(region.getOffset(), region.getLength());
+ } catch (BadLocationException x) {
+ JSFModelPlugin.getPluginLog().logError("Cannot get convertor id", x);
}
+ IFile file = getFile();
+ if(file != null) p.put(WebPromptingProvider.FILE, file);
+ provider.getList(xModel, WebPromptingProvider.JSF_OPEN_CONVERTOR, converterID, p);
+ error = p.getProperty(WebPromptingProvider.ERROR);
+ if ( error != null && error.length() > 0) {
+ openFileFailed();
+ }
}
/**
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java 2007-09-17 15:03:58 UTC (rev 3658)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java 2007-09-17 15:17:51 UTC (rev 3659)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.jsf.text.ext.hyperlink;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
@@ -92,65 +94,60 @@
}
private IDOMElement findElementByID(NodeList list, String id) {
- try {
- for (int i = 0; list != null && i < list.getLength(); i++) {
- try {
- IDOMElement element = (IDOMElement)list.item(i);
- Attr idAttr = element.getAttributeNode("id");
- if (idAttr != null) {
- String val = trimQuotes(idAttr.getNodeValue());
- if (id.equals(val)) {
- return element;
- }
- }
-
- if (element.hasChildNodes()) {
- IDOMElement child = findElementByID(element.getChildNodes(), id);
- if (child != null) return child;
- }
- } catch (Exception x) {
- // Probably not an IDOMElement
+ if(list == null || id == null) return null;
+ for (int i = 0; i < list.getLength(); i++) {
+ Node n = list.item(i);
+ if(!(n instanceof IDOMElement)) continue;
+
+ IDOMElement element = (IDOMElement)n;
+ Attr idAttr = element.getAttributeNode("id");
+ if (idAttr != null) {
+ String val = trimQuotes(idAttr.getNodeValue());
+ if (id.equals(val)) {
+ return element;
}
}
- } catch (Exception x) {
- JSFExtensionsPlugin.log("Error in looking for element by id " + id, x);
+
+ if (element.hasChildNodes()) {
+ IDOMElement child = findElementByID(element.getChildNodes(), id);
+ if (child != null) return child;
+ }
}
return null;
}
String getForId(IRegion region) {
+ if(region == null) return null;
+ IDocument document = getDocument();
+ if(document == null) return null;
try {
- return trimQuotes(getDocument().get(region.getOffset(), region.getLength()));
- } catch (Exception x) {
+ return trimQuotes(document.get(region.getOffset(), region.getLength()));
+ } catch (BadLocationException x) {
JSFExtensionsPlugin.log("", x);
return null;
}
}
private String trimQuotes(String word) {
- try {
- String attrText = word;
- int bStart = 0;
- int bEnd = word.length() - 1;
- StringBuffer sb = new StringBuffer(attrText);
+ if(word == null) return null;
+ String attrText = word;
+ int bStart = 0;
+ int bEnd = word.length() - 1;
+ StringBuffer sb = new StringBuffer(attrText);
- //find start and end of path property
- while (bStart < bEnd &&
- (sb.charAt(bStart) == '\'' || sb.charAt(bStart) == '\"' ||
- Character.isWhitespace(sb.charAt(bStart)))) {
- bStart++;
- }
- while (bEnd > bStart &&
- (sb.charAt(bEnd) == '\'' || sb.charAt(bEnd) == '\"' ||
- Character.isWhitespace(sb.charAt(bEnd)))) {
- bEnd--;
- }
- bEnd++;
- return sb.substring(bStart, bEnd);
- } catch (Exception x) {
- JSFExtensionsPlugin.log("", x);
- return word;
- }
+ //find start and end of path property
+ while (bStart < bEnd &&
+ (sb.charAt(bStart) == '\'' || sb.charAt(bStart) == '\"' ||
+ Character.isWhitespace(sb.charAt(bStart)))) {
+ bStart++;
+ }
+ while (bEnd > bStart &&
+ (sb.charAt(bEnd) == '\'' || sb.charAt(bEnd) == '\"' ||
+ Character.isWhitespace(sb.charAt(bEnd)))) {
+ bEnd--;
+ }
+ bEnd++;
+ return sb.substring(bStart, bEnd);
}
/**
16 years, 9 months
JBoss Tools SVN: r3657 - in trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf: model/handlers/bean and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-17 11:01:11 -0400 (Mon, 17 Sep 2007)
New Revision: 3657
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/ClassExistsCheck.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameFieldChange.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectBean.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectsRoot.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/JSFNature.java
Log:
JBIDE-895
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java 2007-09-17 14:08:06 UTC (rev 3656)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/DeleteManagedBeanHandler.java 2007-09-17 15:01:11 UTC (rev 3657)
@@ -12,9 +12,11 @@
import java.util.Properties;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.*;
import org.jboss.tools.common.meta.action.SignificanceMessageFactory;
+import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.meta.action.impl.handlers.DefaultRemoveHandler;
import org.jboss.tools.common.model.*;
import org.jboss.tools.common.model.plugin.ModelPlugin;
@@ -42,8 +44,9 @@
if(unregister) {
try {
if(f != null && f.exists()) f.delete(true, null);
- } catch (Exception e) {
- //ignore
+ } catch (CoreException e) {
+ ServiceDialog d = object.getModel().getService();
+ d.showDialog("Failure", "Cannot delete file " + f, new String[]{SpecialWizardSupport.CLOSE}, null, ServiceDialog.ERROR);
}
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java 2007-09-17 14:08:06 UTC (rev 3656)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/JSPAdopt.java 2007-09-17 15:01:11 UTC (rev 3657)
@@ -17,6 +17,7 @@
import org.jboss.tools.common.model.filesystems.XFileObject;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.meta.*;
+import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jsf.model.pv.JSFProjectBean;
import org.jboss.tools.jsf.project.JSFNature;
import org.jboss.tools.jsf.web.JSFWebProject;
@@ -57,12 +58,7 @@
public void adoptProperty(XModelObject target, XModelObject object, Properties p) {
if(p == null) return;
- int c = -1;
- try {
- c = Integer.parseInt(p.getProperty("pos"));
- } catch (Exception e) {
- //ignore
- }
+ int c = getPos(p);
if(c < 0) return;
String bean = object.getParent().getAttributeValue("managed-bean-name");
String name = object.getAttributeValue("property-name");
@@ -85,12 +81,7 @@
JSFUrlPattern pattern = JSFWebProject.getInstance(object.getModel()).getPatternLoader().getUrlPattern();
res = pattern.getJSFUrl(res);
}
- int pos = -1;
- try {
- pos = Integer.parseInt(p.getProperty("pos"));
- } catch (Exception e) {
- //ignore
- }
+ int pos = getPos(p);
if(res.startsWith("/") && pos >= 0 && isInsideResponseRedirect(p.getProperty("text"), pos)) {
res = res.substring(1);
}
@@ -142,12 +133,7 @@
public void adoptPropertyReference(XModelObject target, XModelObject object, Properties p) {
if(p == null) return;
- int c = -1;
- try {
- c = Integer.parseInt(p.getProperty("pos"));
- } catch (Exception e) {
- //ignore
- }
+ int c = getPos(p);
if(c < 0) return;
String s = object.getAttributeValue("name");
XModelObject o = object;
@@ -169,6 +155,19 @@
p.setProperty("start text", start);
}
+ int getPos(Properties p) {
+ int c = -1;
+ if(p == null) return -1;
+ String s = p.getProperty("pos");
+ if(s == null || s.trim().length() == 0) return c;
+ try {
+ c = Integer.parseInt(s.trim());
+ } catch (NumberFormatException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
+ }
+ return c;
+ }
+
public boolean isAdoptableMapEntry(XModelObject object) {
return "JSFMapEntry".equals(object.getModelEntity().getName());
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/ClassExistsCheck.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/ClassExistsCheck.java 2007-09-17 14:08:06 UTC (rev 3656)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/ClassExistsCheck.java 2007-09-17 15:01:11 UTC (rev 3657)
@@ -27,12 +27,9 @@
public void setModelContext(XModelObject context) {
this.context = context;
- try {
- IProject project = EclipseResourceUtil.getResource(context).getProject();
- javaProject = EclipseResourceUtil.getJavaProject(project);
- } catch (Exception e) {
- JSFModelPlugin.getPluginLog().logError(e);
- }
+ IResource resource = EclipseResourceUtil.getResource(context);
+ IProject project = resource.getProject();
+ javaProject = EclipseResourceUtil.getJavaProject(project);
qualifiedClassName = "";
existingClass = null;
valid = false;
@@ -60,7 +57,7 @@
}
try {
if(javaProject != null) existingClass = javaProject.findType(qualifiedClassName);
- } catch (Exception e) {
+ } catch (JavaModelException e) {
existingClass = null;
JSFModelPlugin.getPluginLog().logError(e);
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameFieldChange.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameFieldChange.java 2007-09-17 14:08:06 UTC (rev 3656)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/handlers/bean/JSFRenameFieldChange.java 2007-09-17 15:01:11 UTC (rev 3657)
@@ -28,15 +28,11 @@
}
private static XModel getModel(IField field) {
- try {
- IProject project = field.getJavaProject().getProject();
- if (!project.hasNature(JSFNature.NATURE_ID)) return null;
- IModelNature n = EclipseResourceUtil.getModelNature(project);
- return (n != null) ? n.getModel() : null;
- } catch (Exception e) {
- //ignore
- return null;
- }
+ if(field == null || field.getJavaProject() == null) return null;
+ IProject project = field.getJavaProject().getProject();
+ if(!JSFNature.hasJSFNature(project)) return null;
+ IModelNature n = EclipseResourceUtil.getModelNature(project);
+ return (n != null) ? n.getModel() : null;
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectBean.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectBean.java 2007-09-17 14:08:06 UTC (rev 3656)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectBean.java 2007-09-17 15:01:11 UTC (rev 3657)
@@ -60,7 +60,7 @@
if(loaded) {
try {
update();
- } catch (Exception e) {
+ } catch (JavaModelException e) {
JSFModelPlugin.getPluginLog().logError(e);
}
}
@@ -72,7 +72,7 @@
isLoading = true;
try {
update();
- } catch (Exception e) {
+ } catch (JavaModelException e) {
JSFModelPlugin.getPluginLog().logError(e);
}
isLoading = false;
@@ -84,7 +84,7 @@
return super.hasChildren();
}
- public void update() throws Exception {
+ public void update() throws JavaModelException {
if(!loaded) return;
Map<String,XModelObject> map = new HashMap<String,XModelObject>();
Set<String> properties = new HashSet<String>();
@@ -92,7 +92,7 @@
for (int i = 0; i < cs.length; i++) map.put(cs[i].getPathPart(), cs[i]);
if(type != null) {
IField[] fs = type.getFields();
- for (int i = 0; i < fs.length; i++) {
+ if(fs != null) for (int i = 0; i < fs.length; i++) {
String n = fs[i].getElementName();
JSFProjectBeanMember c = (JSFProjectBeanMember)map.get(n);
if(c != null && !c.getModelEntity().getName().equals("JSFProjectBeanProperty")) {
@@ -112,7 +112,7 @@
properties.add(n);
}
IMethod[] ms = type.getMethods();
- for (int i = 0; i < ms.length; i++) {
+ if(ms != null) for (int i = 0; i < ms.length; i++) {
if(ms[i].isConstructor()) continue;
if(!Flags.isPublic(ms[i].getFlags())) continue;
String n = ms[i].getElementName();
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectsRoot.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectsRoot.java 2007-09-17 14:08:06 UTC (rev 3656)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/pv/JSFProjectsRoot.java 2007-09-17 15:01:11 UTC (rev 3657)
@@ -12,12 +12,14 @@
import java.util.*;
import org.eclipse.core.resources.*;
+import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.event.XModelTreeEvent;
import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import org.jboss.tools.common.model.impl.ExtraRootImpl;
import org.jboss.tools.common.model.util.*;
+import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
import org.jboss.tools.jst.web.model.pv.WebProjectNode;
@@ -127,7 +129,7 @@
if(org.jboss.tools.common.model.project.WatcherLoader.isLocked(getModel())) return 0;
if(!isLoaded()) {
IProject p = EclipseResourceUtil.getProject(fs);
- try {
+ if(p != null && p.exists() && p.isAccessible()) try {
IMarker[] ms = p.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_INFINITE);
if(ms != null && ms.length > 0) {
for (int i = 0; i < ms.length; i++) {
@@ -135,8 +137,8 @@
}
}
return 0;
- } catch (Exception e) {
- //ignore
+ } catch (CoreException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
return 0;
}
}
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/JSFNature.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/JSFNature.java 2007-09-17 14:08:06 UTC (rev 3656)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/project/JSFNature.java 2007-09-17 15:01:11 UTC (rev 3657)
@@ -26,10 +26,11 @@
}
public static boolean hasJSFNature(IProject project) {
+ if(project == null || !project.isAccessible()) return false;
try {
- return project != null && project.hasNature(NATURE_ID);
- } catch (Exception e) {
- //ignore
+ return project.hasNature(NATURE_ID);
+ } catch (CoreException e) {
+ JSFModelPlugin.getPluginLog().logError(e);
return false;
}
}
16 years, 9 months
JBoss Tools SVN: r3656 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner: editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2007-09-17 10:08:06 -0400 (Mon, 17 Sep 2007)
New Revision: 3656
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/XPCOM.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
Log:
code adjustment
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/XPCOM.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/XPCOM.java 2007-09-17 13:42:37 UTC (rev 3655)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/XPCOM.java 2007-09-17 14:08:06 UTC (rev 3656)
@@ -24,6 +24,7 @@
public static final String NS_TRANSFERABLE_CONTRACTID = "@mozilla.org/widget/transferable;1"; //$NON-NLS-1$
public static final String NS_WINDOWWATCHER_CONTRACTID = "@mozilla.org/embedcomp/window-watcher;1"; //$NON-NLS-1$
public static final String NS_PREFSERVICE_CONTRACTID = "@mozilla.org/preferences-service;1"; //$NON-NLS-1$
+ public static final String IN_FLASHER_CONTRACTID = "@mozilla.org/inspector/flasher;1";
public static final String NS_IWEBBROWSER_CID = "F1EAC761-87E9-11d3-AF80-00A024FFC08C"; // $NON-NLS-1$
public static final String NS_IAPPSHELL_CID = "2d96b3df-c051-11d1-a827-0040959a28c9"; // $NON-NLS-1$
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-09-17 13:42:37 UTC (rev 3655)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor/XulRunnerEditor.java 2007-09-17 14:08:06 UTC (rev 3656)
@@ -13,7 +13,6 @@
import java.util.regex.Pattern;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
@@ -82,8 +81,6 @@
*/
private inIFlasher iFlasher;
private nsIDocShell docShell = null;
- //flasher contact id
- private static final String FLASHER_CIID="@mozilla.org/inspector/flasher;1";
/**
* RegExp for find expression 'display : none' in style string
@@ -362,7 +359,7 @@
if(iFlasher==null) {
nsIServiceManager serviceManager = Mozilla.getInstance().getServiceManager();
- iFlasher = (inIFlasher) serviceManager.getServiceByContractID(FLASHER_CIID, inIFlasher.INIFLASHER_IID);
+ iFlasher = (inIFlasher) serviceManager.getServiceByContractID(XPCOM.IN_FLASHER_CONTRACTID, inIFlasher.INIFLASHER_IID);
iFlasher.setThickness(2);
}
return iFlasher;
@@ -499,8 +496,8 @@
}
}
} else if(getIFlasher()!=null){
- //Max Areshkau (bug on Mac OS X, when we swithc to preview grom other view, selection rectangle doesn't disappear
- //TODO Max Areshkau (may be exist passability not draw selection on resize event when we swithes to other view)
+ //Max Areshkau (bug on Mac OS X, when we switch to preview from other view, selection rectangle doesn't disappear
+ //TODO Max Areshkau (may be exist passability not draw selection on resize event when we switches to other view)
try {
((nsIBaseWindow)getWebBrowser().queryInterface(nsIBaseWindow.NS_IBASEWINDOW_IID)).repaint(true);
} catch(XPCOMException ex) {
16 years, 9 months
JBoss Tools SVN: r3654 - in branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner: src/org/jboss/tools/vpe/xulrunner and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: svasilyev
Date: 2007-09-17 09:41:59 -0400 (Mon, 17 Sep 2007)
New Revision: 3654
Added:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/.options
Modified:
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java
Log:
Debug tune options were added
Added: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/.options
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/.options (rev 0)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/.options 2007-09-17 13:41:59 UTC (rev 3654)
@@ -0,0 +1,2 @@
+org.jboss.tools.vpe.xulrunner/debug=true
+org.jboss.tools.vpe.xulrunner/debug/browser_start=false
\ No newline at end of file
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2007-09-17 13:24:52 UTC (rev 3653)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/BrowserPlugin.java 2007-09-17 13:41:59 UTC (rev 3654)
@@ -1,5 +1,6 @@
package org.jboss.tools.vpe.xulrunner;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.common.log.BaseUIPlugin;
import org.osgi.framework.BundleContext;
@@ -10,11 +11,16 @@
public class BrowserPlugin extends BaseUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.tools.vpe.xulrunner.browser";
-
+ public static final String PLUGIN_ID = "org.jboss.tools.vpe.xulrunner";
+
+ public static final boolean DEBUG_BROWSERSTART;
// The shared instance
private static BrowserPlugin plugin;
+ static {
+ DEBUG_BROWSERSTART = "true".equals(Platform.getDebugOption(PLUGIN_ID + "/debug/browser_start"));
+ }
+
/**
* The constructor
*/
Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java
===================================================================
--- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java 2007-09-17 13:24:52 UTC (rev 3653)
+++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/AppFileLocProvider.java 2007-09-17 13:41:59 UTC (rev 3654)
@@ -27,35 +27,48 @@
public File getFile(String prop, boolean[] persistent) {
persistent[0] = false;
- // TODO Sergey Vasilyev remove debug output
- System.out.println("AppFileLocProvider.getFile(" + prop + ")");
+ File resultFile = null;
if ("ProfD".equals(prop)) { // $NON-NLS-1$
- return userDataPath;
+ resultFile = userDataPath;
} else if ("UHist".equals(prop)) { // $NON-NLS-1$
- return new File(userDataPath, HISTORY_FILE);
+ resultFile = new File(userDataPath, HISTORY_FILE);
} else if ("ComRegF".equals(prop)) { // $NON-NLS-1$
- return new File(userDataPath, COMPREG_FILE);
+ resultFile = new File(userDataPath, COMPREG_FILE);
} else if ("XptiRegF".equals(prop)) { // $NON-NLS-1$
- return new File(userDataPath, XPTI_FILE);
+ resultFile = new File(userDataPath, XPTI_FILE);
} else if ("GreD".equals(prop)) { // $NON-NLS-1$
- return xulRunnerPath;
- } else if ("GreComsD".equals(prop) || "ComsD".equals(prop)) { // $NON-NLS-1$ $NON-NLS-1$
- return new File(xulRunnerPath, COMPONENTS_DIRECTORY);
+ resultFile = xulRunnerPath;
+ } else if ("GreComsD".equals(prop) || "ComsD".equals(prop)) { // $NON-NLS-1$ // $NON-NLS-1$
+ resultFile = new File(xulRunnerPath, COMPONENTS_DIRECTORY);
}
+
+ if (BrowserPlugin.DEBUG_BROWSERSTART) {
+ System.out.println("AppFileLocProvider.getFile(" + prop + ")=\"" + (resultFile == null ? "null" : resultFile.toString()) + "\"");
+ }
- return null;
+ return resultFile;
}
public File[] getFiles(String prop) {
- // TODO Sergey Vasilyev remove debug output
- System.out.println("AppFileLocProvider.getFiles(" + prop + ")");
-
+ File[] resultFiles = null;
if("APluginsDL".equals(prop)) { // $NON-NLS-1$
- return new File[] {new File(xulRunnerPath, PLUGINS_DIRECTORY)};
+ resultFiles = new File[] {new File(xulRunnerPath, PLUGINS_DIRECTORY)};
}
- return null;
+ if (BrowserPlugin.DEBUG_BROWSERSTART) {
+ if (resultFiles != null) {
+ int size = resultFiles.length;
+
+ System.out.print("AppFileLocProvider.getFiles(" + prop + ")={\"");
+ for(int i=0; i<size; i++) {
+ System.out.print((i > 0 ? ", " : "") + resultFiles[i].toString());
+ }
+ System.out.println("\"}");
+ }
+ }
+
+ return resultFiles;
}
}
16 years, 9 months
JBoss Tools SVN: r3653 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-17 09:24:52 -0400 (Mon, 17 Sep 2007)
New Revision: 3653
Modified:
trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/LargeReferencedIcons.java
Log:
JBIDE-571
Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/LargeReferencedIcons.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/LargeReferencedIcons.java 2007-09-17 13:24:30 UTC (rev 3652)
+++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/icons/impl/LargeReferencedIcons.java 2007-09-17 13:24:52 UTC (rev 3653)
@@ -18,6 +18,7 @@
* @author Viacheslav Kabanovich
*/
public class LargeReferencedIcons implements ImageComponent {
+ static String DEFAULT_LARGE_ICON = "main.xstudio.palette.macro-tag-large";
ReferencedIcons ri = new ReferencedIcons();
private XStudioIcons studioicons = new XStudioIcons();
@@ -26,6 +27,10 @@
public int getHash(XModelObject obj) {
String x = obj.getAttributeValue("large icon");
if (x == null || x.trim().length() == 0) {
+ x = obj.getAttributeValue("icon");
+ if (x == null || x.trim().length() == 0) {
+ return DEFAULT_LARGE_ICON.hashCode();
+ }
return ri.getHash(obj);
}
XModelObject r = obj.getModel().getByPath(x);
@@ -35,6 +40,10 @@
public Image getImage(XModelObject obj) {
String v = obj.getAttributeValue("large icon");
if(v == null || v.trim().length() == 0) {
+ v = obj.getAttributeValue("icon");
+ if(v == null || v.trim().length() == 0) {
+ return obj.getModelEntity().getMetaModel().getIconList().getImage(DEFAULT_LARGE_ICON);
+ }
return ri.getImage(obj);
}
XModelObject ic = (v == null || v.trim().length() == 0) ? null : obj.getModel().getByPath(v);
16 years, 9 months
JBoss Tools SVN: r3652 - trunk/common/plugins/org.jboss.tools.common.model/resources/meta.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-17 09:24:30 -0400 (Mon, 17 Sep 2007)
New Revision: 3652
Modified:
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio.meta
trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_page.meta
Log:
JBIDE-571
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio.meta 2007-09-17 13:23:47 UTC (rev 3651)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio.meta 2007-09-17 13:24:30 UTC (rev 3652)
@@ -24,6 +24,7 @@
<ICON name="group" path="images/tabicons/group_icons.gif"/>
<ICON name="macro" path="images/tabicons/macro_icons.gif"/>
<ICON name="macro-tag" path="images/palette/any-tag.gif"/>
+ <ICON name="macro-tag-large" path="images/palette/any-tag-large.gif"/>
<ICON name="tab" path="images/tabicons/tab_icons.gif"/>
</GROUP>
<ICON name="icon" path="images/meta/icon.gif"/>
Modified: trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_page.meta
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_page.meta 2007-09-17 13:23:47 UTC (rev 3651)
+++ trunk/common/plugins/org.jboss.tools.common.model/resources/meta/studio_page.meta 2007-09-17 13:24:30 UTC (rev 3652)
@@ -10,10 +10,7 @@
<XChildrenEntities/>
<XEntityRenderer/>
<XModelAttributes>
- <XModelAttribute name="namespace">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ <XModelAttribute name="namespace"/>
</XModelAttributes>
<XActionItem kind="list"/>
<XDependencies/>
@@ -32,11 +29,9 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="sub-group" loader="ElementType" name="element type">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute name="name" xmlname="NAME">
- <Constraint/>
<Editor name="Name"/>
</XModelAttribute>
<XModelAttribute name="icon" xmlname="ICON">
@@ -119,11 +114,9 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="sub-group" loader="ElementType" name="element type">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="required=true" name="name" xmlname="NAME">
- <Constraint/>
<Editor name="Name"/>
</XModelAttribute>
<XModelAttribute name="icon" xmlname="ICON">
@@ -132,18 +125,9 @@
</Constraint>
<Editor name="TreeChooser"/>
</XModelAttribute>
- <XModelAttribute name="library uri" xmlname="URI">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
- <XModelAttribute name="library version" xmlname="library-version">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
- <XModelAttribute name="default prefix" xmlname="PREFIX">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ <XModelAttribute name="library uri" xmlname="URI"/>
+ <XModelAttribute name="library version" xmlname="library-version"/>
+ <XModelAttribute name="default prefix" xmlname="PREFIX"/>
<XModelAttribute default="true" name="add taglib" xmlname="add_taglib">
<Constraint loader="List">
<value name="true"/>
@@ -232,11 +216,9 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="macro" loader="ElementType" name="element type">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute name="name" xmlname="NAME">
- <Constraint/>
<Editor name="Name"/>
</XModelAttribute>
<XModelAttribute default="project" name="scope" visibility="false">
@@ -259,16 +241,19 @@
</Constraint>
<Editor name="TreeChooser"/>
</XModelAttribute>
+ <XModelAttribute name="large icon" xmlname="large-icon">
+ <Constraint loader="Tree">
+ <value name="IconsTree"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
<XModelAttribute name="description" xmlname="DESCRIPTION">
- <Constraint/>
<Editor name="Note2"/>
</XModelAttribute>
<XModelAttribute name="start text" xmlname="STARTTEXT">
- <Constraint/>
<Editor name="Note2"/>
</XModelAttribute>
<XModelAttribute name="end text" xmlname="ENDTEXT">
- <Constraint/>
<Editor name="Note2"/>
</XModelAttribute>
<XModelAttribute default="no" name="automatically reformat tag body" xmlname="REFORMAT">
@@ -314,11 +299,9 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="macro" loader="ElementType" name="element type">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="required=true" name="name" xmlname="NAME">
- <Constraint/>
<Editor name="Name"/>
</XModelAttribute>
<XModelAttribute default="project" name="scope" visibility="false">
@@ -341,20 +324,22 @@
</Constraint>
<Editor name="TreeChooser"/>
</XModelAttribute>
+ <XModelAttribute name="large icon" xmlname="large-icon">
+ <Constraint loader="Tree">
+ <value name="IconsTree"/>
+ </Constraint>
+ <Editor name="TreeChooser"/>
+ </XModelAttribute>
<XModelAttribute name="description" xmlname="DESCRIPTION">
- <Constraint/>
<Editor name="Note2"/>
</XModelAttribute>
<XModelAttribute default="HTML" name="type" visibility="false">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute name="start text" xmlname="STARTTEXT">
- <Constraint/>
<Editor name="Note2"/>
</XModelAttribute>
<XModelAttribute name="end text" xmlname="ENDTEXT">
- <Constraint/>
<Editor name="Note2"/>
</XModelAttribute>
<XModelAttribute default="no" name="automatically reformat tag body" xmlname="REFORMAT">
@@ -436,11 +421,9 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="group" loader="ElementType" name="element type">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute name="name" xmlname="NAME">
- <Constraint/>
<Editor name="Name"/>
</XModelAttribute>
<XModelAttribute default="project" name="scope" visibility="false">
@@ -457,10 +440,7 @@
</Constraint>
<Editor name="ListAdd"/>
</XModelAttribute>
- <XModelAttribute name="description" xmlname="DESCRIPTION">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ <XModelAttribute name="description" xmlname="DESCRIPTION"/>
<XModelAttribute default="HTML" name="type" visibility="false" xmlname="TABTYPE">
<Constraint loader="List">
<value name="HTML"/>
@@ -540,11 +520,9 @@
</XEntityRenderer>
<XModelAttributes>
<XModelAttribute default="group" loader="ElementType" name="element type">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute PROPERTIES="required=true" name="name" xmlname="NAME">
- <Constraint/>
<Editor name="Name"/>
</XModelAttribute>
<XModelAttribute default="project" name="scope" visibility="false">
@@ -561,12 +539,8 @@
</Constraint>
<Editor name="ListAdd"/>
</XModelAttribute>
- <XModelAttribute name="description" xmlname="DESCRIPTION">
- <Constraint/>
- <Editor/>
- </XModelAttribute>
+ <XModelAttribute name="description" xmlname="DESCRIPTION"/>
<XModelAttribute default="HTML" name="type" visibility="false" xmlname="TABTYPE">
- <Constraint/>
<Editor name="Uneditable"/>
</XModelAttribute>
<XModelAttribute default="no" name="hidden" xmlname="HIDDEN">
@@ -577,11 +551,9 @@
<Editor name="List"/>
</XModelAttribute>
<XModelAttribute name="nature type" visibility="false" xmlname="NATURE_TYPE">
- <Constraint/>
<Editor name="PaletteNatureTypesEditor"/>
</XModelAttribute>
<XModelAttribute name="editor type" visibility="false" xmlname="EDITOR_TYPE">
- <Constraint/>
<Editor name="PaletteEditorTypesEditor"/>
</XModelAttribute>
</XModelAttributes>
16 years, 9 months
JBoss Tools SVN: r3651 - trunk/common/plugins/org.jboss.tools.common.model/images/palette.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2007-09-17 09:23:47 -0400 (Mon, 17 Sep 2007)
New Revision: 3651
Added:
trunk/common/plugins/org.jboss.tools.common.model/images/palette/any-tag-large.gif
Log:
JBIDE-571
Added: trunk/common/plugins/org.jboss.tools.common.model/images/palette/any-tag-large.gif
===================================================================
(Binary files differ)
Property changes on: trunk/common/plugins/org.jboss.tools.common.model/images/palette/any-tag-large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 9 months
JBoss Tools SVN: r3650 - trunk/documentation/GettingStartedGuide/docs/userguide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2007-09-17 08:48:30 -0400 (Mon, 17 Sep 2007)
New Revision: 3650
Modified:
trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/DevelopAsimpleJSPWebApplication.xml
Log:
http://jira.jboss.com/jira/browse/RHDS-160
language is corrected
Modified: trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/DevelopAsimpleJSPWebApplication.xml
===================================================================
--- trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/DevelopAsimpleJSPWebApplication.xml 2007-09-17 12:43:03 UTC (rev 3649)
+++ trunk/documentation/GettingStartedGuide/docs/userguide/en/modules/DevelopAsimpleJSPWebApplication.xml 2007-09-17 12:48:30 UTC (rev 3650)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter id="DevelopASimpleWebApplication" xreflabel="DevelopASimpleWebApplication">
- <?dbhtml filename="DevelopASimpleWebApplication.html"?>
+<chapter id="DevelopingASimpleWebApplication" xreflabel="DevelopingASimpleWebApplication">
+ <?dbhtml filename="DevelopingASimpleWebApplication.html"?>
<chapterinfo>
<keywordset>
<keyword>Red Hat Developer Studio</keyword>
@@ -8,16 +8,16 @@
<keyword>JBoss</keyword>
</keywordset>
</chapterinfo>
- <title>Develop a simple JSP web application</title>
- <para>In this chapter we are going to show you how to create a simple JSP application using the Red Hat Developer Studio. The application will show a classic "Hello World!" on the page.</para>
- <para>We'll assume that you have already launched Red Hat Developer Studio installed and
+ <title>Developing a simple JSP web application</title>
+ <para>In this you'll find out how to create a simple JSP application using the Red Hat Developer Studio. The application will show a classic "Hello World!" on the page.</para>
+ <para>We'll assume that you have already launched Red Hat Developer Studio and
also that the Red Hat perspective is the current perspective. (If not, make it active by selecting <emphasis>Window/Open Perspective/Red Hat Developer Studio</emphasis> from the menu bar or by selecting <emphasis>Window/
Open Perspective/Other...</emphasis> from the menu bar and then selecting Red Hat Developer Studio from
the Select Perspective dialog box.)</para>
<section id="SettingUpTheProject">
<?dbhtml filename="SettingUpTheProject.html"?>
<title>Setting Up the Project</title>
- <para>We are first going to create a new project for the application.</para>
+ <para>At first a new project for the application will be created.</para>
<orderedlist>
<listitem><para>Go to the menu bar and select <emphasis>File/New/Project...</emphasis></para></listitem>
<listitem><para>Select <emphasis>Web/Dynamic Web Project</emphasis> in the New Project dialog box</para></listitem>
@@ -47,7 +47,7 @@
<section id="CreatingJSPPage">
<?dbhtml filename="CreatingJSPPage.html"?>
<title>Creating JSP Page</title>
- <para>In our simple application we need to create only one JSP page which will display a "Hello World!" message.</para>
+ <para>In our simple application we need to create only one JSP page which displays a "Hello World!" message.</para>
<orderedlist continuation="continues">
<listitem><para>Right click <emphasis>WebContent > New > JSP.</emphasis></para></listitem>
<listitem><para>Type "hello.jsp" for file name and click Next button.</para></listitem>
@@ -67,8 +67,8 @@
<para>Our hello.jsp page will now appear in Project Explorer.</para>
<section id="EditingJSPPage">
<?dbhtml filename="EditingJSPPage.html"?>
- <title>Editing JSP Page</title>
- <para>Let's now make a little change so that jsp page displays "Hello World!" message.</para>
+ <title>Editing a JSP Page</title>
+ <para>Let's now make a little change so that a jsp page displays "Hello World!" message.</para>
<orderedlist continuation="continues">
<listitem><para>Insert this line inside the <emphasis role="bold"><property><body></property></emphasis><emphasis role="bold"><property></body></property></emphasis> tag:
</para></listitem>
@@ -76,7 +76,7 @@
<programlisting role="XML"><![CDATA[<% out.println("Hello World!"); %>]]>
</programlisting>
-<para>Notice that content assist is always available when you are typing:</para>
+<para>Notice that content assist functionality is always available when you are typing:</para>
<figure>
<title>Content Assist in JSP page</title>
<mediaobject>
@@ -129,8 +129,8 @@
<section id="DeployTheProject">
<?dbhtml filename="DeployTheProject.html"?>
- <title>Deploy the project</title>
- <para>While creating any web project one is usually experiencing a pain writing ant scripts and managing the
+ <title>Deploying the project</title>
+ <para>While creating any web project you could experience a pain writing ant scripts and managing the
packaging even if a developer is writing the most trivial web applications. With Red Hat Developer Studio you are saved from such a pain. All you need is start JBoss server and launch your application in your favorite browser.</para>
<para>You can also create a war archive with RHDS's Archive Tools and export it to any web server.</para>
<section id="WarConfig">
@@ -171,7 +171,7 @@
<section id="LaunchingTheProject">
<?dbhtml filename="LaunchingTheProject.html"?>
<title>Launch JSP Project</title>
- <para>Let's now launch our project on server. We'll be using JBoss server that ships with Red Hat Developer Studio.</para>
+ <para>Let's now launch our project on server. We'll use JBoss server that is shiped with Red Hat Developer Studio.</para>
<orderedlist continuation="continues">
<listitem><para>Start JBoss server from JBoss Server view by clicking the Start icon.</para></listitem>
</orderedlist>
@@ -184,7 +184,7 @@
</mediaobject>
</figure>
<orderedlist continuation="continues">
-<listitem><para>Click the Run icon or right click your project folder and select <emphasis>Run on Server</emphasis>. If you haven't made any changes in web.xml file or cleared it out you can launch the application by right clicking the hello.jsp page and selecting <emphasis>Run on Server</emphasis>.</para></listitem>
+<listitem><para>Click the Run icon or right click your project folder and select <emphasis>Run on Server</emphasis>. If you haven't made any changes in web.xml file or cleared it out you can launch the application by right clicking the hello.jsp page and selecting <emphasis>Run on the Server</emphasis>.</para></listitem>
</orderedlist>
<figure>
<title>Run project</title>
@@ -194,7 +194,7 @@
</imageobject>
</mediaobject>
</figure>
- <para>You should see in browser the next page:</para>
+ <para>You should see the next page in a browser :</para>
<figure>
<title>Running project</title>
<mediaobject>
16 years, 9 months