JBoss Tools SVN: r25921 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui: src/org/jboss/tools/deltacloud/ui/views and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjohnstn
Date: 2010-10-19 15:41:57 -0400 (Tue, 19 Oct 2010)
New Revision: 25921
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
Log:
2010-10-19 Jeff Johnston <jjohnstn(a)redhat.com>
[JBIDE-7366]
* src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (InstancePropertySource): Calculate
the cloud in the constructor.
(getPropertyValue): For non-mock clouds where the keyname is not filled in, attempt to
refresh the instance to get the keyname.
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-19 19:39:51 UTC (rev 25920)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/ChangeLog 2010-10-19 19:41:57 UTC (rev 25921)
@@ -1,3 +1,11 @@
+2010-10-19 Jeff Johnston <jjohnstn(a)redhat.com>
+
+ [JBIDE-7366]
+ * src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java (InstancePropertySource): Calculate
+ the cloud in the constructor.
+ (getPropertyValue): For non-mock clouds where the keyname is not filled in, attempt to
+ refresh the instance to get the keyname.
+
2010-10-14 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/ui/views/DeltaCloudView.java:
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-10-19 19:39:51 UTC (rev 25920)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-10-19 19:41:57 UTC (rev 25921)
@@ -15,6 +15,7 @@
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
public class InstancePropertySource implements IPropertySource {
@@ -40,7 +41,13 @@
private IPropertyDescriptor[] propertyDescriptors;
private DeltaCloudInstance instance;
+ private DeltaCloud cloud;
public InstancePropertySource(CVInstanceElement element, Object o) {
+ CloudViewElement parent = (CloudViewElement)element.getParent();
+ while (parent != null && !(parent instanceof CVCloudElement)) {
+ parent = (CloudViewElement)parent.getParent();
+ }
+ cloud = (DeltaCloud)parent.getElement();
instance = (DeltaCloudInstance)o;
}
@@ -101,8 +108,27 @@
return instance.getRealmId();
if (id.equals(PROPERTY_IMAGEID))
return instance.getImageId();
- if (id.equals(PROPERTY_KEYNAME))
- return instance.getKey();
+ if (id.equals(PROPERTY_KEYNAME)) {
+ // At present (Deltacloud 0.0.7), the keyname is omitted
+ // in the data passed back from a listInstances request.
+ // If an instance is running and the keyname is missing,
+ // we can refresh the instance by its id and this will give us
+ // the full data. We can then replace the instance so that
+ // it will be complete for future requests until a refresh gets the
+ // entire list again.
+ String key = instance.getKey();
+ if (!cloud.getType().equals(DeltaCloudInstance.MOCK_TYPE)) {
+ if (instance.getState().equals(DeltaCloudInstance.RUNNING) && (key == null || key.length() == 0)) {
+ instance = cloud.refreshInstance(instance.getId());
+ if (instance != null) {
+ key = instance.getKey();
+ if (key != null && key.length() > 0)
+ cloud.addReplaceInstance(instance);
+ }
+ }
+ }
+ return key;
+ }
if (id.equals(PROPERTY_STATE)) {
return instance.getState();
}
13 years, 8 months
JBoss Tools SVN: r25920 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-19 15:39:51 -0400 (Tue, 19 Oct 2010)
New Revision: 25920
Modified:
trunk/build/build.xml
Log:
support 5.2.0.SNAPSHOT jars
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-10-19 17:00:56 UTC (rev 25919)
+++ trunk/build/build.xml 2010-10-19 19:39:51 UTC (rev 25920)
@@ -1354,6 +1354,13 @@
replace="\1"
override="true"
/>
+ <propertyregex property="artifact.id"
+ defaultvalue="${artifact.id}"
+ input="${artifact.id}"
+ regexp="([^_]+)_(\d+\.\d+\.\d+.SNAPSHOT)\.jar"
+ replace="\1"
+ override="true"
+ />
<var name="artifactJar" unset="true" />
</target>
@@ -1368,6 +1375,7 @@
<property name="artifactJar" value="@{artifactJar}" />
<property name="regexp.path" value=".+/plugins/([^/]+.+\.jar)" />
</antcallback>
+ <echo level="verbose">Unzip @{artifactJar} into ${WORKINGDIR}/${COMPONENT}/plugins/${artifact.id}</echo>
<unzip src="@{artifactJar}" dest="${WORKINGDIR}/${COMPONENT}/plugins/${artifact.id}" overwrite="true" />
<var name="artifact.id" unset="true" />
</sequential>
13 years, 8 months
JBoss Tools SVN: r25919 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-19 13:00:56 -0400 (Tue, 19 Oct 2010)
New Revision: 25919
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
Log:
JBIDE-7364
Content Assist doesn't show EL propolals within <style> tag content
Issue is fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2010-10-19 17:00:37 UTC (rev 25918)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/computers/AbstractXmlCompletionProposalComputer.java 2010-10-19 17:00:56 UTC (rev 25919)
@@ -651,8 +651,37 @@
return region;
}
+ protected ContentAssistRequest computeCompletionProposals(String matchString, ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode, CompletionProposalInvocationContext context) {
+ ContentAssistRequest contentAssistRequest = super.computeCompletionProposals(matchString, completionRegion, treeNode, xmlnode, context);
+ if (contentAssistRequest == null) {
+ IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(context.getInvocationOffset());
+ contentAssistRequest = newContentAssistRequest((Node) treeNode, treeNode.getParentNode(), sdRegion, completionRegion, context.getInvocationOffset(), 0, ""); //$NON-NLS-1$
+ }
+
+ String regionType = completionRegion.getType();
+
+ /*
+ * Jeremy: Add attribute name proposals before empty tag close
+ */
+ if ((xmlnode.getNodeType() == Node.ELEMENT_NODE) || (xmlnode.getNodeType() == Node.DOCUMENT_NODE)) {
+ if (regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
+ addAttributeNameProposals(contentAssistRequest, context);
+ } else if ((regionType == DOMRegionContext.XML_CONTENT)
+ || (regionType == DOMRegionContext.XML_CHAR_REFERENCE)
+ || (regionType == DOMRegionContext.XML_ENTITY_REFERENCE)
+ || (regionType == DOMRegionContext.XML_PE_REFERENCE)
+ || (regionType == DOMRegionContext.BLOCK_TEXT)
+ || (regionType == DOMRegionContext.XML_END_TAG_OPEN)) {
+ addTextELProposals(contentAssistRequest, context);
+ }
+ }
+
+ return contentAssistRequest;
+ }
-
+ protected ContentAssistRequest newContentAssistRequest(Node node, Node possibleParent, IStructuredDocumentRegion documentRegion, ITextRegion completionRegion, int begin, int length, String filter) {
+ return new ContentAssistRequest(node, possibleParent, documentRegion, completionRegion, begin, length, filter);
+ }
/**
* Calculates and adds the tag name proposals to the Content Assist Request object
*
13 years, 8 months
JBoss Tools SVN: r25918 - in trunk: seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet and 12 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-19 13:00:37 -0400 (Tue, 19 Oct 2010)
New Revision: 25918
Added:
trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam211GAFacetInstallDelegateTest.java
trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam220CR1FacetInstallDelegateTest.java
Removed:
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java
Modified:
trunk/requirements/seam-2.2.1.CR2/build.properties
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
trunk/seam/tests/org.jboss.tools.seam211GA.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java
trunk/seam/tests/org.jboss.tools.seam212GA.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam212GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite212GA.java
trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java
trunk/seam/tests/org.jboss.tools.seam220GA.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam220GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220GA.java
trunk/seam/tests/org.jboss.tools.seam221CR1.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam221CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite221CR1.java
trunk/seam/tests/org.jboss.tools.seam221CR2.core.test/META-INF/MANIFEST.MF
trunk/seam/tests/org.jboss.tools.seam221CR2.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite221CR2.java
Log:
https://jira.jboss.org/browse/JBIDE-7358 Fixed Seam tests
Modified: trunk/requirements/seam-2.2.1.CR2/build.properties
===================================================================
--- trunk/requirements/seam-2.2.1.CR2/build.properties 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/requirements/seam-2.2.1.CR2/build.properties 2010-10-19 17:00:37 UTC (rev 25918)
@@ -1,6 +1,6 @@
#seam.build.uri=http://downloads.sourceforge.net/sourceforge/jboss
seam.build.uri=http://softlayer.dl.sourceforge.net/project/jboss/JBoss%20...
-seam-2.2.1.CR1.build.uri=${seam.build.uri}
+seam-2.2.1.CR2.build.uri=${seam.build.uri}
build.uri=${seam-2.2.1.CR2.build.uri}
build.archive=jboss-seam-2.2.1.CR2.zip
build.archive.root=jboss-seam-2.2.1.CR2
Deleted: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 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.seam.core.test.project.facet;
-
-/**
- * @author eskimo
- *
- */
-public class Seam20XFacetTestSuite211GA extends Seam20XFacetTestSuite201GA {
-
-}
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -32,7 +32,6 @@
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
import org.eclipse.wst.validation.ValidationFramework;
import org.eclipse.wst.validation.internal.EventManager;
-import org.jboss.tools.common.model.XJob;
import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
@@ -47,7 +46,6 @@
private IProjectFacet seam2Facet;
private IProjectFacetVersion seam2FacetVersion;
private boolean suspendAllValidation;
- private boolean suspendXJobs;
public Seam2FacetInstallDelegateTest(String name) {
super(name);
@@ -121,8 +119,7 @@
return dataModel;
}
- public void testWarLibs() throws CoreException {
-
+ protected Set<String> getWarLibs() {
Set<String> seamgenlibs = new HashSet<String>();
seamgenlibs.add("antlr-runtime.jar");
@@ -149,6 +146,13 @@
seamgenlibs.add("jfreechart.jar");
seamgenlibs.add("jcommon.jar");
+ return seamgenlibs;
+ }
+
+ public void testWarLibs() throws CoreException {
+
+ Set<String> seamgenlibs = getWarLibs();
+
final IContainer warLibs = (IContainer) warProject.getProject()
.findMember("WebContent/WEB-INF/lib").getAdapter(
IContainer.class);
@@ -171,23 +175,9 @@
}
}
- public void testEarLibs() throws CoreException {
- IProject war = earProject.getProject();
-
- SeamProjectsSet seamProjectsSet = new SeamProjectsSet(earProject
- .getProject());
-
- IProject ear = seamProjectsSet.getEarProject();
-
- Set<String> onlyInWar = new HashSet<String>();
+ protected Set<String> getEarLibs() {
Set<String> onlyInEar = new HashSet<String>();
- Set<String> onlyInEarSeam = new HashSet<String>();
- Set<String> onlyInEjbSrc = new HashSet<String>();
- onlyInEarSeam.add("jboss-seam.jar");
- onlyInEarSeam.add("lib");
- onlyInEarSeam.add("META-INF");
-
onlyInEar.add("commons-beanutils.jar");
onlyInEar.add("antlr-runtime.jar");
onlyInEar.add("drools-compiler.jar");
@@ -198,6 +188,12 @@
onlyInEar.add("richfaces-api.jar");
onlyInEar.add("jbpm-jpdl.jar");
+ return onlyInEar;
+ }
+
+ protected Set<String> getEarWarLibs() {
+ Set<String> onlyInWar = new HashSet<String>();
+
onlyInWar.add("commons-digester.jar");
onlyInWar.add("jboss-seam-debug.jar");
onlyInWar.add("jboss-seam-ioc.jar");
@@ -211,6 +207,26 @@
onlyInWar.add("jfreechart.jar");
onlyInWar.add("jcommon.jar");
+ return onlyInWar;
+ }
+
+ public void testEarLibs() throws CoreException {
+ IProject war = earProject.getProject();
+
+ SeamProjectsSet seamProjectsSet = new SeamProjectsSet(earProject
+ .getProject());
+
+ IProject ear = seamProjectsSet.getEarProject();
+
+ Set<String> onlyInWar = getEarWarLibs();
+ Set<String> onlyInEar = getEarLibs();
+ Set<String> onlyInEarSeam = new HashSet<String>();
+ Set<String> onlyInEjbSrc = new HashSet<String>();
+
+ onlyInEarSeam.add("jboss-seam.jar");
+ onlyInEarSeam.add("lib");
+ onlyInEarSeam.add("META-INF");
+
final IContainer earLibsSeam = (IContainer) ear.findMember(
new Path("EarContent")).getAdapter(IContainer.class);
@@ -225,7 +241,7 @@
final IContainer earMeta = (IContainer) ear.findMember(
"EarContent/META-INF").getAdapter(IContainer.class);
- Set onlyInEarMeta = new HashSet();
+ Set<String> onlyInEarMeta = new HashSet<String>();
onlyInEarMeta.add("jboss-app.xml");
onlyInEarMeta.add("application.xml");
Modified: trunk/seam/tests/org.jboss.tools.seam211GA.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.core.test/META-INF/MANIFEST.MF 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.core.test/META-INF/MANIFEST.MF 2010-10-19 17:00:37 UTC (rev 25918)
@@ -7,8 +7,11 @@
Export-Package: org.jboss.tools.seam.core.test.project.facet
Require-Bundle:
org.junit,
- org.jboss.tools.tests;bundle-version="3.1.0",
- org.jboss.tools.seam.core.test;bundle-version="3.1.0",
- org.eclipse.wst.validation;bundle-version="1.2.200"
+ org.jboss.tools.tests,
+ org.jboss.tools.seam.core.test,
+ org.eclipse.wst.validation,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.core.runtime,
+ org.eclipse.wst.common.frameworks
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite211GA.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -10,10 +10,18 @@
******************************************************************************/
package org.jboss.tools.seam.core.test.project.facet;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
/**
* @author eskimo
*
*/
public class Seam20XFacetTestSuite211GA extends Seam20XFacetTestSuite201GA {
-}
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Seam 2.1.* tests");
+ suite.addTest(new Seam2FacetInstallDelegateTestSetup(new TestSuite(Seam211GAFacetInstallDelegateTest.class)));
+ return suite;
+ }
+}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam211GAFacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam211GAFacetInstallDelegateTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam211GAFacetInstallDelegateTest.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.seam.core.test.project.facet;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class Seam211GAFacetInstallDelegateTest extends Seam2FacetInstallDelegateTest {
+
+ public Seam211GAFacetInstallDelegateTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected Set<String> getEarWarLibs() {
+ Set<String> onlyInWar = new HashSet<String>();
+
+ onlyInWar.add("commons-digester.jar");
+ onlyInWar.add("jboss-seam-debug.jar");
+ onlyInWar.add("jboss-seam-ioc.jar");
+ onlyInWar.add("jboss-seam-mail.jar");
+ onlyInWar.add("jboss-seam-pdf.jar");
+ onlyInWar.add("jboss-seam-ui.jar");
+ onlyInWar.add("jsf-facelets.jar");
+ onlyInWar.add("richfaces-impl.jar");
+ onlyInWar.add("richfaces-ui.jar");
+ onlyInWar.add("itext.jar");
+ onlyInWar.add("jfreechart.jar");
+ onlyInWar.add("jcommon.jar");
+ onlyInWar.add("jboss-seam-excel.jar");
+ onlyInWar.add("itext-rtf.jar");
+ onlyInWar.add("jxl.jar");
+
+ return onlyInWar;
+ }
+
+ @Override
+ protected Set<String> getWarLibs() {
+ Set<String> seamgenlibs = new HashSet<String>();
+
+ seamgenlibs.add("antlr-runtime.jar");
+ seamgenlibs.add("commons-beanutils.jar");
+ seamgenlibs.add("commons-digester.jar");
+ seamgenlibs.add("drools-compiler.jar");
+ seamgenlibs.add("drools-core.jar");
+ seamgenlibs.add("core.jar");
+ seamgenlibs.add("jboss-el.jar");
+ seamgenlibs.add("jboss-seam-debug.jar");
+ seamgenlibs.add("jboss-seam-ioc.jar");
+ seamgenlibs.add("jboss-seam.jar");
+ seamgenlibs.add("jboss-seam-mail.jar");
+ seamgenlibs.add("jboss-seam-pdf.jar");
+ seamgenlibs.add("jboss-seam-remoting.jar");
+ seamgenlibs.add("jboss-seam-ui.jar");
+ seamgenlibs.add("jbpm-jpdl.jar");
+ seamgenlibs.add("jsf-facelets.jar");
+ seamgenlibs.add("mvel14.jar");
+ seamgenlibs.add("richfaces-api.jar");
+ seamgenlibs.add("richfaces-impl.jar");
+ seamgenlibs.add("richfaces-ui.jar");
+ seamgenlibs.add("itext.jar");
+ seamgenlibs.add("jfreechart.jar");
+ seamgenlibs.add("jcommon.jar");
+ seamgenlibs.add("jboss-seam-excel.jar");
+ seamgenlibs.add("itext-rtf.jar");
+ seamgenlibs.add("jxl.jar");
+
+ return seamgenlibs;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam211GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam211GAFacetInstallDelegateTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam212GA.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam212GA.core.test/META-INF/MANIFEST.MF 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam212GA.core.test/META-INF/MANIFEST.MF 2010-10-19 17:00:37 UTC (rev 25918)
@@ -7,8 +7,9 @@
Export-Package: org.jboss.tools.seam.core.test.project.facet
Require-Bundle:
org.junit,
- org.jboss.tools.tests;bundle-version="3.1.0",
- org.jboss.tools.seam.core.test;bundle-version="3.1.0",
- org.eclipse.wst.validation;bundle-version="1.2.200"
+ org.jboss.tools.tests,
+ org.jboss.tools.seam.core.test,
+ org.eclipse.wst.validation,
+ org.jboss.tools.seam211GA.core.test
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam212GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite212GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam212GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite212GA.java 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam212GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite212GA.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -14,6 +14,6 @@
* @author eskimo
*
*/
-public class Seam20XFacetTestSuite212GA extends Seam20XFacetTestSuite201GA {
-
-}
+public class Seam20XFacetTestSuite212GA extends Seam20XFacetTestSuite211GA {
+
+}
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/META-INF/MANIFEST.MF 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/META-INF/MANIFEST.MF 2010-10-19 17:00:37 UTC (rev 25918)
@@ -7,8 +7,11 @@
Export-Package: org.jboss.tools.seam.core.test.project.facet
Require-Bundle:
org.junit,
- org.jboss.tools.tests;bundle-version="3.1.0",
- org.jboss.tools.seam.core.test;bundle-version="3.1.0",
- org.eclipse.wst.validation;bundle-version="1.2.200"
+ org.jboss.tools.tests,
+ org.jboss.tools.seam.core.test,
+ org.eclipse.wst.validation,
+ org.eclipse.wst.common.project.facet.core,
+ org.eclipse.core.runtime,
+ org.eclipse.wst.common.frameworks
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2010 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,
@@ -10,10 +10,17 @@
******************************************************************************/
package org.jboss.tools.seam.core.test.project.facet;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
/**
- * @author eskimo
- *
+ * @author Alexey Kazakov
*/
public class Seam20XFacetTestSuite220CR1 extends Seam20XFacetTestSuite201GA {
-}
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Seam 2.2.* tests");
+ suite.addTest(new Seam2FacetInstallDelegateTestSetup(new TestSuite(Seam220CR1FacetInstallDelegateTest.class)));
+ return suite;
+ }
+}
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam220CR1FacetInstallDelegateTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam220CR1FacetInstallDelegateTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam220CR1FacetInstallDelegateTest.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.seam.core.test.project.facet;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class Seam220CR1FacetInstallDelegateTest extends Seam2FacetInstallDelegateTest {
+
+ public Seam220CR1FacetInstallDelegateTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected Set<String> getEarLibs() {
+ Set<String> onlyInEar = new HashSet<String>();
+
+ onlyInEar.add("commons-beanutils.jar");
+ onlyInEar.add("antlr-runtime.jar");
+ onlyInEar.add("drools-api.jar");
+ onlyInEar.add("drools-compiler.jar");
+ onlyInEar.add("drools-core.jar");
+ onlyInEar.add("jboss-el.jar");
+ onlyInEar.add("jboss-seam-remoting.jar");
+ onlyInEar.add("mvel2.jar");
+ onlyInEar.add("richfaces-api.jar");
+ onlyInEar.add("jbpm-jpdl.jar");
+
+ return onlyInEar;
+ }
+
+ @Override
+ protected Set<String> getWarLibs() {
+ Set<String> seamgenlibs = new HashSet<String>();
+
+ seamgenlibs.add("antlr-runtime.jar");
+ seamgenlibs.add("commons-beanutils.jar");
+ seamgenlibs.add("commons-digester.jar");
+ seamgenlibs.add("drools-api.jar");
+ seamgenlibs.add("drools-compiler.jar");
+ seamgenlibs.add("drools-core.jar");
+ seamgenlibs.add("core.jar");
+ seamgenlibs.add("jboss-el.jar");
+ seamgenlibs.add("jboss-seam-debug.jar");
+ seamgenlibs.add("jboss-seam-ioc.jar");
+ seamgenlibs.add("jboss-seam.jar");
+ seamgenlibs.add("jboss-seam-mail.jar");
+ seamgenlibs.add("jboss-seam-pdf.jar");
+ seamgenlibs.add("jboss-seam-remoting.jar");
+ seamgenlibs.add("jboss-seam-ui.jar");
+ seamgenlibs.add("jbpm-jpdl.jar");
+ seamgenlibs.add("jsf-facelets.jar");
+ seamgenlibs.add("mvel2.jar");
+ seamgenlibs.add("richfaces-api.jar");
+ seamgenlibs.add("richfaces-impl.jar");
+ seamgenlibs.add("richfaces-ui.jar");
+ seamgenlibs.add("itext.jar");
+ seamgenlibs.add("jfreechart.jar");
+ seamgenlibs.add("jcommon.jar");
+ seamgenlibs.add("jboss-seam-excel.jar");
+ seamgenlibs.add("itext-rtf.jar");
+ seamgenlibs.add("jxl.jar");
+
+ return seamgenlibs;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam220CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam220CR1FacetInstallDelegateTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam220GA.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220GA.core.test/META-INF/MANIFEST.MF 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam220GA.core.test/META-INF/MANIFEST.MF 2010-10-19 17:00:37 UTC (rev 25918)
@@ -7,8 +7,9 @@
Export-Package: org.jboss.tools.seam.core.test.project.facet
Require-Bundle:
org.junit,
- org.jboss.tools.tests;bundle-version="3.1.0",
- org.jboss.tools.seam.core.test;bundle-version="3.1.0",
- org.eclipse.wst.validation;bundle-version="1.2.200"
+ org.jboss.tools.tests,
+ org.jboss.tools.seam.core.test,
+ org.eclipse.wst.validation,
+ org.jboss.tools.seam220CR1.core.test
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam220GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220GA.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam220GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220GA.java 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam220GA.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220GA.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -14,6 +14,6 @@
* @author eskimo
*
*/
-public class Seam20XFacetTestSuite220GA extends Seam20XFacetTestSuite201GA {
+public class Seam20XFacetTestSuite220GA extends Seam20XFacetTestSuite220CR1 {
-}
+}
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam221CR1.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam221CR1.core.test/META-INF/MANIFEST.MF 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam221CR1.core.test/META-INF/MANIFEST.MF 2010-10-19 17:00:37 UTC (rev 25918)
@@ -7,8 +7,9 @@
Export-Package: org.jboss.tools.seam.core.test.project.facet
Require-Bundle:
org.junit,
- org.jboss.tools.tests;bundle-version="3.1.0",
- org.jboss.tools.seam.core.test;bundle-version="3.1.0",
- org.eclipse.wst.validation;bundle-version="1.2.200"
+ org.jboss.tools.tests,
+ org.jboss.tools.seam.core.test,
+ org.eclipse.wst.validation,
+ org.jboss.tools.seam220CR1.core.test
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam221CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite221CR1.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam221CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite221CR1.java 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam221CR1.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite221CR1.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -14,6 +14,6 @@
* @author eskimo
*
*/
-public class Seam20XFacetTestSuite221CR1 extends Seam20XFacetTestSuite201GA {
+public class Seam20XFacetTestSuite221CR1 extends Seam20XFacetTestSuite220CR1 {
-}
+}
\ No newline at end of file
Modified: trunk/seam/tests/org.jboss.tools.seam221CR2.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam221CR2.core.test/META-INF/MANIFEST.MF 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam221CR2.core.test/META-INF/MANIFEST.MF 2010-10-19 17:00:37 UTC (rev 25918)
@@ -7,8 +7,9 @@
Export-Package: org.jboss.tools.seam.core.test.project.facet
Require-Bundle:
org.junit,
- org.jboss.tools.tests;bundle-version="3.1.0",
- org.jboss.tools.seam.core.test;bundle-version="3.1.0",
- org.eclipse.wst.validation;bundle-version="1.2.200"
+ org.jboss.tools.tests,
+ org.jboss.tools.seam.core.test,
+ org.eclipse.wst.validation,
+ org.jboss.tools.seam220CR1.core.test
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/seam/tests/org.jboss.tools.seam221CR2.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite221CR2.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam221CR2.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite221CR2.java 2010-10-19 16:37:39 UTC (rev 25917)
+++ trunk/seam/tests/org.jboss.tools.seam221CR2.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite221CR2.java 2010-10-19 17:00:37 UTC (rev 25918)
@@ -14,6 +14,6 @@
* @author eskimo
*
*/
-public class Seam20XFacetTestSuite221CR2 extends Seam20XFacetTestSuite201GA {
+public class Seam20XFacetTestSuite221CR2 extends Seam20XFacetTestSuite220CR1 {
-}
+}
\ No newline at end of file
13 years, 8 months
JBoss Tools SVN: r25917 - in trunk/drools: features/org.drools.eclipse.task.feature and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-19 12:37:39 -0400 (Tue, 19 Oct 2010)
New Revision: 25917
Modified:
trunk/drools/features/org.drools.eclipse.feature/pom.xml
trunk/drools/features/org.drools.eclipse.task.feature/pom.xml
trunk/drools/features/org.guvnor.tools.feature/pom.xml
trunk/drools/plugins/org.drools.eclipse.task/pom.xml
trunk/drools/plugins/org.drools.eclipse/pom.xml
trunk/drools/plugins/org.guvnor.tools/pom.xml
Log:
bump versions from 5.1.1 to 5.2.0.SNAPSHOT
Modified: trunk/drools/features/org.drools.eclipse.feature/pom.xml
===================================================================
--- trunk/drools/features/org.drools.eclipse.feature/pom.xml 2010-10-19 16:27:51 UTC (rev 25916)
+++ trunk/drools/features/org.drools.eclipse.feature/pom.xml 2010-10-19 16:37:39 UTC (rev 25917)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.drools.features</groupId>
<artifactId>org.drools.eclipse.feature</artifactId>
- <version>5.1.1</version>
+ <version>5.2.0.SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: trunk/drools/features/org.drools.eclipse.task.feature/pom.xml
===================================================================
--- trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-10-19 16:27:51 UTC (rev 25916)
+++ trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-10-19 16:37:39 UTC (rev 25917)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.drools.features</groupId>
<artifactId>org.drools.eclipse.task.feature</artifactId>
- <version>5.1.1</version>
+ <version>5.2.0.SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: trunk/drools/features/org.guvnor.tools.feature/pom.xml
===================================================================
--- trunk/drools/features/org.guvnor.tools.feature/pom.xml 2010-10-19 16:27:51 UTC (rev 25916)
+++ trunk/drools/features/org.guvnor.tools.feature/pom.xml 2010-10-19 16:37:39 UTC (rev 25917)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.drools.features</groupId>
<artifactId>org.guvnor.tools.feature</artifactId>
- <version>5.1.1</version>
+ <version>5.2.0.SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
Modified: trunk/drools/plugins/org.drools.eclipse/pom.xml
===================================================================
--- trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-10-19 16:27:51 UTC (rev 25916)
+++ trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-10-19 16:37:39 UTC (rev 25917)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.drools.plugins</groupId>
<artifactId>org.drools.eclipse</artifactId>
- <version>5.1.1</version>
+ <version>5.2.0.SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/drools/plugins/org.drools.eclipse.task/pom.xml
===================================================================
--- trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-10-19 16:27:51 UTC (rev 25916)
+++ trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-10-19 16:37:39 UTC (rev 25917)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.drools.plugins</groupId>
<artifactId>org.drools.eclipse.task</artifactId>
- <version>5.1.1</version>
+ <version>5.2.0.SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
Modified: trunk/drools/plugins/org.guvnor.tools/pom.xml
===================================================================
--- trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-10-19 16:27:51 UTC (rev 25916)
+++ trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-10-19 16:37:39 UTC (rev 25917)
@@ -9,6 +9,6 @@
</parent>
<groupId>org.jboss.tools.drools.plugins</groupId>
<artifactId>org.guvnor.tools</artifactId>
- <version>5.1.1</version>
+ <version>5.2.0.SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
13 years, 8 months
JBoss Tools SVN: r25915 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-19 09:56:04 -0400 (Tue, 19 Oct 2010)
New Revision: 25915
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
Log:
JBIDE-7349
https://jira.jboss.org/browse/JBIDE-7349
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2010-10-19 12:36:07 UTC (rev 25914)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/editor/check/ProjectNaturesChecker.java 2010-10-19 13:56:04 UTC (rev 25915)
@@ -21,9 +21,8 @@
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IWindowListener;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.reporting.ProblemReportingHelper;
@@ -66,16 +65,12 @@
projectsCollection = new HashSet<IProject>(0);
// ResourcesPlugin.getWorkspace().addResourceChangeListener(this,
// IResourceChangeEvent.POST_CHANGE);
- IWorkbenchWindow window = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- window.getPartService().addPartListener(partListener);
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()
- .addDisposeListener(new DisposeListener() {
-
- public void widgetDisposed(DisposeEvent e) {
- dispose();
- }
- });
+ IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
+ if(windows != null) for (IWorkbenchWindow window: windows) {
+ window.getPartService().addPartListener(partListener);
+ }
+
+ PlatformUI.getWorkbench().addWindowListener(new WindowListener());
}
public void resourceChanged(final IResourceChangeEvent event) {
@@ -192,9 +187,6 @@
public void dispose() {
if (partListener != null) {
- IWorkbenchWindow window = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- window.getPartService().removePartListener(partListener);
partListener = null;
}
// ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
@@ -249,4 +241,22 @@
return kbProblemMarker;
}
+ class WindowListener implements IWindowListener {
+
+ public void windowActivated(IWorkbenchWindow window) {
+ }
+
+ public void windowDeactivated(IWorkbenchWindow window) {
+ }
+
+ public void windowClosed(IWorkbenchWindow window) {
+ window.getPartService().removePartListener(partListener);
+ }
+
+ public void windowOpened(IWorkbenchWindow window) {
+ window.getPartService().addPartListener(partListener);
+ }
+
+ }
+
}
13 years, 8 months
JBoss Tools SVN: r25914 - trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-19 08:36:07 -0400 (Tue, 19 Oct 2010)
New Revision: 25914
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java
Log:
Fixed compilation problems
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java 2010-10-19 10:58:00 UTC (rev 25913)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/src/org/jboss/tools/vpe/docbook/template/DocbookProgramlistingTemplate.java 2010-10-19 12:36:07 UTC (rev 25914)
@@ -11,9 +11,6 @@
package org.jboss.tools.vpe.docbook.template;
-import java.util.ArrayList;
-import java.util.List;
-
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
@@ -21,7 +18,6 @@
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMText;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -33,7 +29,6 @@
*/
public class DocbookProgramlistingTemplate extends VpeAbstractTemplate {
- @Override
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
13 years, 8 months
JBoss Tools SVN: r25913 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-19 06:58:00 -0400 (Tue, 19 Oct 2010)
New Revision: 25913
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
Log:
JBIDE-7195
org.jboss.tools.jsf.ui.test fails
CA Proposals filtering is fixed
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2010-10-19 10:56:18 UTC (rev 25912)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/TestUtil.java 2010-10-19 10:58:00 UTC (rev 25913)
@@ -22,6 +22,7 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.AbstractTextEditor;
import org.eclipse.wst.sse.ui.internal.contentassist.StructuredContentAssistant;
+import org.jboss.tools.common.text.xml.contentassist.ProposalSorter;
public class TestUtil {
@@ -135,7 +136,7 @@
res.add(result[j]);
}
}
- return res;
+ return ProposalSorter.filterAndSortProposals(res, null, null);
}
/**
* Close all opened editors
13 years, 8 months
JBoss Tools SVN: r25912 - in trunk/jst: plugins/org.jboss.tools.neweditor.sidebyside and 18 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2010-10-19 06:56:18 -0400 (Tue, 19 Oct 2010)
New Revision: 25912
Added:
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.classpath
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.project
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.settings/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.settings/org.eclipse.jdt.core.prefs
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/META-INF/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/META-INF/MANIFEST.MF
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/OSGI-INF/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/OSGI-INF/l10n/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/OSGI-INF/l10n/bundle.properties
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/sidebyside/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/sidebyside/SideBySideActivator.class
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/sidebyside/handlers/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/sidebyside/handlers/SideBySideHandler.class
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/build.properties
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/plugin.xml
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/SideBySideActivator.java
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/handlers/
trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/handlers/SideBySideHandler.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/NewEditorSideBySideCommandTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
Log:
https://jira.jboss.org/browse/JBIDE-6685
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.classpath
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.classpath (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.classpath 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.project
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.project (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.project 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.neweditor.sidebyside</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/.settings/org.eclipse.jdt.core.prefs 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,8 @@
+#Mon Oct 18 11:45:42 EEST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/META-INF/MANIFEST.MF 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: NewEditorSideBySide
+Bundle-SymbolicName: org.jboss.tools.neweditor.sidebyside;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.sidebyside.SideBySideActivator
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/OSGI-INF/l10n/bundle.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/OSGI-INF/l10n/bundle.properties (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/OSGI-INF/l10n/bundle.properties 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,3 @@
+#Properties file for org.jboss.tools.sidebyside
+command.newEditor.sidebyside.name=New Editor (Side by Side)
+command.newEditor.sidebyside.description=Open New Editor Side by Side to active Editor
\ No newline at end of file
Property changes on: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin
___________________________________________________________________
Name: svn:ignore
+ target
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/sidebyside/SideBySideActivator.class
===================================================================
(Binary files differ)
Property changes on: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/sidebyside/SideBySideActivator.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/sidebyside/handlers/SideBySideHandler.class
===================================================================
(Binary files differ)
Property changes on: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/bin/org/jboss/tools/sidebyside/handlers/SideBySideHandler.class
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/build.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/build.properties (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/build.properties 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = plugin.xml,\
+ META-INF/,\
+ .,\
+ icons/,\
+ plugin.properties,\
+ OSGI-INF/l10n/bundle.properties
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/plugin.xml (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/plugin.xml 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+ <extension
+ point="org.eclipse.ui.commands">
+ <command
+ description="%command.newEditor.sidebyside.description"
+ name="%command.newEditor.sidebyside.name"
+ categoryId="org.eclipse.ui.category.window"
+ id="org.jboss.tools.sidebyside.newEditor">
+ </command>
+ </extension>
+ <extension
+ point="org.eclipse.ui.handlers">
+ <handler
+ commandId="org.jboss.tools.sidebyside.newEditor"
+ class="org.jboss.tools.sidebyside.handlers.SideBySideHandler">
+ <enabledWhen>
+ <with
+ variable="activeEditor">
+ <instanceof
+ value="org.eclipse.ui.IEditorPart">
+ </instanceof>
+ </with>
+ </enabledWhen>
+ </handler>
+ </extension>
+ <extension
+ point="org.eclipse.ui.bindings">
+ <key
+ commandId="org.jboss.tools.sidebyside.newEditor"
+ contextId="org.eclipse.ui.contexts.window"
+ sequence="M1+8"
+ schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+ </key>
+ </extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ locationURI="menu:window?after=newEditor">
+ <command
+ label="%command.newEditor.sidebyside.name"
+ commandId="org.jboss.tools.sidebyside.newEditor"
+ mnemonic="S"
+ id="org.jboss.tools.sidebyside.menus.newEditor">
+ </command>
+ </menuContribution>
+ </extension>
+</plugin>
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/SideBySideActivator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/SideBySideActivator.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/SideBySideActivator.java 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.sidebyside;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class SideBySideActivator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.sidebyside"; //$NON-NLS-1$
+
+ // The shared instance
+ private static SideBySideActivator plugin;
+
+ /**
+ * The constructor
+ */
+ public SideBySideActivator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static SideBySideActivator getDefault() {
+ return plugin;
+ }
+
+
+
+ /**
+ * Returns an image descriptor for the image file at the given
+ * plug-in relative path
+ *
+ * @param path the path
+ * @return the image descriptor
+ */
+ public static ImageDescriptor getImageDescriptor(String path) {
+ return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ }
+}
Added: trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/handlers/SideBySideHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/handlers/SideBySideHandler.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.neweditor.sidebyside/src/org/jboss/tools/sidebyside/handlers/SideBySideHandler.java 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,97 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.sidebyside.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.EditorSashContainer;
+import org.eclipse.ui.internal.EditorStack;
+import org.eclipse.ui.internal.ILayoutContainer;
+import org.eclipse.ui.internal.LayoutPart;
+import org.eclipse.ui.internal.PartPane;
+import org.eclipse.ui.internal.PartSashContainer;
+import org.eclipse.ui.internal.PartSite;
+import org.eclipse.ui.internal.PartStack;
+import org.eclipse.ui.internal.WorkbenchPage;
+import org.eclipse.ui.internal.handlers.NewEditorHandler;
+
+/**
+ * Handler which split active editor vertically
+ * @see https://jira.jboss.org/browse/JBIDE-6685
+ * @author mareshkau
+ */
+public class SideBySideHandler extends NewEditorHandler {
+
+ /**
+ * the command has been executed, so extract extract the needed information
+ * from the application context.
+ */
+ public Object execute(ExecutionEvent event) throws ExecutionException {
+ super.execute(event);
+ splitEditorArea();
+ return null;
+ }
+
+ private void splitEditorArea() {
+ IWorkbenchPage workbenchPage = PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ IWorkbenchPart part = workbenchPage.getActivePart();
+ PartPane partPane = ((PartSite) part.getSite()).getPane();
+ LayoutPart layoutPart = partPane.getPart();
+
+ // Get PartPane that correspond to the active editor
+ PartPane currentEditorPartPane = ((PartSite) workbenchPage
+ .getActiveEditor().getSite()).getPane();
+ EditorSashContainer editorSashContainer = null;
+ ILayoutContainer rootLayoutContainer = layoutPart.getContainer();
+ if (rootLayoutContainer instanceof LayoutPart) {
+ ILayoutContainer editorSashLayoutContainer = ((LayoutPart) rootLayoutContainer)
+ .getContainer();
+ if (editorSashLayoutContainer instanceof EditorSashContainer) {
+ editorSashContainer = ((EditorSashContainer) editorSashLayoutContainer);
+ }
+ }
+ /*
+ * Create a new part stack (i.e. a workbook) to home the
+ * currentEditorPartPane which hold the active editor
+ */
+ PartStack newPart = createStack(editorSashContainer);
+
+ editorSashContainer.stack(currentEditorPartPane, newPart);
+ if (rootLayoutContainer instanceof LayoutPart) {
+ ILayoutContainer cont = ((LayoutPart) rootLayoutContainer)
+ .getContainer();
+ if (cont instanceof PartSashContainer) {
+ // "Split" the editor area by adding the new part
+ ((PartSashContainer) cont).add(newPart);
+ }
+ }
+ }
+
+ /**
+ * A method to create a part stack container (a new workbook)
+ *
+ * @param editorSashContainer
+ * the <code>EditorSashContainer</code> to set for the returned
+ * <code>PartStack</code>
+ * @return a new part stack container
+ */
+ private PartStack createStack(EditorSashContainer editorSashContainer) {
+ WorkbenchPage workbenchPage = (WorkbenchPage) PlatformUI.getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage();
+ EditorStack newWorkbook = EditorStack.newEditorWorkbook(
+ editorSashContainer, workbenchPage);
+ return newWorkbook;
+ }
+}
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2010-10-19 09:00:18 UTC (rev 25911)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2010-10-19 10:56:18 UTC (rev 25912)
@@ -15,6 +15,7 @@
import org.jboss.tools.jst.jsp.test.ca.ExternalizeCommandTest;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
+import org.jboss.tools.jst.jsp.test.ca.NewEditorSideBySideCommandTest;
import org.jboss.tools.jst.jsp.test.ca.SelectionBarTest;
public class JstJspAllTests {
@@ -44,6 +45,7 @@
suite.addTestSuite(SelectionBarTest.class);
suite.addTestSuite(ExternalizeCommandTest.class);
+ suite.addTestSuite(NewEditorSideBySideCommandTest.class);
return suite;
}
Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/NewEditorSideBySideCommandTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/NewEditorSideBySideCommandTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/NewEditorSideBySideCommandTest.java 2010-10-19 10:56:18 UTC (rev 25912)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.jsp.test.ca;
+
+import junit.framework.TestCase;
+import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.NotEnabledException;
+import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.NotDefinedException;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.jboss.tools.test.util.TestProjectProvider;
+import org.jboss.tools.test.util.WorkbenchUtils;
+
+/**
+ *
+ * Junit test for https://jira.jboss.org/browse/JBIDE-6685 command
+ * @author mareshkau
+ *
+ */
+public class NewEditorSideBySideCommandTest extends TestCase {
+
+ public static final String NEW_EDITOR_SIDE_BY_SIDE_COMMAND_ID="org.jboss.tools.sidebyside.newEditor"; //$NON-NLS-1$
+ protected IProject project = null;
+ private TestProjectProvider provider = null;
+ private Command newEditorSideBySideCmd;
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, "JsfJbide1791Test",false); //$NON-NLS-1$ //$NON-NLS-2$
+ project = provider.getProject();
+ ICommandService commandService =
+ (ICommandService) PlatformUI.getWorkbench()
+ .getService(ICommandService.class);
+ newEditorSideBySideCmd = commandService.getCommand(
+ NEW_EDITOR_SIDE_BY_SIDE_COMMAND_ID);
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+ /**
+ * Test Side by Side command
+ * @throws NotDefinedException
+ * @throws NotHandledException
+ * @throws NotEnabledException
+ * @throws ExecutionException
+ */
+ public void testExternalizeCommand() throws NotDefinedException, ExecutionException, NotEnabledException, NotHandledException{
+ assertEquals(newEditorSideBySideCmd.getName()+ " should be disabled without opened editor",false,newEditorSideBySideCmd.isEnabled()); //$NON-NLS-1$
+ WorkbenchUtils.openEditor(project.getName()+"/WebContent/pages/newSideBySideEditorTest.txt"); //$NON-NLS-1$
+ assertEquals(newEditorSideBySideCmd.getName()+ " should be enabled when editor opened",true,newEditorSideBySideCmd.isEnabled()); //$NON-NLS-1$
+ }
+}
13 years, 8 months