JBoss Tools SVN: r38860 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-17 02:06:33 -0500 (Fri, 17 Feb 2012)
New Revision: 38860
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
Log:
/JBIDE-10518 - fixed
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2012-02-17 05:46:21 UTC (rev 38859)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2012-02-17 07:06:33 UTC (rev 38860)
@@ -11,17 +11,17 @@
package org.jboss.ide.eclipse.as.ui.editor;
import java.util.ArrayList;
-import java.util.Iterator;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
@@ -121,6 +121,7 @@
IJBossServerConstants.JNDI_PORT_DETECT,
IJBossServerConstants.JNDI_PORT,
IJBossServerConstants.JNDI_PORT_DEFAULT_XPATH,
+ IJBossToolingConstants.JNDI_DEFAULT_PORT,
Messages.EditorChangeJNDICommandName);
}
}
@@ -132,6 +133,7 @@
IJBossServerConstants.WEB_PORT_DETECT,
IJBossServerConstants.WEB_PORT,
IJBossServerConstants.WEB_PORT_DEFAULT_XPATH,
+ IJBossToolingConstants.JBOSS_WEB_DEFAULT_PORT,
Messages.EditorChangeWebCommandName);
}
}
@@ -143,6 +145,7 @@
IJBoss6Server.JMX_RMI_PORT_DETECT,
IJBoss6Server.JMX_RMI_PORT,
IJBoss6Server.JMX_RMI_PORT_DEFAULT_XPATH,
+ IJBoss6Server.JMX_RMI_DEFAULT_PORT,
Messages.EditorChangeJMXRMICommandName);
}
}
@@ -154,6 +157,7 @@
IJBossToolingConstants.AS7_MANAGEMENT_PORT_DETECT,
IJBossToolingConstants.AS7_MANAGEMENT_PORT,
IJBossToolingConstants.AS7_MANAGEMENT_PORT_DEFAULT_XPATH,
+ IJBossToolingConstants.AS7_MANAGEMENT_PORT_DEFAULT_PORT,
Messages.EditorChangeAS7ManagementCommandName);
}
}
@@ -169,8 +173,12 @@
protected ServerAttributeHelper helper;
protected Listener listener;
protected PortSection section;
+ protected int defaultValue;
+ private ControlDecoration decoration;
+
public PortEditorExtension(String labelText, String currentXPathKey,
String detectXPathKey, String overrideValueKey, String defaultXPath,
+ int defaultValue,
String changeValueCommandName) {
this.labelText = labelText;
this.currentXPathKey = currentXPathKey;
@@ -178,6 +186,7 @@
this.overrideValueKey = overrideValueKey;
this.defaultXPath = defaultXPath;
this.changeValueCommandName = changeValueCommandName;
+ this.defaultValue = defaultValue;
}
public void setServerAttributeHelper(ServerAttributeHelper helper) {
this.helper = helper;
@@ -189,6 +198,13 @@
createUI(parent);
initialize();
addListeners();
+
+ decoration = new ControlDecoration(text,
+ SWT.LEFT | SWT.TOP);
+ FieldDecoration fieldDecoration = FieldDecorationRegistry.getDefault()
+ .getFieldDecoration(FieldDecorationRegistry.DEC_WARNING);
+ decoration.setImage(fieldDecoration.getImage());
+ validate();
}
protected void createUI(Composite parent) {
@@ -228,9 +244,9 @@
text.setEnabled(!shouldDetect);
text.setEditable(!shouldDetect);
currentXPath = helper.getAttribute(currentXPathKey, defaultXPath);
- if( shouldDetect )
- text.setText(findPort(helper.getServer(), new Path(currentXPath)));
- else
+ if( shouldDetect ) {
+ text.setText(findPortWithDefault(helper.getServer(), new Path(currentXPath), defaultValue));
+ } else
text.setText(helper.getAttribute(overrideValueKey, "")); //$NON-NLS-1$
}
protected void addListeners() {
@@ -275,10 +291,25 @@
public String getValue() {
return text.getText();
}
+ public void validate() {
+ decoration.hide();
+ String v = null;
+ String errorText;
+ if( detect.getSelection()) {
+ v = findPort(helper.getServer(), new Path(defaultXPath));
+ errorText = "This port cannot be automatically located. A default value is being displayed";
+ } else {
+ v = text.getText();
+ errorText = "The empty string is not a valid port.";
+ }
+ if( "".equals(v)) {
+ decoration.setDescriptionText(errorText);
+ decoration.show();
+ }
+ }
}
protected void createUI(Composite parent) {
-
FormToolkit toolkit = new FormToolkit(parent.getDisplay());
Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR);
section.setText(Messages.EditorServerPorts);
@@ -296,14 +327,12 @@
addUIAdditions(composite, description);
toolkit.paintBordersFor(composite);
section.setClient(composite);
- getSaveStatus();
}
private void addUIAdditions(Composite parent, Control top) {
IPortEditorExtension[] extensions = (IPortEditorExtension[]) sectionList.toArray(new IPortEditorExtension[sectionList.size()]);
FormData data;
- Control c;
Composite wrapper = new Composite(parent, SWT.NONE);
GridLayoutFactory.fillDefaults().margins(6, 10).numColumns(4).applyTo(wrapper);
data = new FormData();
@@ -342,6 +371,8 @@
String xpath;
Link link;
PortSection pSection;
+ int defVal;
+ PortEditorExtension ext;
public SetPortCommand(IServerWorkingCopy server, ServerAttributeHelper helper, String name,
String textAttribute, String overrideAttribute, String overridePathAttribute,
String pathDefault, PortEditorExtension ext) { //Text text, Button button, String xpath, Listener listener) {
@@ -356,13 +387,15 @@
this.listener = ext.listener;
this.xpath = ext.currentXPath;
this.link = ext.link;
- pSection = ext.section;
+ this.pSection = ext.section;
+ this.defVal = ext.defaultValue;
+ this.ext = ext;
}
public void execute() {
preText = helper.getAttribute(textAttribute, (String)null);
if( preText == null )
- preText = findPort(helper.getServer(), new Path(defaultPath));
+ preText = text.getText();
prePath = helper.getAttribute(overridePathAttribute, (String)defaultPath);
preOverride = helper.getAttribute(overrideAttribute, true);
helper.setAttribute(textAttribute, text.getText());
@@ -374,10 +407,10 @@
text.setEditable(!button.getSelection());
if( button.getSelection() ) {
text.removeListener(SWT.Modify, listener);
- text.setText(findPort(helper.getServer(), new Path(xpath)));
+ text.setText(findPortWithDefault(helper.getServer(), new Path(xpath), this.defVal));
text.addListener(SWT.Modify, listener);
}
- pSection.getSaveStatus();
+ validate();
}
public void undo() {
@@ -397,11 +430,22 @@
text.setEditable(!preOverride);
button.addListener(SWT.Selection, listener);
text.addListener(SWT.Modify, listener);
-
- pSection.getSaveStatus();
+ validate();
}
+
+ private void validate() {
+ ext.validate();
+ }
}
+ protected static String findPortWithDefault(IServer server, IPath path, int defaultValue) {
+ String s = findPort(server, path);
+ if( s.equals("")) { //$NON-NLS-1$
+ s = new Integer(defaultValue).toString();
+ }
+ return s;
+ }
+
protected static String findPort(IServer server, IPath path) {
XPathQuery query = XPathModel.getDefault().getQuery(server, path);
String result = ""; //$NON-NLS-1$
@@ -418,26 +462,4 @@
}
return result;
}
-
- public IStatus[] getSaveStatus() {
- Iterator<IPortEditorExtension> i = sectionList.iterator();
- IPortEditorExtension ext1;
- int temp;
- boolean errorFound = false;
- while(i.hasNext()) {
- ext1 = i.next();
- try {
- temp = Integer.parseInt(ext1.getValue());
- if( temp < 0 )
- errorFound = true;
- } catch(NumberFormatException nfe) {
- errorFound = true;
- }
- }
- setErrorMessage(errorFound ? Messages.EditorPortInvalid : null);
- return errorFound ?
- new IStatus[] { new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, Messages.EditorPortInvalid)}
- : new IStatus[]{};
- }
-
}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38859 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-17 00:46:21 -0500 (Fri, 17 Feb 2012)
New Revision: 38859
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
JBIDE-10935 The project examples component now depends on the runtime component. The runtime component doesn't depend on the project examples anymore. {snjezana}
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-02-17 05:46:11 UTC (rev 38858)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-02-17 05:46:21 UTC (rev 38859)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2011/10/24
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/02/17
See also https://svn.jboss.org/repos/jbosstools/trunk/build/ -> pom*.xml
@@ -33,14 +33,14 @@
New in 3.3:
forge -> [none]
-examples -> portlet, jst
+examples -> portlet, jst, runtime
teiid, runtime -> tests
portlet -> seam, as, tests, usage
tptp [REMOVED]
smooks [removed from JBDS, still in JBT]
seam -> hibernate, jsf
central -> examples, portlet, seam, as, archives, jmx, jsf, vpe, jst, hibernate, freemarker, runtime, common, tests
-runtime -> common, tests, jmx, examples
+runtime -> common, tests, jmx
esb -> as, jst, common, tests
cdi -> jst
(all but common and tests) -> usage
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38858 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-17 00:46:11 -0500 (Fri, 17 Feb 2012)
New Revision: 38858
Modified:
trunk/build/pom-core.xml
trunk/build/pom.xml
Log:
JBIDE-10935 The project examples component now depends on the runtime component.
The runtime component doesn't depend on the project examples anymore. {snjezana}
Modified: trunk/build/pom-core.xml
===================================================================
--- trunk/build/pom-core.xml 2012-02-17 05:29:38 UTC (rev 38857)
+++ trunk/build/pom-core.xml 2012-02-17 05:46:11 UTC (rev 38858)
@@ -422,7 +422,11 @@
<profile>
<id>examples-bootstrap</id>
<modules>
- <module>../tests</module>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jmx</module>
+ <module>../usage</module>
+ <module>../runtime</module>
<module>../examples</module>
</modules>
</profile>
@@ -527,7 +531,6 @@
<module>../common</module>
<module>../jmx</module>
<module>../usage</module>
- <module>../examples</module>
<module>../runtime</module>
</modules>
</profile>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-02-17 05:29:38 UTC (rev 38857)
+++ trunk/build/pom.xml 2012-02-17 05:46:11 UTC (rev 38858)
@@ -487,8 +487,12 @@
<profile>
<id>examples-bootstrap</id>
<modules>
- <module>../tests</module>
- <module>../examples</module>
+ <module>../tests</module>
+ <module>../common</module>
+ <module>../jmx</module>
+ <module>../usage</module>
+ <module>../runtime</module>
+ <module>../examples</module>
</modules>
</profile>
@@ -647,7 +651,6 @@
<module>../common</module>
<module>../jmx</module>
<module>../usage</module>
- <module>../examples</module>
<module>../runtime</module>
</modules>
</profile>
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38857 - in trunk/as/docs/reference/en-US: images/perspective and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-02-17 00:29:38 -0500 (Fri, 17 Feb 2012)
New Revision: 38857
Modified:
trunk/as/docs/reference/en-US/images/perspective/perspective_4b.png
trunk/as/docs/reference/en-US/perspective.xml
Log:
updated for new screen
Modified: trunk/as/docs/reference/en-US/images/perspective/perspective_4b.png
===================================================================
(Binary files differ)
Modified: trunk/as/docs/reference/en-US/perspective.xml
===================================================================
--- trunk/as/docs/reference/en-US/perspective.xml 2012-02-17 05:23:20 UTC (rev 38856)
+++ trunk/as/docs/reference/en-US/perspective.xml 2012-02-17 05:29:38 UTC (rev 38857)
@@ -673,10 +673,10 @@
</mediaobject>
</figure>
<para>
- If you created a remote server then you will see that the checkbox, <guilabel>Server is externally managed. Assume server is started</guilabel> is checked and the combo-box displays <guilabel>Remote System Deployment</guilabel>. Also populated will be the <guilabel>Host</guilabel>, <guilabel>Remote Server Home</guilabel> and <guilabel>Remote Server Configuration</guilabel> fields.
+ If you created a remote server then you will see that the combo-box displays <guilabel>Remote System Deployment</guilabel>. Also populated will be the <guilabel>Host</guilabel> and <guilabel>Remote Server Home</guilabel> settings.
</para>
<para>
- You are also able to change a servers behaviour from <guilabel>Local</guilabel> to <guilabel>Remote System Deployment</guilabel> through this settings tab. In doing so you will see that the <guilabel>Host</guilabel> is not set by default, but the other fields contain default values. Once your remote server behaviour is configured, click the <guibutton>Test</guibutton> button to confirm the settings are correct.
+ You are also able to change a servers behaviour from <guilabel>Local</guilabel> to <guilabel>Remote System Deployment</guilabel> through this settings tab. In doing so you will see that the <guilabel>Host</guilabel> is not set by default, but the other fields contain default values. <!-- Once your remote server behaviour is configured, click the <guibutton>Test</guibutton> button to confirm the settings are correct. -->
</para>
<figure>
<title>Server Behaviour - Remote</title>
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38856 - in trunk/build/results: surefire-reports and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-02-17 00:23:20 -0500 (Fri, 17 Feb 2012)
New Revision: 38856
Added:
trunk/build/results/surefire-reports/
trunk/build/results/surefire-reports/NoTestsRun/
trunk/build/results/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml
Log:
https://issues.jboss.org/browse/JBIDE-10690 instead of needing collect-test-results.xml, use an empty test results file, surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml
Added: trunk/build/results/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml
===================================================================
--- trunk/build/results/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml (rev 0)
+++ trunk/build/results/surefire-reports/NoTestsRun/TEST-org.jboss.tools.NoTestsRun.xml 2012-02-17 05:23:20 UTC (rev 38856)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite failures="0" time="0.001" errors="0" skipped="0" tests="1" name="org.jboss.tools.NoTestsRun">
+<testcase time="0.001" classname="org.jboss.tools.NoTestsRun" name="NoTestsRun"/>
+</testsuite>
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38855 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-16 23:37:16 -0500 (Thu, 16 Feb 2012)
New Revision: 38855
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
Log:
JBIDE-10715 - path separator issue
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-02-17 01:54:36 UTC (rev 38854)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2012-02-17 04:37:16 UTC (rev 38855)
@@ -157,7 +157,7 @@
@Override
public HashMap<String, String> getDefaultRunEnvVars(){
HashMap<String, String> envVars = new HashMap<String, String>(1);
- envVars.put("PATH", NATIVE + ":${env_var:PATH}"); //$NON-NLS-1$ //$NON-NLS-2$
+ envVars.put("PATH", NATIVE + System.getProperty("path.separator") + "${env_var:PATH}"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
return envVars;
}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38854 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui: META-INF and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-16 20:54:36 -0500 (Thu, 16 Feb 2012)
New Revision: 38854
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/
trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-as7.xml
trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-default.xml
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
Log:
JBIDE-10787
https://issues.jboss.org/browse/JBIDE-10787
Implementation for New DS XML wizard for an arbitrary project.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2012-02-17 01:41:09 UTC (rev 38853)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/META-INF/MANIFEST.MF 2012-02-17 01:54:36 UTC (rev 38854)
@@ -47,6 +47,9 @@
org.jboss.tools.common.ui,
org.jboss.tools.jst.web.kb,
org.eclipse.ui.forms;bundle-version="3.5.100",
+ org.apache.ant;bundle-version="1.7.1",
+ org.eclipse.datatools.connectivity.ui.dse;bundle-version="1.1.4",
+ org.eclipse.datatools.connectivity.db.generic.ui;bundle-version="1.0.1",
org.jboss.tools.common.el.ui
Bundle-Version: 3.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2012-02-17 01:41:09 UTC (rev 38853)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2012-02-17 01:54:36 UTC (rev 38854)
@@ -191,6 +191,19 @@
<selection class="org.eclipse.core.resources.IResource">
</selection>
</wizard>
+ <wizard
+ name="New DS XML"
+ icon="$nl$/images/xstudio/wizards/new_properties_file.gif"
+ category="org.jboss.tools.jst.web"
+ class="org.jboss.tools.jst.web.ui.wizards.newfile.NewDSXMLWizard"
+ id="org.jboss.tools.jst.web.ui.wizards.newfile.NewDSXMLWizard">
+ <description>
+ Creates New DS XML file
+ </description>
+ <selection
+ class="org.eclipse.core.resources.IResource">
+ </selection>
+ </wizard>
</extension>
<extension id="org.jboss.tools.jst.web.ui.views" name="JBoss Tools" point="org.eclipse.ui.views">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2012-02-17 01:41:09 UTC (rev 38853)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2012-02-17 01:54:36 UTC (rev 38854)
@@ -85,6 +85,13 @@
public static String NewXHTMLTemplatesWizardPage_6;
public static String NewXHTMLTemplatesWizardPage_7;
+ public static String NewDSXMLWizard_TITLE;
+ public static String NewDSXMLWizard_DESCRIPTION;
+ public static String NewDSXMLWizard_CONNECTION_PROFILE_FIELD;
+ public static String NewDSXMLWizard_TEMPLATE_FIELD;
+ public static String NewDSXMLWizard_EDIT_BUTTON;
+ public static String NewDSXMLWizard_NEW_BUTTON;
+
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-02-17 01:41:09 UTC (rev 38853)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-02-17 01:54:36 UTC (rev 38854)
@@ -77,3 +77,10 @@
UI_WIZARD_XHTML_NEW_TITLE=New XHTML Page
UI_WIZARD_XHTML_NEW_Description=Create New XHTML Page
+
+NewDSXMLWizard_TITLE=New DS XML File
+NewDSXMLWizard_DESCRIPTION=Create New DS XML
+NewDSXMLWizard_CONNECTION_PROFILE_FIELD=Connection profile:
+NewDSXMLWizard_TEMPLATE_FIELD=Template:
+NewDSXMLWizard_EDIT_BUTTON=Edit...
+NewDSXMLWizard_NEW_BUTTON=New...
Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-02-17 01:54:36 UTC (rev 38854)
@@ -0,0 +1,773 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.ui.wizards.newfile;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.apache.tools.ant.types.FilterSet;
+import org.apache.tools.ant.types.FilterSetCollection;
+import org.apache.tools.ant.types.resources.FileResource;
+import org.apache.tools.ant.types.resources.StringResource;
+import org.apache.tools.ant.util.ResourceUtils;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.datatools.connectivity.ConnectionProfileException;
+import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.IProfileListener;
+import org.eclipse.datatools.connectivity.ProfileManager;
+import org.eclipse.datatools.connectivity.db.generic.ui.NewConnectionProfileWizard;
+import org.eclipse.datatools.connectivity.drivers.DriverManager;
+import org.eclipse.datatools.connectivity.internal.ui.wizards.NewCPWizard;
+import org.eclipse.datatools.connectivity.internal.ui.wizards.NewCPWizardCategoryFilter;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.internal.dialogs.DialogUtil;
+import org.eclipse.ui.internal.dialogs.PropertyDialog;
+import org.eclipse.ui.internal.wizards.newresource.ResourceMessages;
+import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
+import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.jboss.tools.common.ui.IValidator;
+import org.jboss.tools.common.ui.ValidatorFactory;
+import org.jboss.tools.common.ui.widget.editor.ButtonFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.ComboFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.CompositeEditor;
+import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
+import org.jboss.tools.common.ui.widget.editor.IFieldEditorFactory;
+import org.jboss.tools.common.ui.widget.editor.ITaggedFieldEditor;
+import org.jboss.tools.common.zip.UnzipOperation;
+import org.jboss.tools.jst.web.ui.Messages;
+import org.jboss.tools.jst.web.ui.WebUiPlugin;
+import org.osgi.framework.Bundle;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class NewDSXMLWizard extends BasicNewResourceWizard {
+ public static final String WIZARD_ID = "org.jboss.tools.seam.ui.wizard.SeamDSXMLWizard"; //$NON-NLS-1$
+
+ WizardNewDSXMLFileCreationPage mainPage;
+
+ private boolean fOpenEditorOnFinish;
+
+ public NewDSXMLWizard() {
+ }
+
+ public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
+ super.init(workbench, currentSelection);
+ setWindowTitle(Messages.NewDSXMLWizard_TITLE);
+ }
+
+ public void addPages() {
+ super.addPages();
+ mainPage = new WizardNewDSXMLFileCreationPage("newFilePage1", getSelection()); //$NON-NLS-1$
+ mainPage.setTitle(Messages.NewDSXMLWizard_TITLE);
+ mainPage.setDescription(Messages.NewDSXMLWizard_DESCRIPTION);
+
+ mainPage.setFileName("ds.xml");
+
+ addPage(mainPage);
+ }
+
+ @Override
+ public boolean performFinish() {
+ IFile file = mainPage.createNewFile();
+ if (file == null) {
+ return false;
+ }
+
+ selectAndReveal(file);
+ if (fOpenEditorOnFinish) {
+ // Open editor on new file.
+ IWorkbenchWindow dw = getWorkbench().getActiveWorkbenchWindow();
+ try {
+ if (dw != null) {
+ IWorkbenchPage page = dw.getActivePage();
+ if (page != null) {
+ IDE.openEditor(page, file, true);
+ }
+ }
+ } catch (PartInitException e) {
+ DialogUtil.openError(dw.getShell(), ResourceMessages.FileResource_errorMessage, e.getMessage(), e);
+ }
+ }
+ return true;
+ }
+
+ class WizardNewDSXMLFileCreationPage extends WizardNewFileCreationPage {
+ private IFieldEditor connProfileSelEditor;
+ private IFieldEditor templateSelEditor;
+
+ public WizardNewDSXMLFileCreationPage(String pageName, IStructuredSelection selection) {
+ super(pageName, selection);
+ }
+
+ protected InputStream getInitialContents() {
+ String connection = connProfileSelEditor.getValueAsString();
+ String templateName = templateSelEditor.getValueAsString();
+
+ try {
+ // 1. Find template. For Seam project it is done by its runtime.
+ IPath containerPath = getContainerFullPath();
+ IProject currentProject = ResourcesPlugin.getWorkspace().getRoot().getFolder(containerPath).getProject();
+
+ File homePath = DSDataModelProvider.getTemplatesFolder();
+ String templatePath = (NewDSXMLWizardFactory.TEMPLATE_LIST[1].equals(templateName))
+ ? "/Datasource/datasource-ds-as7.xml" //$NON-NLS-1$
+ : "/Datasource/datasource-ds-default.xml"; //$NON-NLS-1$
+ File dataSourceDsFile = new File(homePath, templatePath);
+
+ //2. Create filter set for Ant.
+ FilterSetCollection viewFilterSetCollection = new FilterSetCollection();
+
+ // Do it by reusing data model provider.
+ IDataModel model = DataModelFactory.createDataModel(new DSDataModelProvider());
+ model.setProperty(IDSDataModelProperties.PROJECT_NAME, currentProject.getName());
+ model.setProperty(IDSDataModelProperties.CONNECTION_PROFILE, connection);
+ IConnectionProfile connProfile = ProfileManager.getInstance().getProfileByName(connection.toString());
+ if(connProfile == null) {
+ return null;
+ }
+ DSDataModelProvider.applyConnectionProfile(currentProject, model);
+ FilterSet jdbcFilterSet = FilterSetFactory.createJdbcFilterSet(model);
+ FilterSet projectFilterSet = FilterSetFactory.createProjectFilterSet(model);
+
+ viewFilterSetCollection.addFilterSet(jdbcFilterSet);
+ viewFilterSetCollection.addFilterSet(projectFilterSet);
+
+ // 3. Run Ant - copy template with replaces to StringResource.
+ StringResource sr = new StringResource();
+
+ ResourceUtils.copyResource(new FileResource(dataSourceDsFile), sr, viewFilterSetCollection,
+ null, true, false, false, null, null, null, false);
+
+ // 4. Return input stream for new ds file taken from StringResource.
+ return sr.getInputStream();
+ } catch (IOException e) {
+ WebUiPlugin.getDefault().logError(e);
+ return null;
+ }
+ }
+
+ public void createControl(Composite parent) {
+ super.createControl(parent);
+ Composite topLevel = (Composite)getControl();
+ connProfileSelEditor = NewDSXMLWizardFactory.createConnectionProfileSelectionFieldEditor(getConnectionProfileDefaultValue(), new IValidator() {
+ public Map<String, IStatus> validate(Object value, Object context) {
+ validatePage();
+ return ValidatorFactory.NO_ERRORS;
+ }
+ }, false);
+ templateSelEditor = NewDSXMLWizardFactory.createTemplateFieldEditor(NewDSXMLWizardFactory.TEMPLATE_LIST[0]);
+ Composite q = new Composite(topLevel, 0);
+ GridLayout l = new GridLayout(4, false);
+ q.setLayout(l);
+ connProfileSelEditor.doFillIntoGrid(q);
+ templateSelEditor.doFillIntoGrid(q);
+// sync.register(connProfileSelEditor);
+ validatePage();
+ }
+
+ }
+
+ /**
+ * @return
+ */
+ private Object getConnectionProfileDefaultValue() {
+ List<String> values = getConnectionProfileNameList();
+ String defaultDs = ""; // Use preference, or dialog settings?
+ return values.contains(defaultDs) ? defaultDs
+ : !values.isEmpty() ? values.get(0) : ""; //$NON-NLS-1$
+ }
+
+ private static List<String> getConnectionProfileNameList() {
+ IConnectionProfile[] profiles = ProfileManager.getInstance()
+ .getProfilesByCategory(
+ "org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$
+ List<String> names = new ArrayList<String>();
+ for (IConnectionProfile connectionProfile : profiles) {
+ names.add(connectionProfile.getName());
+ }
+ return names;
+ }
+
+}
+
+interface IDSDataModelProperties {
+
+ String PROJECT_NAME = "project.name"; //$NON-NLS-1$
+
+ /**
+ * Connection profile name
+ */
+ String CONNECTION_PROFILE = "connection.profile"; //$NON-NLS-1$
+
+ String TEMPLATE = "template"; //$NON-NLS-1$
+
+ /**
+ * Connection user name token
+ */
+ String DB_USER_NAME = "hibernate.connection.username"; //$NON-NLS-1$
+ String DATATOOLS_DB_USER_NAME = "org.eclipse.datatools.connectivity.db.username"; //$NON-NLS-1$
+
+ /**
+ * JDBC driver class name token
+ */
+ String JDBC_DRIVER_CLASS_NAME = "hibernate.connection.driver_class"; //$NON-NLS-1$
+ String DATATOOLS_JDBC_DRIVER_CLASS_NAME = "org.eclipse.datatools.connectivity.db.driverClass"; //$NON-NLS-1$
+
+ /**
+ * Connection user name password
+ */
+ String DB_USER_PASSWORD = "hibernate.connection.password"; //$NON-NLS-1$
+ String DATATOOLS_DB_USER_PASSWORD = "org.eclipse.datatools.connectivity.db.password"; //$NON-NLS-1$
+
+ /**
+ * JDBC Connection URL token
+ */
+ String JDBC_URL_FOR_DB = "hibernate.connection.url"; //$NON-NLS-1$
+ String DATATOOLS_JDBC_URL_FOR_DB = "org.eclipse.datatools.connectivity.db.URL"; //$NON-NLS-1$
+
+ /**
+ * Driver file name
+ */
+ String JDBC_DRIVER_JAR_PATH = "driver.file"; //$NON-NLS-1$
+ String DATATOOLS_JDBC_DRIVER_JAR_PATH = "org.eclipse.datatools.connectivity.driverDefinitionID"; //$NON-NLS-1$
+}
+
+class DSDataModelProvider extends AbstractDataModelProvider implements IDSDataModelProperties {
+
+ private static final String EMPTY_STRING = ""; //$NON-NLS-1$
+
+ /**
+ * Returns set of facet properties for facet wizard page
+ *
+ * @return set of property names
+ */
+ public Set getPropertyNames() {
+ Set<String> names = super.getPropertyNames();
+
+ names.add(PROJECT_NAME);
+ names.add(CONNECTION_PROFILE);
+
+ // Database group
+// names.add(DB_TYPE);
+// names.add(HIBERNATE_DIALECT);
+ names.add(JDBC_DRIVER_CLASS_NAME);
+ names.add(JDBC_URL_FOR_DB);
+
+ names.add(DB_USER_NAME);
+ names.add(DB_USER_PASSWORD);
+// names.add(DB_SCHEMA_NAME);
+// names.add(DB_DEFAULT_SCHEMA_NAME);
+// names.add(DB_CATALOG_NAME);
+// names.add(DB_DEFAULT_CATALOG_NAME);
+// names.add(DB_ALREADY_EXISTS);
+// names.add(RECREATE_TABLES_AND_DATA_ON_DEPLOY);
+
+ names.add(JDBC_DRIVER_JAR_PATH);
+
+ return names;
+ }
+
+ /**
+ * Returns default value for a given property
+ *
+ * @param propertyName name of property which default value requested
+ * @return default value
+ */
+ public Object getDefaultProperty(String propertyName) {
+ return super.getDefaultProperty(propertyName);
+ }
+
+ public static File TEMPLATE_FOLDER = null;
+
+ /**
+ * Calculate path to templates folder
+ *
+ * @return path to templates
+ * @throws IOException if templates folder not found
+ */
+ public static File getTemplatesFolder() throws IOException {
+ if(TEMPLATE_FOLDER == null) {
+ Bundle bundle = WebUiPlugin.getDefault().getBundle();
+ String version = bundle.getVersion().toString();
+ IPath stateLocation = Platform.getStateLocation(bundle);
+ File templatesDir = FileLocator.getBundleFile(bundle);
+ if(templatesDir.isFile()) {
+ File toCopy = new File(stateLocation.toFile(),version);
+ if(!toCopy.exists()) {
+ toCopy.mkdirs();
+ UnzipOperation unZip = new UnzipOperation(templatesDir.getAbsolutePath());
+ unZip.execute(toCopy,"templates.*"); //$NON-NLS-1$
+ }
+ templatesDir = toCopy;
+ }
+ TEMPLATE_FOLDER = new File(templatesDir,"templates"); //$NON-NLS-1$
+ }
+ return TEMPLATE_FOLDER;
+ }
+
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider#init()
+ */
+ @Override
+ public void init() {
+ super.init();
+ }
+
+ public static void applyConnectionProfile(IProject project, IDataModel model) {
+ if (model.getProperty(CONNECTION_PROFILE) != null) {
+ IConnectionProfile connProfile = ProfileManager.getInstance().getProfileByName(model.getProperty(CONNECTION_PROFILE).toString());
+ if (connProfile != null) {
+ Properties props = connProfile.getBaseProperties(); // Properties("org.eclipse.datatools.connectivity.db.generic.connectionProfile");
+
+ // Collect properties name from DTP Connection Profile
+ model.setProperty(DB_USER_NAME,
+ props.get(DATATOOLS_DB_USER_NAME) == null
+ ? EMPTY_STRING : props.get(DATATOOLS_DB_USER_NAME).toString());
+
+ model.setProperty(
+ JDBC_DRIVER_CLASS_NAME,
+ props.get(DATATOOLS_JDBC_DRIVER_CLASS_NAME) == null
+ ? EMPTY_STRING : props.get(DATATOOLS_JDBC_DRIVER_CLASS_NAME).toString());
+
+ model.setProperty(
+ DB_USER_PASSWORD,
+ props.get(DATATOOLS_DB_USER_PASSWORD) == null
+ ? EMPTY_STRING : props.get(DATATOOLS_DB_USER_PASSWORD).toString());
+
+ model.setProperty(
+ JDBC_URL_FOR_DB,
+ props.get(DATATOOLS_JDBC_URL_FOR_DB) == null
+ ? EMPTY_STRING : props.get(DATATOOLS_JDBC_URL_FOR_DB).toString());
+
+ if(props.get(DATATOOLS_JDBC_DRIVER_JAR_PATH) != null) {
+ model.setProperty(
+ JDBC_DRIVER_JAR_PATH,
+ DriverManager
+ .getInstance()
+ .getDriverInstanceByID(
+ props.get(DATATOOLS_JDBC_DRIVER_JAR_PATH).toString()).getJarListAsArray());
+ }
+ }
+ }
+
+//This wizard has no input field for DB_DEFAULT_SCHEMA_NAME and DB_DEFAULT_CATALOG_NAME
+// String defaultSchema = (String) model.getProperty(DB_DEFAULT_SCHEMA_NAME);
+// if (!EMPTY_STRING.equals(defaultSchema)) {
+// model.setStringProperty(DB_SCHEMA_NAME,
+// PROP_INDENT + NLS.bind(PROP_DECL, new String[] {DB_DEFAULT_SCHEMA_NAME, defaultSchema }));
+// }
+//
+// String defaultCatalog = (String) model.getProperty(DB_DEFAULT_CATALOG_NAME);
+// if (!EMPTY_STRING.equals(defaultCatalog)) {
+// model.setStringProperty(DB_CATALOG_NAME,
+// PROP_INDENT + NLS.bind(PROP_DECL, new String[] {DB_DEFAULT_CATALOG_NAME, defaultCatalog}));
+// }
+ }
+
+}
+
+class NewDSXMLWizardFactory {
+
+ public static String[] TEMPLATE_LIST = {
+ "Default", "AS7"
+ };
+
+ public static IFieldEditor createTemplateFieldEditor(Object defaultValue) {
+ IFieldEditor result = IFieldEditorFactory.INSTANCE.createComboEditor(
+ IDSDataModelProperties.TEMPLATE,
+ Messages.NewDSXMLWizard_TEMPLATE_FIELD,
+ Arrays.asList(TEMPLATE_LIST),
+ TEMPLATE_LIST[0]);
+ return result;
+ }
+ /**
+ * Creates Selection Field of Connection Profiles
+ * @param defaultValue
+ * @param canBeEmpty
+ * @return
+ */
+ public static IFieldEditor createConnectionProfileSelectionFieldEditor(Object defaultValue, IValidator validator, final boolean canBeEmpty) {
+ EditConnectionProfileAction editAction = new EditConnectionProfileAction(validator);
+ NewConnectionProfileAction newAction = new NewConnectionProfileAction(validator);
+ List<String> profiles = getConnectionProfileNameList();
+ if(canBeEmpty) {
+ profiles.add(0, ""); //$NON-NLS-1$
+ }
+ IFieldEditor connProfileSelEditor = IFieldEditorFactory.INSTANCE.createComboWithTwoButtons(
+ IDSDataModelProperties.CONNECTION_PROFILE,
+ Messages.NewDSXMLWizard_CONNECTION_PROFILE_FIELD,
+ profiles,
+ defaultValue,
+ false, editAction,
+ newAction,
+ ValidatorFactory.NO_ERRORS_VALIDATOR);
+ editAction.setEditor(connProfileSelEditor);
+ newAction.setEditor(connProfileSelEditor);
+ final ButtonFieldEditor editButton = (ButtonFieldEditor)((CompositeEditor)connProfileSelEditor).getEditors().get(2);
+ editButton.setEnabled(!"".equals(defaultValue)); //$NON-NLS-1$
+ if(canBeEmpty) {
+ connProfileSelEditor.addPropertyChangeListener(new PropertyChangeListener(){
+ public void propertyChange(PropertyChangeEvent evt) {
+ boolean ediatble = !"".equals(evt.getNewValue()); //$NON-NLS-1$
+ editButton.setEnabled(ediatble);
+ }
+ });
+ }
+ final ComboFieldEditor comboEditor = ((ComboFieldEditor)((CompositeEditor)connProfileSelEditor).getEditors().get(1));
+ final IProfileListener profileListener = new IProfileListener() {
+ private void update() {
+ final List<String> profiles = getConnectionProfileNameList();
+ if(canBeEmpty) {
+ profiles.add(0, ""); //$NON-NLS-1$
+ }
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ comboEditor.setTags((profiles.toArray(new String[0])));
+ }
+ });
+ }
+
+ public void profileAdded(IConnectionProfile profile) {
+ update();
+ }
+
+ public void profileChanged(IConnectionProfile profile) {
+ update();
+ }
+
+ public void profileDeleted(IConnectionProfile profile) {
+ update();
+ }
+ };
+ ProfileManager.getInstance().addProfileListener(profileListener);
+ comboEditor.addDisposeListener(new DisposeListener(){
+ public void widgetDisposed(DisposeEvent e) {
+ ProfileManager.getInstance().removeProfileListener(profileListener);
+ }
+ });
+ return connProfileSelEditor;
+ }
+
+ private static class EditConnectionProfileAction extends ButtonFieldEditor.ButtonPressedAction {
+
+ private IValidator validator;
+ private IFieldEditor connProfileSelEditor;
+
+ /**
+ * @param validator
+ */
+ public EditConnectionProfileAction(IValidator validator) {
+ super(Messages.NewDSXMLWizard_EDIT_BUTTON);
+ this.validator = validator;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
+ @Override
+ public void run() {
+ IConnectionProfile selectedProfile = ProfileManager.getInstance()
+ .getProfileByName(getFieldEditor().getValue().toString());
+ String oldName = getFieldEditor().getValue().toString();
+
+ if (selectedProfile == null) {
+ return;
+ }
+ PropertyDialog.createDialogOn(Display.getCurrent().getActiveShell(),
+ "org.eclipse.datatools.connectivity.db.generic.profileProperties", //$NON-NLS-1$
+ selectedProfile).open();
+ if (!oldName.equals(selectedProfile.getName())) {
+ getFieldEditor().setValue(selectedProfile.getName());
+ ((ITaggedFieldEditor) ((CompositeEditor) connProfileSelEditor)
+ .getEditors().get(1)).setTags(getConnectionProfileNameList()
+ .toArray(new String[0]));
+ oldName = selectedProfile.getName();
+ }
+ validator.validate(selectedProfile.getName(), null);
+ }
+
+ public void setEditor(IFieldEditor connProfileSelEditor) {
+ this.connProfileSelEditor = connProfileSelEditor;
+ }
+ };
+
+ /**
+ * Handler for ButtonFieldEditor that shows Property Editor dialog for
+ * selected ConnectionProfile
+ *
+ * @author eskimo
+ */
+ private static class NewConnectionProfileAction extends ButtonFieldEditor.ButtonPressedAction {
+
+ private IValidator validator;
+ private IFieldEditor connProfileSelEditor;
+
+ public NewConnectionProfileAction(IValidator validator) {
+ super(Messages.NewDSXMLWizard_NEW_BUTTON);
+ this.validator = validator;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.jface.action.Action#run()
+ */
+ @Override
+ public void run() {
+ IProfileListener listener = new ConnectionProfileChangeListener(validator, connProfileSelEditor);
+
+ ProfileManager.getInstance().addProfileListener(listener);
+ NewCPWizardCategoryFilter filter = new NewCPWizardCategoryFilter("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$
+ NewCPWizard wizard = new NewCPWizard(filter, null);
+ new NewConnectionProfileWizard() {
+ public boolean performFinish() {
+ // create profile only
+ try {
+ ProfileManager.getInstance().createProfile(
+ getProfileName() == null ? "" //$NON-NLS-1$
+ : getProfileName(),
+ getProfileDescription() == null ? "" //$NON-NLS-1$
+ : getProfileDescription(),
+ mProviderID,
+ getProfileProperties(),
+ mProfilePage.getRepository() == null ? "" //$NON-NLS-1$
+ : mProfilePage.getRepository()
+ .getName(), false);
+ } catch (ConnectionProfileException e) {
+ WebUiPlugin.getPluginLog().logError(e);
+ }
+
+ return true;
+ }
+ };
+ WizardDialog wizardDialog = new WizardDialog(Display.getCurrent()
+ .getActiveShell(), wizard);
+ wizardDialog.open();
+ ProfileManager.getInstance().removeProfileListener(listener);
+ }
+
+ public void setEditor(IFieldEditor connProfileSelEditor) {
+ this.connProfileSelEditor = connProfileSelEditor;
+ }
+ }
+
+ private static class ConnectionProfileChangeListener implements IProfileListener {
+
+ private IFieldEditor connProfileSelEditor;
+ private IValidator validator;
+
+ /**
+ * @param validator
+ */
+ public ConnectionProfileChangeListener(IValidator validator, IFieldEditor connProfileSelEditor) {
+ this.validator = validator;
+ this.connProfileSelEditor = connProfileSelEditor;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.datatools.connectivity.IProfileListener#profileAdded(org.eclipse.datatools.connectivity.IConnectionProfile)
+ */
+ public void profileAdded(final IConnectionProfile profile) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ connProfileSelEditor.setValue(profile.getName());
+ ((ITaggedFieldEditor) ((CompositeEditor) connProfileSelEditor)
+ .getEditors().get(1)).setTags(getConnectionProfileNameList()
+ .toArray(new String[0]));
+ }
+ });
+ validator.validate(profile.getName(), null);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.datatools.connectivity.IProfileListener#profileChanged(org.eclipse.datatools.connectivity.IConnectionProfile)
+ */
+ public void profileChanged(IConnectionProfile profile) {
+ profileAdded(profile);
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.datatools.connectivity.IProfileListener#profileDeleted(org.eclipse.datatools.connectivity.IConnectionProfile)
+ */
+ public void profileDeleted(IConnectionProfile profile) {
+ // this event never happens
+ }
+ }
+
+ private static List<String> getConnectionProfileNameList() {
+ IConnectionProfile[] profiles = ProfileManager.getInstance()
+ .getProfilesByCategory("org.eclipse.datatools.connectivity.db.category"); //$NON-NLS-1$
+ List<String> names = new ArrayList<String>();
+ for (IConnectionProfile connectionProfile : profiles) {
+ names.add(connectionProfile.getName());
+ }
+ return names;
+ }
+
+}
+
+class FilterSetFactory {
+
+ public static FilterSet JDBC_TEMPLATE;
+ public static FilterSet PROJECT_TEMPLATE;
+ public static FilterSet FILTERS_TEMPLATE;
+ public static FilterSet HIBERNATE_DIALECT_TEMPLATE;
+
+ static {
+ JDBC_TEMPLATE = new FilterSet();
+ JDBC_TEMPLATE.addFilter("jdbcUrl","${hibernate.connection.url}"); //$NON-NLS-1$ //$NON-NLS-2$
+ JDBC_TEMPLATE.addFilter("driverClass","${hibernate.connection.driver_class}"); //$NON-NLS-1$ //$NON-NLS-2$
+ JDBC_TEMPLATE.addFilter("username","${hibernate.connection.username}"); //$NON-NLS-1$ //$NON-NLS-2$
+ JDBC_TEMPLATE.addFilter("password","${hibernate.connection.password}"); //$NON-NLS-1$ //$NON-NLS-2$
+ JDBC_TEMPLATE.addFilter("catalogProperty","${catalog.property}"); //$NON-NLS-1$ //$NON-NLS-2$
+ JDBC_TEMPLATE.addFilter("schemaProperty","${schema.property}"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ PROJECT_TEMPLATE = new FilterSet();
+ PROJECT_TEMPLATE.addFilter("projectName","${project.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ PROJECT_TEMPLATE.addFilter("ejbProjectName","${seam.ejb.project}"); //$NON-NLS-1$ //$NON-NLS-2$
+ PROJECT_TEMPLATE.addFilter("jbossHome","${jboss.home}"); //$NON-NLS-1$ //$NON-NLS-2$
+ PROJECT_TEMPLATE.addFilter("hbm2ddl","${hibernate.hbm2ddl.auto}"); //$NON-NLS-1$ //$NON-NLS-2$
+ PROJECT_TEMPLATE.addFilter("driverJar","${driver.file}"); //$NON-NLS-1$ //$NON-NLS-2$
+ PROJECT_TEMPLATE.addFilter("debug","true"); //$NON-NLS-1$ //$NON-NLS-2$
+ //todo: keep this local for seam2 ?
+ PROJECT_TEMPLATE.addFilter("skin","blueSky"); //$NON-NLS-1$ //$NON-NLS-2$
+ PROJECT_TEMPLATE.addFilter("connectionProfile","${connection.profile}"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ FILTERS_TEMPLATE = new FilterSet();
+ FILTERS_TEMPLATE.addFilter("interfaceName","${interface.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("beanName","${bean.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("entityName","${entity.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("methodName","${method.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("componentName","${component.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("pageName","${page.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("masterPageName","${masterPage.name}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("actionPackage","${action.package}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("modelPackage","${model.package}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("testPackage","${test.package}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("listName","${component.name}List"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("homeName","${component.name}Home"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("query","${query.text}"); //$NON-NLS-1$ //$NON-NLS-2$
+ FILTERS_TEMPLATE.addFilter("seamTestProject","${seam.test.project}"); //$NON-NLS-1$ //$NON-NLS-2$
+
+ HIBERNATE_DIALECT_TEMPLATE = new FilterSet();
+ HIBERNATE_DIALECT_TEMPLATE.addFilter("hibernate.dialect","${hibernate.dialect}"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ public static FilterSet createJdbcFilterSet(IDataModel values, boolean encodeValuesForPropertyFiles) {
+ return applyProperties((FilterSet)JDBC_TEMPLATE.clone(), values, encodeValuesForPropertyFiles);
+ }
+
+ public static FilterSet createProjectFilterSet(IDataModel values, boolean encodeValuesForPropertyFiles){
+ return applyProperties((FilterSet)PROJECT_TEMPLATE.clone(), values, encodeValuesForPropertyFiles);
+ }
+
+ public static FilterSet createFiltersFilterSet(IDataModel values, boolean encodeValuesForPropertyFiles) {
+ return applyProperties((FilterSet)FILTERS_TEMPLATE.clone(), values, encodeValuesForPropertyFiles);
+ }
+
+ public static FilterSet createHibernateDialectFilterSet(IDataModel values, boolean encodeValuesForPropertyFiles) {
+ return applyProperties((FilterSet)HIBERNATE_DIALECT_TEMPLATE.clone(), values, encodeValuesForPropertyFiles);
+ }
+
+ public static FilterSet createFiltersFilterSet(Map<?,?> values, boolean encodeValuesForPropertyFiles) {
+ return applyProperties((FilterSet)FILTERS_TEMPLATE.clone(), values, false);
+ }
+
+ public static FilterSet createJdbcFilterSet(IDataModel values) {
+ return createJdbcFilterSet(values, false);
+ }
+
+ public static FilterSet createProjectFilterSet(IDataModel values){
+ return createProjectFilterSet(values, false);
+ }
+
+ public static FilterSet createFiltersFilterSet(IDataModel values) {
+ return createFiltersFilterSet(values, false);
+ }
+
+ public static FilterSet createHibernateDialectFilterSet(IDataModel values) {
+ return createHibernateDialectFilterSet(values, false);
+ }
+
+ public static FilterSet createFiltersFilterSet(Map<?,?> values) {
+ return createFiltersFilterSet(values, false);
+ }
+
+ private static FilterSet applyProperties(FilterSet template, IDataModel values, boolean encodeValuesForPropertyFiles) {
+ FilterSet result = new FilterSet();
+ for (Object filter : template.getFilterHash().keySet()) {
+ String value = template.getFilterHash().get(filter).toString();
+ for (Object property : values.getAllProperties()) {
+ if(value.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$
+ Object propertyValue = values.getProperty(property.toString());
+ if(encodeValuesForPropertyFiles && propertyValue!=null) {
+ propertyValue = propertyValue.toString().replace("\\", "\\\\"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ value = value.replace("${"+property.toString()+"}",propertyValue==null?"":propertyValue.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ }
+ result.addFilter(filter.toString(), value);
+ }
+ return result;
+ }
+
+ private static FilterSet applyProperties(FilterSet template, Map<?,?> values, boolean encodeValuesForPropertyFiles) {
+ FilterSet result = new FilterSet();
+ for (Object filter : template.getFilterHash().keySet()) {
+ String value = template.getFilterHash().get(filter).toString();
+ for (Object property : values.keySet()){
+ if(value.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$
+ Object propertyValue = values.get(property.toString());
+ if(encodeValuesForPropertyFiles && propertyValue!=null) {
+ propertyValue = propertyValue.toString().replace("\\", "\\\\");//$NON-NLS-1$ //$NON-NLS-2$
+ }
+ value = value.replace("${"+property.toString()+"}",propertyValue==null?"":propertyValue.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+ }
+ result.addFilter(filter.toString(), value);
+ }
+ return result;
+ }
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-as7.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-as7.xml (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-as7.xml 2012-02-17 01:54:36 UTC (rev 38854)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources xmlns="http://www.jboss.org/ironjacamar/schema">
+ <xa-datasource jndi-name="java:/JPADS" pool-name="JPADS">
+ <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+ <xa-datasource-property name="URL">jdbc:h2:mem:test</xa-datasource-property>
+ <driver>h2</driver>
+ <security>
+ <user-name>@username@</user-name>
+ <password>@password@</password>
+ </security>
+ </xa-datasource>
+</datasources>
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-as7.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-default.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-default.xml (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-default.xml 2012-02-17 01:54:36 UTC (rev 38854)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE datasources
+ PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+<datasources>
+
+ <local-tx-datasource>
+ <jndi-name>@projectName@Datasource</jndi-name>
+ <use-java-context>true</use-java-context>
+ <connection-url>@jdbcUrl@</connection-url>
+ <driver-class>@driverClass@</driver-class>
+ <user-name>@username@</user-name>
+ <password>@password@</password>
+ </local-tx-datasource>
+
+</datasources>
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.ui/templates/Datasource/datasource-ds-default.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38853 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-16 20:41:09 -0500 (Thu, 16 Feb 2012)
New Revision: 38853
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-02-17 01:40:25 UTC (rev 38852)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-02-17 01:41:09 UTC (rev 38853)
@@ -254,6 +254,7 @@
this.document = validationContext.getDocument();
ELContext elContext = PageContextFactory.createPageContext(validationContext.getDocument(), true);
Set<ELReference> references = elContext.getELReferences(dirtyRegion);
+
for (ELReference elReference : references) {
validateEL(elReference, true, elContext);
}
@@ -285,7 +286,10 @@
displaySubtask(ELValidationMessages.VALIDATING_EL_FILE, new String[]{el.getResource().getProject().getName(), el.getResource().getName()});
if(!asYouType) {
el.deleteMarkers();
+ } else {
+ disableProblemAnnotations(el);
}
+
if(context!=null && !el.getSyntaxErrors().isEmpty()) {
for (SyntaxError error: el.getSyntaxErrors()) {
markers++;
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38852 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-16 20:40:25 -0500 (Thu, 16 Feb 2012)
New Revision: 38852
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java
Log:
https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java 2012-02-17 00:30:01 UTC (rev 38851)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AsYouTypeValidatorManager.java 2012-02-17 01:40:25 UTC (rev 38852)
@@ -11,19 +11,33 @@
package org.jboss.tools.common.validation;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.Map;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.progress.UIJob;
+import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation;
import org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator;
import org.eclipse.wst.validation.internal.core.ValidationException;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
+import org.jboss.tools.common.util.EclipseUIUtil;
/**
* This Manager is responsible for as-you-type validation.
@@ -37,6 +51,8 @@
private EditorValidationContext context;
private Map<IValidator, IProject> rootProjects;
+ private static Set<IDocument> reporters = new HashSet<IDocument>();
+
/*
* (non-Javadoc)
* @see org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator#connect(org.eclipse.jface.text.IDocument)
@@ -53,10 +69,57 @@
@Override
public void disconnect(IDocument document) {
context = null;
+ synchronized (reporters) {
+ reporters.remove(document);
+ }
}
+ /**
+ * Remove all the temporary annotations added by this validator.
+ */
+ static void removeMessages() {
+ UIJob job = new UIJob("Removing as-you-type JBT validation problems") {
+ public IStatus runInUIThread(IProgressMonitor monitor) {
+ ITextEditor e = EclipseUIUtil.getActiveEditor();
+ if(e!=null && !e.isDirty()) {
+ IEditorInput input = e.getEditorInput();
+ IDocumentProvider dp = e.getDocumentProvider();
+ IDocument doc = dp.getDocument(input);
+ boolean ok = false;
+ synchronized (reporters) {
+ ok = reporters.contains(doc);
+ }
+ if(ok) {
+ IAnnotationModel model = dp.getAnnotationModel(input);
+ if(model instanceof AbstractMarkerAnnotationModel) {
+ AbstractMarkerAnnotationModel anModel = ((AbstractMarkerAnnotationModel)model);
+ synchronized (anModel.getLockObject()) {
+ Iterator iterator = anModel.getAnnotationIterator();
+ while (iterator.hasNext()) {
+ Object o = iterator.next();
+ if(o instanceof TemporaryAnnotation) {
+ TemporaryAnnotation annotation = (TemporaryAnnotation)o;
+ Map attributes = annotation.getAttributes();
+ if(attributes!=null && attributes.get(TempMarkerManager.AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE)!=null) {
+ anModel.removeAnnotation(annotation);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return Status.OK_STATUS;
+ }
+ };
+ job.schedule();
+ }
+
private boolean init(IValidationContext helper, IReporter reporter) {
if(context==null) {
+ synchronized (reporters) {
+ reporters.add(document);
+ }
String[] uris = helper.getURIs();
if(uris.length==0) {
return false;
@@ -98,7 +161,7 @@
((IAsYouTypeValidator)validator).validate(this, rootProject, dirtyRegion, helper, reporter, context, projectBrunch.getRootContext(), file);
}
}
-// reporter.removeAllMessages(this, file);
+// reporter.removeAllMessages(AsYouTypeValidatorManager.this, file);
}
@Override
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-02-17 00:30:01 UTC (rev 38851)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-02-17 01:40:25 UTC (rev 38852)
@@ -11,17 +11,33 @@
package org.jboss.tools.common.validation;
import java.text.MessageFormat;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.Locale;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.progress.UIJob;
+import org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel;
+import org.eclipse.ui.texteditor.IDocumentProvider;
+import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.ui.texteditor.MarkerAnnotation;
import org.eclipse.wst.validation.internal.core.Message;
import org.eclipse.wst.validation.internal.provisional.core.IMessage;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.eclipse.wst.validation.internal.provisional.core.IValidator;
import org.jboss.tools.common.CommonPlugin;
import org.jboss.tools.common.text.ITextSourceReference;
+import org.jboss.tools.common.util.EclipseUIUtil;
/**
* @author Alexey Kazakov
@@ -68,16 +84,116 @@
return message;
}
+ public static final String AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE = "org.jboss.tools.common.validation.asyoutype";
+
private static IMessage addMesssage(IValidator validator, IReporter reporter, int offset, int length, IFile file, int lineNumber, int severity, String textMessage, Object[] messageArguments, String bundleName) {
Message message = new ValidationMessage(severity, MessageFormat.format(textMessage, messageArguments), file);
message.setOffset(offset);
message.setLength(length);
message.setLineNo(lineNumber);
message.setBundleName(bundleName);
+ message.setAttribute(AS_YOU_TYPE_VALIDATION_ANNOTATION_ATTRIBUTE, Boolean.TRUE);
reporter.addMessage(validator, message);
return message;
}
+/*
+ static class DisabledAnnotation extends Annotation implements IAnnotationPresentation {
+ private static final int WARNING_LAYER;
+ private static final int ERROR_LAYER;
+
+ static {
+ AnnotationPreferenceLookup lookup = EditorsUI.getAnnotationPreferenceLookup();
+ WARNING_LAYER = computeLayer("org.eclipse.wst.sse.ui.temp.warning", lookup); //$NON-NLS-1$
+ ERROR_LAYER = computeLayer("org.eclipse.wst.sse.ui.temp.error", lookup); //$NON-NLS-1$
+ }
+
+ private static int computeLayer(String annotationType, AnnotationPreferenceLookup lookup) {
+ Annotation annotation = new Annotation(annotationType, false, null);
+ AnnotationPreference preference= lookup.getAnnotationPreference(annotation);
+ if (preference != null) {
+ return preference.getPresentationLayer() + 1;
+ } else {
+ return IAnnotationAccessExtension.DEFAULT_LAYER + 1;
+ }
+ }
+
+ public DisabledAnnotation(String type, boolean isPersistent, String text) {
+ super(type, isPersistent, text);
+ }
+
+ @Override
+ public int getLayer() {
+ return WARNING_LAYER;
+ }
+
+ @Override
+ public void paint(GC gc, Canvas canvas, Rectangle bounds) {
+ String path = WorkbenchImages.ICONS_PATH + "dlcl16/showwarn_tsk.gif"; //$NON-NLS-1$
+ URL url = BundleUtility.find(IDEWorkbenchPlugin.IDE_WORKBENCH, path);
+ ImageDescriptor descriptor = ImageDescriptor.createFromURL(url);
+ Image image = descriptor.createImage(false);
+// ImageUtilities.drawImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK), gc, canvas, bounds, SWT.CENTER, SWT.TOP);
+ ImageUtilities.drawImage(image, gc, canvas, bounds, SWT.CENTER, SWT.TOP);
+ }
+ }
+*/
+ protected void disableProblemAnnotations(final ITextSourceReference reference) {
+ // Remove (TODO disable) all the existing problem annotations for the reference in case of as-you-type validation
+ UIJob job = new UIJob("As-you-type JBT validation. Disabling the marker annotations.") {
+ public IStatus runInUIThread(IProgressMonitor monitor) {
+ ITextEditor e = EclipseUIUtil.getActiveEditor();
+ if(e!=null && e.isDirty()) {
+ IEditorInput input = e.getEditorInput();
+ IDocumentProvider dp = e.getDocumentProvider();
+ if(document == dp.getDocument(input)) {
+ IAnnotationModel model = dp.getAnnotationModel(input);
+ if(model instanceof AbstractMarkerAnnotationModel) {
+ AbstractMarkerAnnotationModel anModel = ((AbstractMarkerAnnotationModel)model);
+ synchronized (anModel.getLockObject()) {
+ Iterator iterator = anModel.getAnnotationIterator(reference.getStartPosition(), reference.getLength(), false, false);
+ Set<MarkerAnnotation> annotationsToRemove = new HashSet<MarkerAnnotation>();
+// Map<Annotation, Position> newAnnotations = new HashMap<Annotation, Position>();
+ while (iterator.hasNext()) {
+ Object o = iterator.next();
+ if(o instanceof MarkerAnnotation) {
+ MarkerAnnotation annotation = (MarkerAnnotation)o;
+ IMarker marker = annotation.getMarker();
+ try {
+ String type = marker.getType();
+ if(getMarkerType().equals(type)) {
+// Annotation newAnnotation = new DisabledAnnotation(annotation.getType(), false, annotation.getText());
+// int offset = marker.getAttribute(IMarker.CHAR_START, 0);
+// int length = 0; // marker.getAttribute(IMarker.CHAR_END, 0) - offset;
+// Position p = new Position(offset, length);
+// newAnnotations.put(newAnnotation, p);
+ annotationsToRemove.add(annotation);
+ }
+ } catch (CoreException ce) {
+ CommonPlugin.getDefault().logError(ce);
+ }
+ }
+ }
+// if(!newAnnotations.isEmpty()) {
+// Annotation[] annotationsToRemoveArray = annotationsToRemove.toArray(new Annotation[annotationsToRemove.size()]);
+// anModel.replaceAnnotations(annotationsToRemoveArray, newAnnotations);
+// }
+ for (MarkerAnnotation annotation : annotationsToRemove) {
+ anModel.removeAnnotation(annotation);
+ }
+// for (Annotation annotation : newAnnotations.keySet()) {
+// anModel.addAnnotation(annotation, newAnnotations.get(annotation));
+// }
+ }
+ }
+ }
+ }
+ return Status.OK_STATUS;
+ }
+ };
+ job.schedule();
+ }
+
static class ValidationMessage extends Message {
private String message;
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java 2012-02-17 00:30:01 UTC (rev 38851)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java 2012-02-17 01:40:25 UTC (rev 38852)
@@ -109,6 +109,7 @@
IValidationContextManager validationContextManager = validationHelper.getValidationContextManager();
List<IValidator> validators = validationContextManager.getValidators();
removeMarkers(changedFiles);
+ AsYouTypeValidatorManager.removeMessages();
for (IValidator validator : validators) {
for (IProject rootProject : rootProjects) {
IValidatingProjectSet projectBrunch = validationHelper.getValidationContextManager().getValidatingProjectTree(validator).getBrunches().get(rootProject);
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r38851 - in trunk: as/plugins/org.jboss.ide.eclipse.as.ui and 37 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-16 19:30:01 -0500 (Thu, 16 Feb 2012)
New Revision: 38851
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/about.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/about.properties
trunk/birt/plugins/org.jboss.tools.birt.oda.ui/about.properties
trunk/birt/tests/org.jboss.tools.birt.core.test/about.properties
trunk/central/plugins/org.jboss.tools.central/about.properties
trunk/central/plugins/org.jboss.tools.community.central/about.properties
trunk/common/plugins/org.jboss.tools.common.jdt.debug/about.properties
trunk/esb/plugins/org.jboss.tools.esb.ui/about.properties
trunk/examples/plugins/org.jboss.tools.community.project.examples/about.properties
trunk/examples/plugins/org.jboss.tools.project.examples/about.properties
trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/sourceTemplatePlugin/about.properties
trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/about.properties
trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties
trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/sourceTemplatePlugin/about.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse/about.properties
trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties
trunk/jmx/plugins/org.jboss.tools.jmx.ui/about.properties
trunk/maven/features/org.jboss.tools.maven.feature/sourceTemplatePlugin/about.properties
trunk/maven/features/org.jboss.tools.maven.seam.feature/sourceTemplatePlugin/about.properties
trunk/maven/plugins/org.jboss.tools.maven.cdi/about.properties
trunk/maven/plugins/org.jboss.tools.maven.hibernate/about.properties
trunk/maven/plugins/org.jboss.tools.maven.jsf/about.properties
trunk/maven/plugins/org.jboss.tools.maven.portlet/about.properties
trunk/maven/plugins/org.jboss.tools.maven.project.examples/about.properties
trunk/maven/plugins/org.jboss.tools.maven.seam/about.properties
trunk/maven/plugins/org.jboss.tools.maven.ui/about.properties
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.properties
trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.properties
trunk/portlet/tests/org.jboss.tools.portlet.core.test/about.properties
trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/about.properties
trunk/runtime/plugins/org.jboss.tools.runtime.core/about.properties
trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/about.properties
trunk/runtime/plugins/org.jboss.tools.runtime.ui/about.properties
trunk/runtime/plugins/org.jboss.tools.runtime/about.properties
trunk/seam/plugins/org.jboss.tools.seam.core/about.properties
trunk/smooks/plugins/org.jboss.tools.smooks.ui/about.properties
trunk/struts/plugins/org.jboss.tools.struts.ui/about.properties
trunk/vpe/plugins/org.jboss.tools.vpe/about.properties
trunk/ws/plugins/org.jboss.tools.ws.ui/about.properties
Log:
https://issues.jboss.org/browse/JBIDE-8997 (CLONE - 2010 in the copyright headers should be replaced by 2012)
about.properties updated
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/about.properties
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1 +1 @@
-blurb=JBoss Archives Tools\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\n Visit http\://jboss.org/tools
\ No newline at end of file
+blurb=JBoss Archives Tools\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n Visit http\://jboss.org/tools
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/about.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1 +1 @@
-blurb=JBossAS Tools\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\n Visit http\://jboss.org/tools
\ No newline at end of file
+blurb=JBossAS Tools\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n Visit http\://jboss.org/tools
\ No newline at end of file
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/about.properties
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss BIRT Integration\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss BIRT Integration\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/birt/tests/org.jboss.tools.birt.core.test/about.properties
===================================================================
--- trunk/birt/tests/org.jboss.tools.birt.core.test/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/birt/tests/org.jboss.tools.birt.core.test/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss BIRT Integration tests\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2011. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss BIRT Integration tests\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/central/plugins/org.jboss.tools.central/about.properties
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/central/plugins/org.jboss.tools.central/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Central\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2011. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Central\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/central/plugins/org.jboss.tools.community.central/about.properties
===================================================================
--- trunk/central/plugins/org.jboss.tools.community.central/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/central/plugins/org.jboss.tools.community.central/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Central Community \n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Central Community \n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.debug/about.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.debug/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.debug/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Tools Launching Support\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2011. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Tools Launching Support\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/about.properties
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss ESB Tools\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss ESB Tools\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/examples/plugins/org.jboss.tools.community.project.examples/about.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.community.project.examples/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/examples/plugins/org.jboss.tools.community.project.examples/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Tools Community Project Examples\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Tools Community Project Examples\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/about.properties
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Project Examples\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Project Examples\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -3,5 +3,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Red Hat contributors and others, 2010. All rights reserved.\n\
+(c) Copyright Red Hat contributors and others, 2012. All rights reserved.\n\
Visit http://www.jboss.org/tools
Modified: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/about.properties
===================================================================
--- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=FreeMarker IDE\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=FreeMarker IDE\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -3,5 +3,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Red Hat contributors and others, 2010. All rights reserved.\n\
+(c) Copyright Red Hat contributors and others, 2012. All rights reserved.\n\
Visit http://www.jboss.org/tools
Modified: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -3,5 +3,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Red Hat contributors and others, 2010. All rights reserved.\n\
+(c) Copyright Red Hat contributors and others, 2012. All rights reserved.\n\
Visit http://www.jboss.org/tools
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/about.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=Hibernate Tools for Eclipse\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://tools.hibernate.org
+blurb=Hibernate Tools for Eclipse\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://tools.hibernate.org
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -2,5 +2,5 @@
\n\
Version: {featureVersion}\n\
\n\
-Copyright (c) 2006-2010 JBoss by Redhat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net
+Copyright (c) 2006-2012 JBoss by Redhat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/about.properties
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -2,5 +2,5 @@
\n\
Version: {featureVersion}\n\
\n\
-Copyright (c) 2006-2010 JBoss by Redhat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net
+Copyright (c) 2006-2012 JBoss by Redhat, and others. Initial contribution by Jeff Mesnil, http://jmesnil.net
Modified: trunk/maven/features/org.jboss.tools.maven.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/features/org.jboss.tools.maven.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -3,5 +3,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Red Hat contributors and others, 2010. All rights reserved.\n\
+(c) Copyright Red Hat contributors and others, 2012. All rights reserved.\n\
Visit http://www.jboss.org/tools
Modified: trunk/maven/features/org.jboss.tools.maven.seam.feature/sourceTemplatePlugin/about.properties
===================================================================
--- trunk/maven/features/org.jboss.tools.maven.seam.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/features/org.jboss.tools.maven.seam.feature/sourceTemplatePlugin/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -3,5 +3,5 @@
Version: {featureVersion}\n\
Build id: {0}\n\
\n\
-(c) Copyright Red Hat contributors and others, 2010. All rights reserved.\n\
+(c) Copyright Red Hat contributors and others, 2012. All rights reserved.\n\
Visit http://www.jboss.org/tools
Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.cdi/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/plugins/org.jboss.tools.maven.cdi/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Maven CDI Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Maven CDI Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/maven/plugins/org.jboss.tools.maven.hibernate/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.hibernate/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/plugins/org.jboss.tools.maven.hibernate/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Maven Hibernate Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Maven Hibernate Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/maven/plugins/org.jboss.tools.maven.jsf/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.jsf/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/plugins/org.jboss.tools.maven.jsf/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Maven JSF Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Maven JSF Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/maven/plugins/org.jboss.tools.maven.portlet/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.portlet/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/plugins/org.jboss.tools.maven.portlet/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Maven Portlet Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Maven Portlet Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Maven Project Examples\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Maven Project Examples\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Maven Seam Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Maven Seam Configurator\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/about.properties
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Maven Integration\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Maven Integration\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.properties
===================================================================
--- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -14,7 +14,7 @@
\n\
Version: {featureVersion}\n\
\n\
-Copyright (c) 2008-2011 Red Hat, Inc. All rights reserved.\n\
+Copyright (c) 2008-2012 Red Hat, Inc. All rights reserved.\n\
Visit http://www.jboss.org/tools and http://www.modeshape.org/
featureName=ModeShape JCR REST Tools for Eclipse
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.properties
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Portlet\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Portlet\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/portlet/tests/org.jboss.tools.portlet.core.test/about.properties
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Portlet tests\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2011. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Portlet tests\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/about.properties
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Runtime Initializer\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Runtime Initializer\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/about.properties
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Runtime AS Detector\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2011. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Runtime AS Detector\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/about.properties
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Runtime Detection\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Runtime Detection\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/about.properties
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.seam.detector/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Runtime Seam Detector\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2011. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Runtime Seam Detector\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/about.properties
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=JBoss Runtime Detection UI\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2011. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=JBoss Runtime Detection UI\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/about.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -2,6 +2,6 @@
\n\
Version: {featureVersion}\n\
\n\
-Copyright (c) JBoss by Red Hat, 2007 - 2010. All rights reserved.\n\
+Copyright (c) JBoss by Red Hat, 2007 - 2012. All rights reserved.\n\
Visit http://www.jboss.org/tools and http://www.seamframework.org
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/about.properties
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1,2 +1,2 @@
-blurb=Smooks Tools\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\nVisit http\://jboss.org/tools
+blurb=Smooks Tools\n\nVersion\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\nVisit http\://jboss.org/tools
Modified: trunk/struts/plugins/org.jboss.tools.struts.ui/about.properties
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/struts/plugins/org.jboss.tools.struts.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -2,6 +2,6 @@
\n\
Version: {featureVersion}\n\
\n\
-(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\n\
+(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n\
Visit http://jboss.org/tools
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/about.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -1 +1 @@
-blurb=JBoss Tools RichFaces for Eclipse\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\n Visit http\://jboss.org/tools
\ No newline at end of file
+blurb=JBoss Tools RichFaces for Eclipse\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n Visit http\://jboss.org/tools
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/about.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.ui/about.properties 2012-02-17 00:16:47 UTC (rev 38850)
+++ trunk/ws/plugins/org.jboss.tools.ws.ui/about.properties 2012-02-17 00:30:01 UTC (rev 38851)
@@ -2,6 +2,6 @@
\n\
Version: {featureVersion}\n\
\n\
-(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2010. All rights reserved.\n\
+(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n\
Visit http://jboss.org/tools
14 years, 1 month
- 1
- 0