JBoss Tools SVN: r28573 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-01-24 12:47:41 -0500 (Mon, 24 Jan 2011)
New Revision: 28573
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLCustomTemplateProposal.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateCompletionProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateContentAssistComputer.java
Log:
https://issues.jboss.org/browse/JBIDE-8139 , proposals additional info has been added.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLContentAssistProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLContentAssistProcessor.java 2011-01-24 17:35:55 UTC (rev 28572)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLContentAssistProcessor.java 2011-01-24 17:47:41 UTC (rev 28573)
@@ -90,8 +90,10 @@
private void addTemplates(ITextViewer fTextViewer,
List<ICompletionProposal> contentAssistRequest,
List<String> fTemplateContexts, int startOffset) {
- if (contentAssistRequest == null)
+
+ if (contentAssistRequest == null) {
return;
+ }
// if already adding template proposals for a certain context type, do
// not add again
Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLCustomTemplateProposal.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLCustomTemplateProposal.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLCustomTemplateProposal.java 2011-01-24 17:47:41 UTC (rev 28573)
@@ -0,0 +1,23 @@
+package org.jboss.tools.jst.web.ui.editor.pref.template.contentassist;
+
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.templates.Template;
+import org.eclipse.jface.text.templates.TemplateContext;
+import org.eclipse.jface.text.templates.TemplateProposal;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.wst.sse.core.utils.StringUtils;
+import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal;
+
+public class XHTMLCustomTemplateProposal extends TemplateProposal implements
+ IRelevanceCompletionProposal {
+
+ public XHTMLCustomTemplateProposal(Template template,
+ TemplateContext context, IRegion region, Image image, int relevance) {
+ super(template, context, region, image, relevance);
+ }
+
+ public String getAdditionalProposalInfo() {
+ String additionalInfo = super.getAdditionalProposalInfo();
+ return StringUtils.convertToHTMLContent(additionalInfo);
+ }
+}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateCompletionProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateCompletionProcessor.java 2011-01-24 17:35:55 UTC (rev 28572)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateCompletionProcessor.java 2011-01-24 17:47:41 UTC (rev 28573)
@@ -31,6 +31,8 @@
import org.eclipse.jface.text.templates.persistence.TemplateStore;
import org.eclipse.swt.graphics.Image;
import org.eclipse.wst.html.ui.internal.contentassist.ReplaceNameTemplateContext;
+import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImageHelper;
+import org.eclipse.wst.html.ui.internal.editor.HTMLEditorPluginImages;
import org.jboss.tools.jst.web.ui.WebUiPlugin;
@@ -89,7 +91,7 @@
}
Collections.sort(matches, fgProposalComparator);
-
+
return (ICompletionProposal[]) matches.toArray(new ICompletionProposal[matches.size()]);
}
@@ -124,7 +126,7 @@
@Override
protected ICompletionProposal createProposal(Template template, TemplateContext context, IRegion region, int relevance) {
- return new TemplateProposal(template, context, region, getImage(template), relevance);
+ return new XHTMLCustomTemplateProposal(template, context, region, getImage(template), relevance);
}
@Override
@@ -168,7 +170,6 @@
@Override
protected Image getImage(Template template) {
- // TODO Auto-generated method stub
- return null;
+ return HTMLEditorPluginImageHelper.getInstance().getImage(HTMLEditorPluginImages.IMG_OBJ_TAG_TEMPLATE);
}
}
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateContentAssistComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateContentAssistComputer.java 2011-01-24 17:35:55 UTC (rev 28572)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateContentAssistComputer.java 2011-01-24 17:47:41 UTC (rev 28573)
@@ -141,8 +141,10 @@
private void addTemplates(ITextViewer fTextViewer,
List<ICompletionProposal> contentAssistRequest,
List<String> fTemplateContexts, int startOffset) {
- if (contentAssistRequest == null)
+
+ if (contentAssistRequest == null) {
return;
+ }
// if already adding template proposals for a certain context type, do
// not add again
13 years, 5 months
JBoss Tools SVN: r28572 - trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2011-01-24 12:35:55 -0500 (Mon, 24 Jan 2011)
New Revision: 28572
Modified:
trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsolePage.java
Log:
use IOConsoleViewer instead of TextViewer to remove nullpointer
Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsolePage.java
===================================================================
--- trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsolePage.java 2011-01-24 17:20:55 UTC (rev 28571)
+++ trunk/forge/plugins/org.jboss.tools.seam.forge/src/org/jboss/tools/seam/forge/view/ConsolePage.java 2011-01-24 17:35:55 UTC (rev 28572)
@@ -1,10 +1,10 @@
package org.jboss.tools.seam.forge.view;
-import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.ui.console.ConsoleColorProvider;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.console.TextConsoleViewer;
+import org.eclipse.ui.internal.console.IOConsoleViewer;
import org.eclipse.ui.part.Page;
import org.jboss.tools.seam.forge.runtime.Manager;
@@ -16,7 +16,7 @@
@Override
public void createControl(Composite parent) {
console = new Console(Manager.INSTANCE.getProcess(), new ConsoleColorProvider());
- viewer = new TextConsoleViewer(parent, console);
+ viewer = new IOConsoleViewer(parent, console);
console.initialize();
}
13 years, 5 months
JBoss Tools SVN: r28571 - branches.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-24 12:20:55 -0500 (Mon, 24 Jan 2011)
New Revision: 28571
Added:
branches/jbosstools-3.2.x/
Removed:
branches/jbosstools-3.2.0.CR1/
Log:
move jbosstools-3.2.0.CR1 to jbosstools-3.2.x
Copied: branches/jbosstools-3.2.x (from rev 28570, branches/jbosstools-3.2.0.CR1)
13 years, 5 months
JBoss Tools SVN: r28570 - trunk/documentation/whatsnew/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-24 12:14:34 -0500 (Mon, 24 Jan 2011)
New Revision: 28570
Modified:
trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html
Log:
[JBIDE-8157] N&N Usage reporting
Modified: trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html 2011-01-24 17:13:43 UTC (rev 28569)
+++ trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html 2011-01-24 17:14:34 UTC (rev 28570)
@@ -5,7 +5,7 @@
<meta http-equiv="Content-Language" content="en-us" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" href="../whatsnew.css" />
-<title>What's New Usage Reporting 3.2.0.CR1</title>
+<title>What's New Usage Reporting 3.2.0.CR1</title>
</head>
<body>
<h1>What's New Usage Reporting 3.2.0.CR1</h1>
13 years, 5 months
JBoss Tools SVN: r28569 - trunk/documentation/whatsnew/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-24 12:13:43 -0500 (Mon, 24 Jan 2011)
New Revision: 28569
Added:
trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html
Log:
[JBIDE-8156] N&N Usage reporting
Added: trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html 2011-01-24 17:13:43 UTC (rev 28569)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>What's New Usage Reporting 3.2.0.CR1</title>
+</head>
+<body>
+<h1>What's New Usage Reporting 3.2.0.CR1</h1>
+
+<p align="right">
+<a href="../index.html">< Main Index</a> <a
+href="../as/as-news-3.2.0.CR1.html">AS Tools</a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Erroneous long running job</b></td>
+ <td valign="top">
+ There was a bug in usage reporting that made it run and timeout even if you disabled it.
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-7801">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Missing preferences title</b></td>
+ <td valign="top">
+ The title of the preferences page was missing under certain condition, the text key was shown instead.
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-8086">Related Jira</a></small></p>
+ </td>
+ </tr>
+
+
+ </tr>
+</table>
+</body>
+</html>
Property changes on: trunk/documentation/whatsnew/usage/usage-news-3.2.0.CR1.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 5 months
JBoss Tools SVN: r28568 - trunk/documentation/whatsnew/gwt.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-24 12:03:59 -0500 (Mon, 24 Jan 2011)
New Revision: 28568
Added:
trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.CR1.html
Log:
[JBIDE-8156] N&N GWT
Added: trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.CR1.html
===================================================================
--- trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.CR1.html (rev 0)
+++ trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.CR1.html 2011-01-24 17:03:59 UTC (rev 28568)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>GWT Integration 1.0.0.Beta2 What's New</title>
+</head>
+<body>
+<h1>GWT Integration 1.0.0.CR1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a
+href="../drools/guvnor-tools-news-5.1.0.CR1.html">Guvnor Tools ></a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>JDK 1.6 supported</b></td>
+ <td valign="top">
+ <p>GWT Integration had a bug where it was possible to use it with JDK 1.6. We fixed this for CR1.</p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-8004">Related Jira</a></small></p>
+ </td>
+ </tr>
+</table>
+
+</body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/gwt/gwt-news-1.0.0.CR1.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 5 months
JBoss Tools SVN: r28567 - trunk/documentation/whatsnew/deltacloud.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-24 12:03:23 -0500 (Mon, 24 Jan 2011)
New Revision: 28567
Modified:
trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html
Log:
[JBIDE-8158] N&N deltacloud tools
Modified: trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html
===================================================================
--- trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html 2011-01-24 17:01:50 UTC (rev 28566)
+++ trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html 2011-01-24 17:03:23 UTC (rev 28567)
@@ -101,11 +101,11 @@
to browse the filesystem on your instance and to open up an ssh terminal to it. Even more important this page offers an option to create a (WTP) server adapter.
You'll be able to deploy any WTP compliant web project to you instance with it.
We also fixed a lot of bugs an improved overall stability.<br/><br/>
- launch instance, 2nd wizard page:<br/>
+ <small>launch instance, 2nd wizard page:<br/></small>
<img src="images/deltacloud-create-serveradapter.png" /><br /><br />
- remote system explorer, ssh-shell:<br/>
+ <small>remote system explorer, ssh-shell:<br/></small>
<img src="images/deltacloud-ssh-shell.png" /><br/></br>
- server adapter:<br/>
+ <small>server adapter:<br/></small>
<img src="images/deltacloud-server-adapter.png" /><br/></br>
<br />Related Jiras: <br />
<a href="https://issues.jboss.org/browse/JBIDE-7763">JBIDE-7763</a>,
13 years, 5 months
JBoss Tools SVN: r28566 - tags.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-01-24 12:01:50 -0500 (Mon, 24 Jan 2011)
New Revision: 28566
Added:
tags/jbosstools-3.2.0.CR1/
Log:
tag for jbosstools-3.2.0.CR1
Copied: tags/jbosstools-3.2.0.CR1 (from rev 28565, branches/jbosstools-3.2.0.CR1)
13 years, 5 months
JBoss Tools SVN: r28565 - trunk/documentation/whatsnew/deltacloud.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-24 11:57:18 -0500 (Mon, 24 Jan 2011)
New Revision: 28565
Modified:
trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html
Log:
[JBIDE-8158] N&N deltacloud tools
Modified: trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html
===================================================================
--- trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html 2011-01-24 16:51:50 UTC (rev 28564)
+++ trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html 2011-01-24 16:57:18 UTC (rev 28565)
@@ -12,7 +12,7 @@
<h1>Deltacloud Development Tools 0.0.1.CR1 What's New</h1>
<p align="right"><a href="../index.html">< Main Index</a> <a
- href="../gwt/gwt-news-1.0.0.Beta2.html">GWT Integration
+ href="../gwt/gwt-news-1.0.0.CR1.html">GWT Integration
></a>
</p>
<table border="0" cellpadding="10" cellspacing="0" width="80%">
13 years, 5 months
JBoss Tools SVN: r28564 - in trunk/documentation/whatsnew/deltacloud: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-24 11:51:50 -0500 (Mon, 24 Jan 2011)
New Revision: 28564
Added:
trunk/documentation/whatsnew/deltacloud/images/deltacloud-server-adapter.png
trunk/documentation/whatsnew/deltacloud/images/deltacloud-ssh-shell.png
Modified:
trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html
Log:
[JBIDE-8158] N&N deltacloud tools
Modified: trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html
===================================================================
--- trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html 2011-01-24 16:47:53 UTC (rev 28563)
+++ trunk/documentation/whatsnew/deltacloud/deltacloud-news-0.0.1.CR1.html 2011-01-24 16:51:50 UTC (rev 28564)
@@ -101,7 +101,12 @@
to browse the filesystem on your instance and to open up an ssh terminal to it. Even more important this page offers an option to create a (WTP) server adapter.
You'll be able to deploy any WTP compliant web project to you instance with it.
We also fixed a lot of bugs an improved overall stability.<br/><br/>
- <img src="images/deltacloud-create-serveradapter.png" />
+ launch instance, 2nd wizard page:<br/>
+ <img src="images/deltacloud-create-serveradapter.png" /><br /><br />
+ remote system explorer, ssh-shell:<br/>
+ <img src="images/deltacloud-ssh-shell.png" /><br/></br>
+ server adapter:<br/>
+ <img src="images/deltacloud-server-adapter.png" /><br/></br>
<br />Related Jiras: <br />
<a href="https://issues.jboss.org/browse/JBIDE-7763">JBIDE-7763</a>,
<a href="https://issues.jboss.org/browse/JBIDE-8185">JBIDE-8185</a>,
Added: trunk/documentation/whatsnew/deltacloud/images/deltacloud-server-adapter.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/deltacloud/images/deltacloud-server-adapter.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/deltacloud/images/deltacloud-ssh-shell.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/deltacloud/images/deltacloud-ssh-shell.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
13 years, 5 months