JBoss Tools SVN: r30930 - branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-28 15:07:35 -0400 (Thu, 28 Apr 2011)
New Revision: 30930
Modified:
branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature/feature.xml
branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8814
Modified: branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature/feature.xml
===================================================================
--- branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2011-04-28 19:02:13 UTC (rev 30929)
+++ branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2011-04-28 19:07:35 UTC (rev 30930)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.cdi.feature"
label="%featureName"
- version="1.1.0.qualifier"
+ version="1.1.1.qualifier"
provider-name="%featureProvider">
<description>
Modified: branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature/pom.xml 2011-04-28 19:02:13 UTC (rev 30929)
+++ branches/jbosstools-3.2.x/cdi/features/org.jboss.tools.cdi.feature/pom.xml 2011-04-28 19:07:35 UTC (rev 30930)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.cdi.features</groupId>
<artifactId>org.jboss.tools.cdi.feature</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
13 years, 8 months
JBoss Tools SVN: r30929 - in branches/jbosstools-3.2.x/cdi: plugins/org.jboss.tools.cdi.core/META-INF and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-04-28 15:02:13 -0400 (Thu, 28 Apr 2011)
New Revision: 30929
Modified:
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/pom.xml
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml
branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-8814
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2011-04-28 19:02:13 UTC (rev 30929)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Context and Dependency Injection Core
Bundle-SymbolicName: org.jboss.tools.cdi.core;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Activator: org.jboss.tools.cdi.core.CDICorePlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/pom.xml 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.core/pom.xml 2011-04-28 19:02:13 UTC (rev 30929)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.cdi.plugins</groupId>
<artifactId>org.jboss.tools.cdi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/META-INF/MANIFEST.MF 2011-04-28 19:02:13 UTC (rev 30929)
@@ -20,5 +20,5 @@
org.jboss.tools.common;bundle-version="2.0.0",
org.jboss.tools.common.el.core;bundle-version="2.0.0",
org.jboss.tools.common.model;bundle-version="2.0.0"
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml 2011-04-28 19:02:13 UTC (rev 30929)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.cdi.plugins</groupId>
<artifactId>org.jboss.tools.cdi.text.ext</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/META-INF/MANIFEST.MF 2011-04-28 19:02:13 UTC (rev 30929)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.cdi.ui;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Activator: org.jboss.tools.cdi.ui.CDIUIPlugin
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml 2011-04-28 19:02:13 UTC (rev 30929)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.cdi.plugins</groupId>
<artifactId>org.jboss.tools.cdi.ui</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/META-INF/MANIFEST.MF 2011-04-28 19:02:13 UTC (rev 30929)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Contexts and Dependency Injection Test
Bundle-SymbolicName: org.jboss.tools.cdi.core.test
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.jboss.tools.tests,
Modified: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2011-04-28 19:02:13 UTC (rev 30929)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.core.test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
Modified: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/META-INF/MANIFEST.MF 2011-04-28 19:02:13 UTC (rev 30929)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Contexts and Dependency Injection UI Test
Bundle-SymbolicName: org.jboss.tools.cdi.ui.test
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit,
Modified: branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
===================================================================
--- branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2011-04-28 18:03:04 UTC (rev 30928)
+++ branches/jbosstools-3.2.x/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2011-04-28 19:02:13 UTC (rev 30929)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.cdi.tests</groupId>
<artifactId>org.jboss.tools.cdi.ui.test</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
13 years, 8 months
JBoss Tools SVN: r30928 - in trunk/esb/plugins/org.jboss.tools.esb.core: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-28 14:03:04 -0400 (Thu, 28 Apr 2011)
New Revision: 30928
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml
Log:
JBIDE-8813
https://issues.jboss.org/browse/JBIDE-8813
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2011-04-28 17:58:44 UTC (rev 30927)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/META-INF/MANIFEST.MF 2011-04-28 18:03:04 UTC (rev 30928)
@@ -11,8 +11,9 @@
org.jboss.tools.esb.core.model.converters,
org.jboss.tools.esb.core.model.handlers,
org.jboss.tools.esb.core.model.impl
-Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
+Require-Bundle: org.eclipse.core.resources;visibility:=reexport,
+ org.jboss.tools.common.model;visibility:=reexport,
org.eclipse.ui,
org.jboss.tools.esb.project.core
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.5.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml 2011-04-28 17:58:44 UTC (rev 30927)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml 2011-04-28 18:03:04 UTC (rev 30928)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.esb.plugins</groupId>
<artifactId>org.jboss.tools.esb.core</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r30927 - trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2011-04-28 13:58:44 -0400 (Thu, 28 Apr 2011)
New Revision: 30927
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
Log:
JBIDE-8759
3 test failures in org.jboss.tools.seam.ui.test.SeamUiAllTests
Minor changes are committed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2011-04-28 17:58:07 UTC (rev 30926)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp.base.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2011-04-28 17:58:44 UTC (rev 30927)
@@ -20,6 +20,7 @@
import org.eclipse.jface.text.contentassist.ICompletionProposal;
import org.eclipse.jface.text.contentassist.IContentAssistant;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
@@ -45,6 +46,12 @@
if (editorPart instanceof JSPMultiPageEditor)
jspEditor = (JSPMultiPageEditor) editorPart;
+ assertNotNull("Cannot get the JSP Text Editor instance for page \"" //$NON-NLS-1$
+ + fileName + "\"", jspEditor);
+
+ // clean deffered events
+ while (Display.getCurrent().readAndDispatch());
+
jspTextEditor = jspEditor.getJspEditor();
viewer = jspTextEditor.getTextViewer();
document = viewer.getDocument();
13 years, 8 months
JBoss Tools SVN: r30926 - in trunk/esb/tests/org.jboss.tools.esb.validator.test: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-28 13:58:07 -0400 (Thu, 28 Apr 2011)
New Revision: 30926
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF
trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
Log:
JBIDE-8813
https://issues.jboss.org/browse/JBIDE-8813
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2011-04-28 17:55:18 UTC (rev 30925)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2011-04-28 17:58:07 UTC (rev 30926)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Contexts and Dependency Injection Test
Bundle-SymbolicName: org.jboss.tools.esb.validator.test
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.jboss.tools.esb.core,
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2011-04-28 17:55:18 UTC (rev 30925)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2011-04-28 17:58:07 UTC (rev 30926)
@@ -8,7 +8,7 @@
</parent>
<groupId>org.jboss.tools.esb.tests</groupId>
<artifactId>org.jboss.tools.esb.validator.test</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
13 years, 8 months
JBoss Tools SVN: r30925 - in trunk/esb/plugins/org.jboss.tools.esb.validator: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-28 13:55:18 -0400 (Thu, 28 Apr 2011)
New Revision: 30925
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml
Log:
JBIDE-8813
https://issues.jboss.org/browse/JBIDE-8813
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2011-04-28 17:52:06 UTC (rev 30924)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2011-04-28 17:55:18 UTC (rev 30925)
@@ -15,5 +15,5 @@
org.jboss.tools.esb.project.core,
org.eclipse.wst.validation,
org.eclipse.jdt.ui
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml 2011-04-28 17:52:06 UTC (rev 30924)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml 2011-04-28 17:55:18 UTC (rev 30925)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.esb.plugins</groupId>
<artifactId>org.jboss.tools.esb.validator</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r30924 - in trunk/esb/plugins/org.jboss.tools.esb.ui: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-28 13:52:06 -0400 (Thu, 28 Apr 2011)
New Revision: 30924
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml
Log:
JBIDE-8813
https://issues.jboss.org/browse/JBIDE-8813
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2011-04-28 17:45:34 UTC (rev 30923)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2011-04-28 17:52:06 UTC (rev 30924)
@@ -36,5 +36,5 @@
org.jboss.tools.common.model.ui,
org.jboss.tools.common.text.xml,
org.jboss.tools.esb.core
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml 2011-04-28 17:45:34 UTC (rev 30923)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml 2011-04-28 17:52:06 UTC (rev 30924)
@@ -8,6 +8,6 @@
</parent>
<groupId>org.jboss.tools.esb.plugins</groupId>
<artifactId>org.jboss.tools.esb.ui</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r30923 - in trunk/esb/plugins/org.jboss.tools.esb.validator: src/org/jboss/tools/esb/validator and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-28 13:45:34 -0400 (Thu, 28 Apr 2011)
New Revision: 30923
Modified:
trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
Log:
JBIDE-8813
https://issues.jboss.org/browse/JBIDE-8813
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2011-04-28 17:38:32 UTC (rev 30922)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/META-INF/MANIFEST.MF 2011-04-28 17:45:34 UTC (rev 30923)
@@ -8,8 +8,7 @@
Bundle-Localization: plugin
Export-Package: org.jboss.tools.esb.validator,
org.jboss.tools.esb.validator.ui
-Require-Bundle: org.jboss.tools.jst.web;visibility:=reexport,
- org.jboss.tools.common.ui,
+Require-Bundle: org.jboss.tools.common.ui,
org.jboss.tools.jst.web.kb,
org.jboss.tools.esb.core,
org.eclipse.ui,
Modified: trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-04-28 17:38:32 UTC (rev 30922)
+++ trunk/esb/plugins/org.jboss.tools.esb.validator/src/org/jboss/tools/esb/validator/ESBCoreValidator.java 2011-04-28 17:45:34 UTC (rev 30923)
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
@@ -17,7 +18,9 @@
import org.eclipse.wst.validation.internal.core.ValidationException;
import org.eclipse.wst.validation.internal.provisional.core.IReporter;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.common.model.project.ext.IValueInfo;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
+import org.jboss.tools.common.model.util.PositionHolder;
import org.jboss.tools.common.text.ITextSourceReference;
import org.jboss.tools.esb.core.ESBProjectConstant;
import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
@@ -33,7 +36,7 @@
import org.jboss.tools.jst.web.kb.validation.IValidatingProjectSet;
import org.jboss.tools.jst.web.kb.validation.IValidatingProjectTree;
import org.jboss.tools.jst.web.kb.validation.IValidator;
-import org.jboss.tools.jst.web.model.project.ext.store.XMLValueInfo;
+import org.w3c.dom.Element;
public class ESBCoreValidator extends ESBValidationErrorManager implements IValidator {
public static final String ID = "org.jboss.tools.esb.validator.ESBCoreValidator"; //$NON-NLS-1$
@@ -323,7 +326,7 @@
void validateObjectPathForBusinessRulesProcessor(XModelObject path, XModelObject brp, IFile file) {
String esb = path.getAttributeValue(ATTR_ESB);
- StringTokenizer st = new StringTokenizer(esb, ".");
+ StringTokenizer st = new StringTokenizer(esb, "."); //$NON-NLS-1$
if(!st.hasMoreTokens()) return;
String location = st.nextToken();
if(!OBJECT_PATH_LOCATIONS.contains(location)) {
@@ -343,3 +346,49 @@
}
}
+
+class XMLValueInfo implements IValueInfo {
+ XModelObject object;
+ String attribute;
+
+ PositionHolder h = null;
+
+ public XMLValueInfo() {
+ }
+
+ public XMLValueInfo(XModelObject object, String attribute) {
+ this.object = object;
+ this.attribute = attribute;
+ }
+
+ public int getLength() {
+ getPositionHolder();
+ int length = h.getEnd() - h.getStart();
+ return length < 0 ? 0 : length;
+ }
+
+ public int getStartPosition() {
+ getPositionHolder();
+ return h.getStart();
+ }
+
+ public String getValue() {
+ return object.getAttributeValue(attribute);
+ }
+
+ PositionHolder getPositionHolder() {
+ if(h == null) {
+ h = PositionHolder.getPosition(object, attribute);
+ }
+ h.update();
+ return h;
+ }
+
+ public Element toXML(Element parent, Properties context) {
+ return null;
+ }
+
+ public void loadXML(Element element, Properties context) {
+ }
+
+}
13 years, 8 months
JBoss Tools SVN: r30922 - trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-28 13:38:32 -0400 (Thu, 28 Apr 2011)
New Revision: 30922
Modified:
trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF
Log:
JBIDE-8813
https://issues.jboss.org/browse/JBIDE-8813
Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2011-04-28 17:27:06 UTC (rev 30921)
+++ trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2011-04-28 17:38:32 UTC (rev 30922)
@@ -15,6 +15,5 @@
org.jboss.tools.common,
org.eclipse.ui,
org.eclipse.jdt.core,
- org.jboss.tools.common.model.ui,
org.eclipse.ltk.core.refactoring
Export-Package: org.jboss.tools.esb.validator.test
13 years, 8 months
JBoss Tools SVN: r30921 - in trunk/esb/plugins/org.jboss.tools.esb.ui: META-INF and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-04-28 13:27:06 -0400 (Thu, 28 Apr 2011)
New Revision: 30921
Added:
trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/ESBCompoundEditor.java
Modified:
trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF
trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
Log:
JBIDE-8813
https://issues.jboss.org/browse/JBIDE-8813
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2011-04-28 17:20:58 UTC (rev 30920)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/META-INF/MANIFEST.MF 2011-04-28 17:27:06 UTC (rev 30921)
@@ -6,6 +6,7 @@
Bundle-Activator: org.jboss.tools.esb.ui.ESBUiPlugin
Bundle-Vendor: %providerName
Export-Package: org.jboss.tools.esb.ui,
+ org.jboss.tools.esb.ui.editor,
org.jboss.tools.esb.ui.editor.form,
org.jboss.tools.esb.ui.editor.attribute,
org.jboss.tools.esb.ui.wizard,
@@ -34,8 +35,6 @@
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.common.text.xml,
- org.jboss.tools.jst.web,
- org.jboss.tools.jst.web.ui,
org.jboss.tools.esb.core
Bundle-Version: 1.3.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2011-04-28 17:20:58 UTC (rev 30920)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/plugin.xml 2011-04-28 17:27:06 UTC (rev 30921)
@@ -36,7 +36,7 @@
<extension id="e" name="XML Editors" point="org.jboss.tools.common.model.ui.xmlEditor">
<xmlEditor
- class="org.jboss.tools.jst.web.ui.editors.WebCompoundEditor"
+ class="org.jboss.tools.esb.ui.editor.ESBCompoundEditor"
contributorClass="org.jboss.tools.common.model.ui.texteditors.MultiPageContributor"
entities="FileESB101,FileESB110,FileESB120,FileESB130"
icon="images/xstudio/editors/esb.gif"
Added: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/ESBCompoundEditor.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/ESBCompoundEditor.java (rev 0)
+++ trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/ESBCompoundEditor.java 2011-04-28 17:27:06 UTC (rev 30921)
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and 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:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.esb.ui.editor;
+
+import org.jboss.tools.common.editor.TreeFormPage;
+import org.jboss.tools.common.meta.key.WizardKeys;
+import org.jboss.tools.common.model.XFilteredTreeConstraint;
+import org.jboss.tools.common.model.ui.editor.EditorDescriptor;
+import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor;
+import org.jboss.tools.common.model.util.ModelFeatureFactory;
+
+public class ESBCompoundEditor extends DefaultMultipageEditor {
+ public static String EDITOR_TREE_CONSTRAINT_ID = "editorTreeConstraint"; //$NON-NLS-1$
+
+ protected void doCreatePages() {
+ if(isAppropriateNature()) {
+ treeFormPage = createTreeFormPage();
+ String title = "title not found";
+ if(object != null) {
+ String key = object.getModelEntity().getName() + ".editorTitle"; //$NON-NLS-1$
+ String s = WizardKeys.getString(key);
+ if(s != null) title = s;
+ }
+ treeFormPage.setTitle(title);
+ addTreeConstraint();
+ treeFormPage.initialize(object);
+ addFormPage(treeFormPage);
+ }
+ createTextPage();
+ initEditors();
+ if(treeFormPage != null) selectionProvider.addHost("treeEditor", treeFormPage.getSelectionProvider()); //$NON-NLS-1$
+ if(textEditor != null) selectionProvider.addHost("textEditor", getTextSelectionProvider()); //$NON-NLS-1$
+ }
+
+ protected void addTreeConstraint() {
+ XFilteredTreeConstraint constraint = null;
+ String editorTreeConstraintId = object.getModelEntity().getProperty(EDITOR_TREE_CONSTRAINT_ID);
+ if(editorTreeConstraintId != null) {
+ constraint = (XFilteredTreeConstraint)ModelFeatureFactory.getInstance().createFeatureInstance(editorTreeConstraintId);
+ }
+ if(constraint != null) {
+ ((TreeFormPage)treeFormPage).addFilter(constraint);
+ }
+ }
+
+ public Object getAdapter(Class adapter) {
+ if (adapter == EditorDescriptor.class)
+ return new EditorDescriptor("web.xml"); //$NON-NLS-1$
+
+ return super.getAdapter(adapter);
+ }
+
+ protected String[] getSupportedNatures() {
+ return new String[0];
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/esb/plugins/org.jboss.tools.esb.ui/src/org/jboss/tools/esb/ui/editor/ESBCompoundEditor.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 8 months