JBoss Tools SVN: r34005 - trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-17 08:54:20 -0400 (Wed, 17 Aug 2011)
New Revision: 34005
Modified:
trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF
Log:
JBIDE-7052 The import org.hibernate cannot be resolved in org/jboss/tools/birt/oda/impl/ConsoleConfigurationOdaFactory.java (at line 17)
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2011-08-17 12:27:48 UTC (rev 34004)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2011-08-17 12:54:20 UTC (rev 34005)
@@ -12,6 +12,6 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.datatools.connectivity.oda;bundle-version="[3.1.0,4.0.0)",
org.eclipse.datatools.connectivity.oda.profile;bundle-version="[3.0.4,4.0.0)",
- org.hibernate.eclipse
+ org.hibernate.eclipse;resolution:=optional
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
14 years, 8 months
JBoss Tools SVN: r34004 - branches/jbosstools-3.2.x/birt/plugins/org.jboss.tools.birt.oda/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-17 08:27:48 -0400 (Wed, 17 Aug 2011)
New Revision: 34004
Modified:
branches/jbosstools-3.2.x/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF
Log:
JBIDE-7052 The import org.hibernate cannot be resolved in org/jboss/tools/birt/oda/impl/ConsoleConfigurationOdaFactory.java (at line 17)
Modified: branches/jbosstools-3.2.x/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.2.x/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2011-08-17 12:21:09 UTC (rev 34003)
+++ branches/jbosstools-3.2.x/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2011-08-17 12:27:48 UTC (rev 34004)
@@ -12,6 +12,6 @@
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.datatools.connectivity.oda;bundle-version="[3.1.0,4.0.0)",
org.eclipse.datatools.connectivity.oda.profile;bundle-version="[3.0.4,4.0.0)",
- org.hibernate.eclipse
+ org.hibernate.eclipse;resolution:=optional
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
14 years, 8 months
JBoss Tools SVN: r34003 - branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-08-17 08:21:09 -0400 (Wed, 17 Aug 2011)
New Revision: 34003
Modified:
branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
Log:
JBIDE-9103 Deadlock issue when creating a JSF portlet
Modified: branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java
===================================================================
--- branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2011-08-17 12:03:36 UTC (rev 34002)
+++ branches/jbosstools-3.2.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 2011-08-17 12:21:09 UTC (rev 34003)
@@ -124,7 +124,6 @@
}
listener = new IFacetedProjectListener() {
- @Override
public void handleEvent(IFacetedProjectEvent event) {
isEPP = PortletCoreActivator.isEPP(getFacetedProject());
IProjectFacet f = getProjectFacet();
14 years, 8 months
JBoss Tools SVN: r34002 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-08-17 08:03:36 -0400 (Wed, 17 Aug 2011)
New Revision: 34002
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties
Log:
Added properties for JSF2 project
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2011-08-17 11:57:30 UTC (rev 34001)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2011-08-17 12:03:36 UTC (rev 34002)
@@ -1,4 +1,7 @@
JSFProjectName=JBIDETestProject
FaceletsProjectName=FaceletsTestProject
Apachev6.0=D\:/Java/apache-tomcat-6.0.18
-JBossEap5.0=/opt/jbdevstudio4.0.0.M2/jboss-eap/jboss-as
\ No newline at end of file
+JBossEap5.x=/opt/jbdevstudio4.1.0.GA/jboss-eap/jboss-as
+JSF2ProjectName=JSF2TestProject
+JBossASForJSF2=/opt/jboss-6.0.0.Final
+JBossASForJSF2Version=6.0
\ No newline at end of file
14 years, 8 months
JBoss Tools SVN: r34001 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal: jpa2/details/java and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2011-08-17 07:57:30 -0400 (Wed, 17 Aug 2011)
New Revision: 34001
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateJavaEntity2_0Composite.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateQueries2_0Composite.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposite.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/Hibernate2_0JavaUiFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-9551
Added HibernateJavaEntity2_0Composite
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateJavaEntity2_0Composite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateJavaEntity2_0Composite.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateJavaEntity2_0Composite.java 2011-08-17 11:57:30 UTC (rev 34001)
@@ -0,0 +1,146 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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.hibernate.jpt.ui.internal.jpa2.details.java;
+
+import org.eclipse.jpt.common.ui.WidgetFactory;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.AccessHolder;
+import org.eclipse.jpt.jpa.core.context.GeneratorContainer;
+import org.eclipse.jpt.jpa.core.context.QueryContainer;
+import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
+import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0;
+import org.eclipse.jpt.jpa.core.jpa2.context.CacheableHolder2_0;
+import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.EntityNameComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.IdClassComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.java.JavaSecondaryTablesComposite;
+import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Cacheable2_0Pane;
+import org.eclipse.jpt.jpa.ui.internal.jpa2.details.Entity2_0OverridesComposite;
+import org.eclipse.swt.widgets.Composite;
+import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateGeneratorContainer;
+import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaEntity;
+import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaQueryContainer;
+import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaTypeDefContainer;
+import org.jboss.tools.hibernate.jpt.ui.internal.details.HibernateTableComposite;
+import org.jboss.tools.hibernate.jpt.ui.internal.details.java.HibernateJavaInheritanceComposite;
+import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateGenerationComposite;
+import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.TypeDefsComposite;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HibernateJavaEntity2_0Composite extends AbstractEntityComposite<HibernateJavaEntity> {
+
+ /**
+ * @param subjectHolder
+ * @param parent
+ * @param widgetFactory
+ */
+ public HibernateJavaEntity2_0Composite(PropertyValueModel<? extends HibernateJavaEntity> subjectHolder,
+ Composite parent, WidgetFactory widgetFactory) {
+ super(subjectHolder, parent, widgetFactory);
+ }
+
+ @Override
+ protected void initializeLayout(Composite container) {
+ super.initializeLayout(container);
+ this.initializeTypeDefCollapsibleSection(container);
+ }
+
+ protected void initializeTypeDefCollapsibleSection(Composite container) {
+ container = addCollapsibleSection(
+ container,
+ "Type Definitions");
+ this.initializeTypeDefsSection(container, buildTypeDefContainerHolder());
+ }
+
+ protected void initializeTypeDefsSection(
+ Composite container,
+ PropertyValueModel<HibernateJavaTypeDefContainer> typeDefContainerHolder) {
+ new TypeDefsComposite(this, typeDefContainerHolder, container);
+ }
+
+ private PropertyValueModel<HibernateJavaTypeDefContainer> buildTypeDefContainerHolder() {
+ return new PropertyAspectAdapter<HibernateJavaEntity, HibernateJavaTypeDefContainer>(getSubjectHolder()) {
+ @Override
+ protected HibernateJavaTypeDefContainer buildValue_() {
+ return this.subject.getTypeDefContainer();
+ }
+ };
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void initializeQueriesSection(Composite container, PropertyValueModel<QueryContainer> queryContainerHolder) {
+ new HibernateQueries2_0Composite(this, (PropertyValueModel<? extends HibernateJavaQueryContainer>) queryContainerHolder, container);
+ }
+
+ @SuppressWarnings("unused")
+ private PropertyValueModel<HibernateGeneratorContainer> buildGeneratorContainer() {
+ return new PropertyAspectAdapter<HibernateJavaEntity, HibernateGeneratorContainer>(getSubjectHolder()) {
+ @Override
+ protected HibernateGeneratorContainer buildValue_() {
+ return this.subject.getGeneratorContainer();
+ }
+ };
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void initializeGeneratorsSection(Composite container, PropertyValueModel<GeneratorContainer> generatorContainerHolder) {
+ new HibernateGenerationComposite(this, (PropertyValueModel<? extends HibernateGeneratorContainer>) generatorContainerHolder, addSubPane(container, 10), true);
+ }
+
+
+ protected void initializeEntitySection(Composite container) {
+ new HibernateTableComposite(this, container);
+ new EntityNameComposite(this, container);
+ new AccessTypeComposite(this, buildAccessHolder(), container);
+ new IdClassComposite(this, buildIdClassReferenceHolder(), container);
+ new Cacheable2_0Pane(this, buildCacheableHolder(), container);
+ }
+
+ protected PropertyValueModel<AccessHolder> buildAccessHolder() {
+ return new PropertyAspectAdapter<JavaEntity, AccessHolder>(getSubjectHolder()) {
+ @Override
+ protected AccessHolder buildValue_() {
+ return this.subject.getPersistentType();
+ }
+ };
+ }
+
+ protected PropertyValueModel<Cacheable2_0> buildCacheableHolder() {
+ return new PropertyAspectAdapter<JavaEntity, Cacheable2_0>(getSubjectHolder()) {
+ @Override
+ protected Cacheable2_0 buildValue_() {
+ return ((CacheableHolder2_0) this.subject).getCacheable();
+ }
+ };
+ }
+
+ @Override
+ protected void initializeSecondaryTablesSection(Composite container) {
+ new JavaSecondaryTablesComposite(this, container);
+ }
+
+ @Override
+ protected void initializeInheritanceSection(Composite container) {
+ new HibernateJavaInheritanceComposite(this, container);
+ }
+
+ @Override
+ protected void initializeAttributeOverridesSection(Composite container) {
+ new Entity2_0OverridesComposite(this, container);
+ }
+}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateQueries2_0Composite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateQueries2_0Composite.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/jpa2/details/java/HibernateQueries2_0Composite.java 2011-08-17 11:57:30 UTC (rev 34001)
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.hibernate.jpt.ui.internal.jpa2.details.java;
+
+import org.eclipse.jpt.common.ui.internal.widgets.Pane;
+import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.jpa.core.context.Query;
+import org.eclipse.jpt.jpa.core.jpa2.context.NamedQuery2_0;
+import org.eclipse.jpt.jpa.ui.internal.jpa2.details.NamedQueryProperty2_0Composite;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.PageBook;
+import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaQueryContainer;
+import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateQueriesComposite;
+
+/**
+ * @author Dmitry Geraskov
+ *
+ */
+public class HibernateQueries2_0Composite extends HibernateQueriesComposite {
+
+ public HibernateQueries2_0Composite(
+ Pane<?> parentPane,
+ PropertyValueModel<? extends HibernateJavaQueryContainer> subjectHolder,
+ Composite parent) {
+
+ super(parentPane, subjectHolder, parent);
+ }
+
+ @Override
+ protected Pane<NamedQuery2_0> buildNamedQueryPropertyComposite(PageBook pageBook) {
+ return new NamedQueryProperty2_0Composite(
+ this,
+ this.buildNamedQuery2_0Holder(),
+ pageBook);
+ }
+
+ protected PropertyValueModel<NamedQuery2_0> buildNamedQuery2_0Holder() {
+ return new TransformationPropertyValueModel<Query, NamedQuery2_0>(this.getQueryHolder()) {
+ @Override
+ protected NamedQuery2_0 transform_(Query value) {
+ return (value instanceof NamedQuery2_0) ? (NamedQuery2_0) value : null;
+ }
+ };
+ }
+
+}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposite.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposite.java 2011-08-17 09:17:44 UTC (rev 34000)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposite.java 2011-08-17 11:57:30 UTC (rev 34001)
@@ -60,7 +60,7 @@
private AddRemoveListPane<QueryContainer> listPane;
private NamedNativeQueryPropertyComposite namedNativeQueryPane;
- private NamedQueryPropertyComposite<? extends NamedQuery> namedQueryPane;
+ private Pane<? extends NamedQuery> namedQueryPane;
private HibernateNamedQueryPropertyComposite hibernateNamedQueryPane;
private HibernateNamedNativeQueryPropertyComposite hibernateNamedNativeQueryPane;
private WritablePropertyValueModel<Query> queryHolder;
@@ -365,11 +365,7 @@
);
// Named Query property pane
- this.namedQueryPane = new NamedQueryPropertyComposite(
- this,
- buildNamedQueryHolder(),
- pageBook
- );
+ this.namedQueryPane = this.buildNamedQueryPropertyComposite(pageBook);
// Named Native Query property pane
this.namedNativeQueryPane = new NamedNativeQueryPropertyComposite(
@@ -380,6 +376,14 @@
installPaneSwitcher(pageBook);
}
+
+ protected Pane<? extends NamedQuery> buildNamedQueryPropertyComposite(PageBook pageBook) {
+ return new NamedQueryPropertyComposite<NamedQuery>(
+ this,
+ this.buildNamedQueryHolder(),
+ pageBook
+ );
+ }
private void installPaneSwitcher(PageBook pageBook) {
new ControlSwitcher(this.queryHolder, buildPaneTransformer(), pageBook);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/Hibernate2_0JavaUiFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/Hibernate2_0JavaUiFactory.java 2011-08-17 09:17:44 UTC (rev 34000)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/java/Hibernate2_0JavaUiFactory.java 2011-08-17 11:57:30 UTC (rev 34001)
@@ -23,8 +23,8 @@
import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaEntity;
import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping;
import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOrmEntity;
-import org.jboss.tools.hibernate.jpt.ui.internal.details.java.HibernateJavaEntityComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.jpa2.details.HibernateElementCollectionMapping2_0Composite;
+import org.jboss.tools.hibernate.jpt.ui.internal.jpa2.details.java.HibernateJavaEntity2_0Composite;
import org.jboss.tools.hibernate.jpt.ui.internal.jpa2.details.orm.Hibernate2_0OrmEntityComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateBasicMappingComposite;
import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateIdMappingComposite;
@@ -49,7 +49,7 @@
@Override
public JpaComposite createJavaEntityComposite(PropertyValueModel<JavaEntity> subjectHolder,
Composite parent, WidgetFactory widgetFactory) {
- return new HibernateJavaEntityComposite((PropertyValueModel<? extends HibernateJavaEntity>) subjectHolder, parent, widgetFactory);
+ return new HibernateJavaEntity2_0Composite((PropertyValueModel<? extends HibernateJavaEntity>) subjectHolder, parent, widgetFactory);
}
@SuppressWarnings("unchecked")
14 years, 8 months
JBoss Tools SVN: r34000 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-08-17 05:17:44 -0400 (Wed, 17 Aug 2011)
New Revision: 34000
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-9548 , StringIndexOutOfBoundsException fixed.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2011-08-17 09:14:43 UTC (rev 33999)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2011-08-17 09:17:44 UTC (rev 34000)
@@ -343,7 +343,16 @@
break;
}
}
- String s1 = sourceText.substring(0, sourcePosition);
+ /*
+ * Fix: https://issues.jboss.org/browse/JBIDE-9548
+ * Without <span> for text nodes -- there is an
+ * string out of bounds exception.
+ */
+ int substringPosition = sourcePosition;
+ if (sourceText.length() < sourcePosition) {
+ substringPosition = sourceText.length() - 1;
+ }
+ String s1 = sourceText.substring(0, substringPosition);
String s2 = s1.replaceAll(SOURCE_BREAK, VISUAL_BREAK);
return calcPosition - (s1.length() - s2.length());
}
14 years, 8 months
JBoss Tools SVN: r33999 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-17 05:14:43 -0400 (Wed, 17 Aug 2011)
New Revision: 33999
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitUtils.java
Log:
[JBIDE-9513] added #push, started implementation
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitUtils.java 2011-08-17 08:51:22 UTC (rev 33998)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EgitUtils.java 2011-08-17 09:14:43 UTC (rev 33999)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 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.ide.eclipse.as.egit.core;
import java.util.Collection;
@@ -6,14 +16,22 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.egit.core.op.CommitOperation;
import org.eclipse.egit.core.project.RepositoryMapping;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.UserConfig;
+/**
+ * @author André Dietisheim
+ */
public class EgitUtils {
public static void commit(IProject project) throws CoreException {
+ commit(project, null);
+ }
+
+ public static void commit(IProject project, IProgressMonitor monitor) throws CoreException {
IFile[] commitables = new IFile[] {};
Collection<IFile> untracked = Collections.emptyList();
@@ -28,9 +46,17 @@
"Initial commit");
op.setCommitAll(true);
op.setRepository(repository );
- op.execute(null);
+ op.execute(monitor);
}
+ public static void push(IProject project) throws CoreException {
+ push(project, null);
+ }
+
+ public static void push(IProject project, IProgressMonitor monitor) throws CoreException {
+
+ }
+
private static Repository getRepository(IProject project) {
RepositoryMapping repositoryMapping = RepositoryMapping.getMapping(project);
if (repositoryMapping == null) {
14 years, 8 months
JBoss Tools SVN: r33998 - in trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-17 04:51:22 -0400 (Wed, 17 Aug 2011)
New Revision: 33998
Modified:
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java
Log:
[JBIDE-9513] corrected test
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-17 07:50:11 UTC (rev 33997)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/EGitUtilsTest.java 2011-08-17 08:51:22 UTC (rev 33998)
@@ -39,7 +39,7 @@
@Before
public void setUp() throws Exception {
Activator.getDefault().getRepositoryCache().clear();
-
+
this.testProject = new TestProject(true);
this.project = testProject.getProject();
@@ -59,9 +59,10 @@
}
private File createGitDir(TestProject testProject) throws IOException {
- IPath workspaceRoot = project.getWorkspace().getRoot().getRawLocation();
-// IPath randomFolder = workspaceRoot.append(String.valueOf(System.currentTimeMillis()));
-// File gitDir = new File(randomFolder.toFile(), Constants.DOT_GIT);
+ IPath workspaceRoot = project.getWorkspace().getRoot().getRawLocation();
+ // IPath randomFolder =
+ // workspaceRoot.append(String.valueOf(System.currentTimeMillis()));
+ // File gitDir = new File(randomFolder.toFile(), Constants.DOT_GIT);
File gitDir = new File(workspaceRoot.toFile(), Constants.DOT_GIT);
if (gitDir.exists()) {
// guard
@@ -87,13 +88,13 @@
public void commitsFileInProject() throws Exception {
IFile file = testUtils.addFileToProject(
testProject.getProject(),
- "sub/a.txt", "some text");
- resources.add(testProject.getProject().getFolder("sub"));
+ "a.txt", "some text");
+ resources.add(file);
new AddToIndexOperation(resources).execute(null);
EgitUtils.commit(testProject.getProject());
-
- testUtils.assertRepositoryContainsFiles(repository, new String[]{file.toString()});
+
+ testUtils.assertRepositoryContainsFiles(repository, new String[] { testUtils.getRepositoryPath(file) });
}
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-17 07:50:11 UTC (rev 33997)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.egit.test/src/org/jboss/ide/eclipse/as/egit/internal/test/util/TestUtils.java 2011-08-17 08:51:22 UTC (rev 33998)
@@ -26,6 +26,7 @@
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
@@ -252,5 +253,10 @@
}
return map;
}
+
+ public String getRepositoryPath(IResource resource) {
+ String fullPath = resource.getFullPath().toString();
+ return fullPath.substring(1, fullPath.length());
+ }
}
14 years, 8 months
JBoss Tools SVN: r33997 - in trunk: cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-08-17 03:50:11 -0400 (Wed, 17 Aug 2011)
New Revision: 33997
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java
Log:
Timing modifications with ProblemsView
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-16 23:31:24 UTC (rev 33996)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-17 07:50:11 UTC (rev 33997)
@@ -43,7 +43,6 @@
CdiATWizardTest.class,
CDIQuickFixTest.class,
BeansEditorTest.class
-
})
public class CDIAllBotTests {
}
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java 2011-08-16 23:31:24 UTC (rev 33996)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/fix/CDIQuickFixTest.java 2011-08-17 07:50:11 UTC (rev 33997)
@@ -14,6 +14,7 @@
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState;
@@ -21,6 +22,7 @@
import org.jboss.tools.ui.bot.ext.types.ViewType;
import org.jboss.tools.ui.bot.ext.view.ProblemsView;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
@@ -43,11 +45,11 @@
@Before
public void setUp() {
eclipse.showView(ViewType.PROJECT_EXPLORER);
+ createAndCheckCDIProject();
}
@Test
public void testSerializableQF() {
- createAndCheckCDIProject();
CDIUtil.bean(PACKAGE_NAME, "B1", true, false, false, false, null, null,
null, null).finish();
util.waitForNonIgnoredJobs();
@@ -61,8 +63,6 @@
CDIUtil.copyResourceToClass(ed, CDIQuickFixTest.class
.getResourceAsStream("/resources/cdi/B1.java.cdi"), false);
assertContains("@SessionScoped", ed.toTextEditor().getText());
- SWTEclipseExt.showView(bot, ViewType.PROBLEMS);
- bot.sleep(3 * TIME_1S);
SWTBotTreeItem[] warningTrees = ProblemsView.
getFilteredWarningsTreeItems(bot, "Managed bean B1 which", "/"
+ PROJECT_NAME, "B1.java", "CDI Problem");
@@ -80,6 +80,7 @@
warningTrees.length == 0);
}
+
@Test
public void testMultipleBeansQF() {
CDIUtil.bean(PACKAGE_NAME, "Animal", true, false, false, false, null,
@@ -125,8 +126,6 @@
assertTrue(code.contains("public class BrokenFarm {"));
assertTrue(code.contains("@Inject private Animal animal;"));
- SWTEclipseExt.showView(bot, ViewType.PROBLEMS);
- bot.sleep(3 * TIME_1S);
SWTBotTreeItem[] warningTrees = ProblemsView
.getFilteredWarningsTreeItems(bot, "Multiple beans are eligible", "/"
+ PROJECT_NAME, "BrokenFarm.java", "CDI Problem");
@@ -149,7 +148,7 @@
bot.button("Finish").isEnabled());
bot.clickButton("Finish");
- bot.sleep(2*TIME_1S);
+ bot.sleep(Timing.time2S());
util.waitForNonIgnoredJobs();
code = ed.toTextEditor().getText();
assertTrue(code.contains("@Inject @Q1 private Animal animal;"));
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-16 23:31:24 UTC (rev 33996)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/uiutils/actions/CDIUtil.java 2011-08-17 07:50:11 UTC (rev 33997)
@@ -14,6 +14,7 @@
import org.jboss.tools.cdi.bot.test.uiutils.wizards.CDIWizardType;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTUtilExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
public class CDIUtil {
@@ -23,14 +24,14 @@
nodeContextMenu(tree, item,
"Configure","Add CDI (Context and Dependency Injection) support...").click();
bot.activeShell().bot().button("OK").click();
- bot.sleep(2000);
+ bot.sleep(Timing.time2S());
util.waitForNonIgnoredJobs();
}
public static void resolveQuickFix(final SWTBotTree tree, SWTBotTreeItem item, SWTBotExt bot, SWTUtilExt util) {
nodeContextMenu(bot.tree(), item, "Quick Fix").click();
bot.activeShell().bot().button("Finish").click();
- bot.sleep(2000);
+ bot.sleep(Timing.time2S());
util.waitForNonIgnoredJobs();
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2011-08-16 23:31:24 UTC (rev 33996)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view/ProblemsView.java 2011-08-17 07:50:11 UTC (rev 33997)
@@ -19,6 +19,7 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt.StringConditionType;
import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
@@ -101,6 +102,7 @@
public static SWTBotTreeItem getErrorsNode (SWTBotExt bot){
SWTBotTreeItem errorsNode = null;
SWTBot problemsBot = SWTEclipseExt.showView(bot,ViewType.PROBLEMS);
+ bot.sleep(Timing.time3S());
try{
SWTBotTreeItem[] filteredTreeItems = ProblemsView.getProblemsTreeItemsContainingText(bot,problemsBot.tree(),null,
IDELabel.ProblemsTree.ERRORS,"","","",
@@ -121,6 +123,7 @@
public static SWTBotTreeItem getWarningsNode (SWTBotExt bot){
SWTBotTreeItem warningsNode = null;
SWTBot problemsBot = SWTEclipseExt.showView(bot,ViewType.PROBLEMS);
+ bot.sleep(Timing.time3S());
try{
SWTBotTreeItem[] filteredTreeItems = ProblemsView.getProblemsTreeItemsContainingText(bot,problemsBot.tree(),null,
IDELabel.ProblemsTree.WARNINGS,"","","",
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java 2011-08-16 23:31:24 UTC (rev 33996)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSWizardTest.java 2011-08-17 07:50:11 UTC (rev 33997)
@@ -15,6 +15,7 @@
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.SWTOpenExt;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.parts.SWTBotHyperlinkExt;
public class WSWizardTest extends TestCase{
@@ -41,7 +42,7 @@
bot.menu("File").menu("New").menu("Other...").click();
bot.shell("New").activate();
SWTBotTree tree = bot.tree();
- bot.sleep(1000);
+ bot.sleep(Timing.time1S());
tree.expandNode("Server").select("Server");
bot.button("Next >").click();
SWTBotTree tree2 = bot.tree();
@@ -51,7 +52,7 @@
bot.textWithLabel("Name").setText("AS4.2Runtime");
bot.textWithLabel("Home Directory").setText(JBOSS_AS_42_HOME);
bot.button("Finish").click();
- bot.sleep(2000);
+ bot.sleep(Timing.time2S());
}
}
@@ -100,7 +101,7 @@
SWTBot dBot = bot.activeShell().bot();
dBot.comboBoxWithLabel("Service project:").setText("B");
dBot.button("OK").click();
- dBot.sleep(1000);
+ dBot.sleep(Timing.time1S());
}
}
public void setDefaultWSRuntime(){
@@ -110,6 +111,6 @@
tree.expandNode("Web Services").expandNode("Server and Runtime").select();
bot.comboBoxWithLabel("Web service runtime:").setSelection("JBossWS");
bot.button("OK").click();
- bot.sleep(2000);
+ bot.sleep(Timing.time2S());
}
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-16 23:31:24 UTC (rev 33996)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/jbt/SampleWSTest.java 2011-08-17 07:50:11 UTC (rev 33997)
@@ -29,6 +29,7 @@
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
+import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
import org.jboss.tools.ui.bot.ext.config.Annotations.Server;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSampleWSWizardAction;
@@ -208,7 +209,7 @@
SWTBotTree tree = projectExplorer.bot().tree();
SWTBotTreeItem ti = tree.expandNode(project);
new TreeItemAction(ti, "Configure","Add JAX-RS 1.1 support...").run();
- bot.sleep(500);
+ bot.sleep(Timing.time500MS());
util.waitForNonIgnoredJobs();
try {
ti.getNode("RESTful Web Services");
14 years, 8 months
JBoss Tools SVN: r33996 - in trunk/requirements: jbpm-3.1.4 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-08-16 19:31:24 -0400 (Tue, 16 Aug 2011)
New Revision: 33996
Added:
trunk/requirements/jbpm-3.1.4/
trunk/requirements/jbpm-3.1.4/build.properties
Log:
requirement for jbpm swtbot tests
Added: trunk/requirements/jbpm-3.1.4/build.properties
===================================================================
--- trunk/requirements/jbpm-3.1.4/build.properties (rev 0)
+++ trunk/requirements/jbpm-3.1.4/build.properties 2011-08-16 23:31:24 UTC (rev 33996)
@@ -0,0 +1,8 @@
+jbmp314.build.uri=http://downloads.sourceforge.net/project/jbpm/jBPM\ 3/jbpm-3.1.4
+jbmp314.build.name=jbpm-3.1.4
+jbmp314.build.archive=${jbmp314.build.name}.zip
+jbmp314.build.archive.md5=df65b5642f33676313ebe4d5b69a3fff
+
+build.uri=${jbmp314.build.uri}
+build.archive=${jbmp314.build.archive}
+md5=${jbmp314.build.archive.md5}
14 years, 8 months