JBoss Tools SVN: r39237 - trunk/common.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-03-01 19:56:17 -0500 (Thu, 01 Mar 2012)
New Revision: 39237
Modified:
trunk/common/pom.xml
Log:
=removed reference to nightly trunk update site for testst components because it cannot be used when building component from branch
Modified: trunk/common/pom.xml
===================================================================
--- trunk/common/pom.xml 2012-03-02 00:34:07 UTC (rev 39236)
+++ trunk/common/pom.xml 2012-03-02 00:56:17 UTC (rev 39237)
@@ -19,19 +19,5 @@
<module>site</module>
<module>tests</module>
</modules>
- <!-- do not need all metadata to compile common component -->
- <repositories>
- <repository>
- <id>jbosstools-tests-nightly-repo</id>
- <url>http://download.jboss.org/jbosstools/builds/staging/jbosstools-3.3_trunk....</url>
- <layout>p2</layout>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- </repositories>
</project>
12 years, 9 months
JBoss Tools SVN: r39236 - branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-03-01 19:34:07 -0500 (Thu, 01 Mar 2012)
New Revision: 39236
Modified:
branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToManyMappingDefinition.java
branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java
Log:
JBIDE-11079 JPA: Hibernate extension mixed up OneToOne and OneToMany mappings
applied patch to 3.3.0.Beta1 branch
Modified: branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToManyMappingDefinition.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToManyMappingDefinition.java 2012-03-01 21:45:42 UTC (rev 39235)
+++ branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToManyMappingDefinition.java 2012-03-02 00:34:07 UTC (rev 39236)
@@ -20,9 +20,9 @@
import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnsAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.MapKeyAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.OrderByAnnotation;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
@@ -49,11 +49,11 @@
}
public String getKey() {
- return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
+ return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
}
public String getAnnotationName() {
- return OneToOneAnnotation.ANNOTATION_NAME;
+ return OneToManyAnnotation.ANNOTATION_NAME;
}
public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
@@ -66,10 +66,10 @@
private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
JoinTableAnnotation.ANNOTATION_NAME,
+ MapKeyAnnotation.ANNOTATION_NAME,
+ OrderByAnnotation.ANNOTATION_NAME,
JoinColumnAnnotation.ANNOTATION_NAME,
- JoinColumnsAnnotation.ANNOTATION_NAME,
- PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME,
- PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME
+ JoinColumnsAnnotation.ANNOTATION_NAME
};
private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
@@ -79,7 +79,7 @@
}
public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
- return factory.buildJavaOneToOneMapping(persistentAttribute);
+ return factory.buildJavaOneToManyMapping(persistentAttribute);
}
@Override
Modified: branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2012-03-01 21:45:42 UTC (rev 39235)
+++ branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/definition/HibernateJavaOneToOneMappingDefinition.java 2012-03-02 00:34:07 UTC (rev 39236)
@@ -20,9 +20,9 @@
import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.JoinColumnsAnnotation;
import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.MapKeyAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.OneToManyAnnotation;
-import org.eclipse.jpt.jpa.core.resource.java.OrderByAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.OneToOneAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnsAnnotation;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate;
/**
@@ -49,11 +49,11 @@
}
public String getKey() {
- return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY;
+ return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY;
}
public String getAnnotationName() {
- return OneToManyAnnotation.ANNOTATION_NAME;
+ return OneToOneAnnotation.ANNOTATION_NAME;
}
public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
@@ -66,10 +66,10 @@
private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
JoinTableAnnotation.ANNOTATION_NAME,
- MapKeyAnnotation.ANNOTATION_NAME,
- OrderByAnnotation.ANNOTATION_NAME,
JoinColumnAnnotation.ANNOTATION_NAME,
- JoinColumnsAnnotation.ANNOTATION_NAME
+ JoinColumnsAnnotation.ANNOTATION_NAME,
+ PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME,
+ PrimaryKeyJoinColumnsAnnotation.ANNOTATION_NAME
};
private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
@@ -79,7 +79,7 @@
}
public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
- return factory.buildJavaOneToManyMapping(persistentAttribute);
+ return factory.buildJavaOneToOneMapping(persistentAttribute);
}
@Override
12 years, 9 months
JBoss Tools SVN: r39235 - branches/jbosstools-3.3.0.Beta1/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-03-01 16:45:42 -0500 (Thu, 01 Mar 2012)
New Revision: 39235
Modified:
branches/jbosstools-3.3.0.Beta1/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
Log:
Wrong quick fix for empty tag <class> in beans.xml https://issues.jboss.org/browse/JBIDE-11136
Modified: branches/jbosstools-3.3.0.Beta1/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-03-01 21:39:31 UTC (rev 39234)
+++ branches/jbosstools-3.3.0.Beta1/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-03-01 21:45:42 UTC (rev 39235)
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IAnnotatable;
@@ -31,6 +30,7 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.corext.util.JavaConventionsUtil;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.ui.IMarkerResolution;
@@ -98,6 +98,8 @@
return new IMarkerResolution[] {};
final IFile file = (IFile) marker.getResource();
+
+ IJavaProject javaProject = EclipseUtil.getJavaProject(file.getProject());
Integer attribute = ((Integer) marker.getAttribute(IMarker.CHAR_START));
if (attribute == null)
@@ -521,44 +523,46 @@
provider.disconnect(input);
}
+ boolean correctTypeName = JavaConventionsUtil.validatePackageName(text, javaProject).isOK();
+
if(messageId == CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME_ID){
- IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
- if(element == null){
+ IJavaElement element = findJavaElementByQualifiedName(javaProject, text);
+ if(element == null && correctTypeName){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_BEAN_CLASS)
};
}
}else if(messageId == CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME_ID){
- IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
- if(element == null){
+ IJavaElement element = findJavaElementByQualifiedName(javaProject, text);
+ if(element == null && correctTypeName){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_STEREOTYPE)
};
}
}else if(messageId == CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_BEAN_CLASS_ID){
- IJavaElement element = getTypeToAddAlternativeToBean(file.getProject(), text);
+ IJavaElement element = getTypeToAddAlternativeToBean(javaProject, text);
if(element != null){
return new IMarkerResolution[] {
new AddAnnotationMarkerResolution(element, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME)
};
}
}else if(messageId == CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_ANNOTATION_ID){
- IJavaElement element = getTypeToAddAlternativeToStereotype(file.getProject(), text);
+ IJavaElement element = getTypeToAddAlternativeToStereotype(javaProject, text);
if(element != null){
return new IMarkerResolution[] {
new AddAnnotationMarkerResolution(element, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME)
};
}
}else if(messageId == CDIValidationErrorManager.UNKNOWN_DECORATOR_BEAN_CLASS_NAME_ID){
- IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
- if(element == null){
+ IJavaElement element = findJavaElementByQualifiedName(javaProject, text);
+ if(element == null && correctTypeName){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_DECORATOR)
};
}
}else if(messageId == CDIValidationErrorManager.UNKNOWN_INTERCEPTOR_CLASS_NAME_ID){
- IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
- if(element == null){
+ IJavaElement element = findJavaElementByQualifiedName(javaProject, text);
+ if(element == null && correctTypeName){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_INTERCEPTOR)
};
@@ -609,8 +613,7 @@
return resolutions;
}
- private IType getTypeToAddAlternativeToBean(IProject project, String qualifiedName){
- IJavaProject javaProject = EclipseUtil.getJavaProject(project);
+ private IType getTypeToAddAlternativeToBean(IJavaProject javaProject, String qualifiedName){
IType type = null;
try {
type = javaProject.findType(qualifiedName);
@@ -619,7 +622,7 @@
}
if(type != null){
- CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(project);
+ CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(javaProject.getProject());
if(cdiNature != null){
ICDIProject cdiProject = cdiNature.getDelegate();
@@ -634,8 +637,7 @@
return null;
}
- private IType getTypeToAddAlternativeToStereotype(IProject project, String qualifiedName){
- IJavaProject javaProject = EclipseUtil.getJavaProject(project);
+ private IType getTypeToAddAlternativeToStereotype(IJavaProject javaProject, String qualifiedName){
IType type = null;
try {
type = javaProject.findType(qualifiedName);
@@ -644,7 +646,7 @@
}
if(type != null){
- CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(project);
+ CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(javaProject.getProject());
if(cdiNature != null){
ICDIProject cdiProject = cdiNature.getDelegate();
@@ -659,8 +661,7 @@
return null;
}
- private IJavaElement findJavaElementByQualifiedName(IProject project, String qualifiedName){
- IJavaProject javaProject = EclipseUtil.getJavaProject(project);
+ private IJavaElement findJavaElementByQualifiedName(IJavaProject javaProject, String qualifiedName){
try {
return javaProject.findType(qualifiedName);
} catch (JavaModelException ex) {
12 years, 9 months
JBoss Tools SVN: r39234 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-03-01 16:39:31 -0500 (Thu, 01 Mar 2012)
New Revision: 39234
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
Log:
Wrong quick fix for empty tag <class> in beans.xml https://issues.jboss.org/browse/JBIDE-11136
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-03-01 19:05:08 UTC (rev 39233)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2012-03-01 21:39:31 UTC (rev 39234)
@@ -17,7 +17,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IAnnotatable;
@@ -31,6 +30,7 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.internal.corext.util.JavaConventionsUtil;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.ui.IMarkerResolution;
@@ -98,6 +98,8 @@
return new IMarkerResolution[] {};
final IFile file = (IFile) marker.getResource();
+
+ IJavaProject javaProject = EclipseUtil.getJavaProject(file.getProject());
Integer attribute = ((Integer) marker.getAttribute(IMarker.CHAR_START));
if (attribute == null)
@@ -521,44 +523,46 @@
provider.disconnect(input);
}
+ boolean correctTypeName = JavaConventionsUtil.validatePackageName(text, javaProject).isOK();
+
if(messageId == CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_BEAN_CLASS_NAME_ID){
- IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
- if(element == null){
+ IJavaElement element = findJavaElementByQualifiedName(javaProject, text);
+ if(element == null && correctTypeName){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_BEAN_CLASS)
};
}
}else if(messageId == CDIValidationErrorManager.UNKNOWN_ALTERNATIVE_ANNOTATION_NAME_ID){
- IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
- if(element == null){
+ IJavaElement element = findJavaElementByQualifiedName(javaProject, text);
+ if(element == null && correctTypeName){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_STEREOTYPE)
};
}
}else if(messageId == CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_BEAN_CLASS_ID){
- IJavaElement element = getTypeToAddAlternativeToBean(file.getProject(), text);
+ IJavaElement element = getTypeToAddAlternativeToBean(javaProject, text);
if(element != null){
return new IMarkerResolution[] {
new AddAnnotationMarkerResolution(element, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME)
};
}
}else if(messageId == CDIValidationErrorManager.ILLEGAL_ALTERNATIVE_ANNOTATION_ID){
- IJavaElement element = getTypeToAddAlternativeToStereotype(file.getProject(), text);
+ IJavaElement element = getTypeToAddAlternativeToStereotype(javaProject, text);
if(element != null){
return new IMarkerResolution[] {
new AddAnnotationMarkerResolution(element, CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME)
};
}
}else if(messageId == CDIValidationErrorManager.UNKNOWN_DECORATOR_BEAN_CLASS_NAME_ID){
- IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
- if(element == null){
+ IJavaElement element = findJavaElementByQualifiedName(javaProject, text);
+ if(element == null && correctTypeName){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_DECORATOR)
};
}
}else if(messageId == CDIValidationErrorManager.UNKNOWN_INTERCEPTOR_CLASS_NAME_ID){
- IJavaElement element = findJavaElementByQualifiedName(file.getProject(), text);
- if(element == null){
+ IJavaElement element = findJavaElementByQualifiedName(javaProject, text);
+ if(element == null && correctTypeName){
return new IMarkerResolution[] {
new CreateCDIElementMarkerResolution(file.getProject(), text, CreateCDIElementMarkerResolution.CREATE_INTERCEPTOR)
};
@@ -609,8 +613,7 @@
return resolutions;
}
- private IType getTypeToAddAlternativeToBean(IProject project, String qualifiedName){
- IJavaProject javaProject = EclipseUtil.getJavaProject(project);
+ private IType getTypeToAddAlternativeToBean(IJavaProject javaProject, String qualifiedName){
IType type = null;
try {
type = javaProject.findType(qualifiedName);
@@ -619,7 +622,7 @@
}
if(type != null){
- CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(project);
+ CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(javaProject.getProject());
if(cdiNature != null){
ICDIProject cdiProject = cdiNature.getDelegate();
@@ -634,8 +637,7 @@
return null;
}
- private IType getTypeToAddAlternativeToStereotype(IProject project, String qualifiedName){
- IJavaProject javaProject = EclipseUtil.getJavaProject(project);
+ private IType getTypeToAddAlternativeToStereotype(IJavaProject javaProject, String qualifiedName){
IType type = null;
try {
type = javaProject.findType(qualifiedName);
@@ -644,7 +646,7 @@
}
if(type != null){
- CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(project);
+ CDICoreNature cdiNature = CDIUtil.getCDINatureWithProgress(javaProject.getProject());
if(cdiNature != null){
ICDIProject cdiProject = cdiNature.getDelegate();
@@ -659,8 +661,7 @@
return null;
}
- private IJavaElement findJavaElementByQualifiedName(IProject project, String qualifiedName){
- IJavaProject javaProject = EclipseUtil.getJavaProject(project);
+ private IJavaElement findJavaElementByQualifiedName(IJavaProject javaProject, String qualifiedName){
try {
return javaProject.findType(qualifiedName);
} catch (JavaModelException ex) {
12 years, 9 months
JBoss Tools SVN: r39233 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-01 14:05:08 -0500 (Thu, 01 Mar 2012)
New Revision: 39233
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java
Log:
JBDS-2048 Runtime detection: Location not added to the paths list
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-03-01 18:57:11 UTC (rev 39232)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/JBossRuntimeStartup.java 2012-03-01 19:05:08 UTC (rev 39233)
@@ -74,6 +74,7 @@
initializeRuntimes(serverDefinitions);
}
if (runtimePaths.size() > 0) {
+ RuntimeUIActivator.getDefault().getRuntimePaths().addAll(runtimePaths);
RuntimeUIActivator.getDefault().saveRuntimePaths();
}
12 years, 9 months
JBoss Tools SVN: r39232 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-01 13:57:11 -0500 (Thu, 01 Mar 2012)
New Revision: 39232
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java
Log:
JBIDE-10244 Cleaning up Runtime plugin
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2012-03-01 18:41:15 UTC (rev 39231)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/RuntimeScanner.java 2012-03-01 18:57:11 UTC (rev 39232)
@@ -10,6 +10,7 @@
************************************************************************************/
package org.jboss.tools.runtime.ui;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -54,7 +55,15 @@
Display.getDefault().asyncExec(new Runnable() {
public void run() {
Shell shell = Display.getCurrent().getActiveShell();
- RuntimeUIActivator.refreshRuntimes(shell, RuntimeUIActivator.getDefault().getRuntimePaths(), null, false, 7);
+ Set<RuntimePath> runtimePaths = new HashSet<RuntimePath>();
+ for (RuntimePath runtimePath:RuntimeUIActivator.getDefault().getRuntimePaths()) {
+ if (runtimePath.isScanOnEveryStartup()) {
+ runtimePaths.add(runtimePath);
+ }
+ }
+ if (runtimePaths.size() > 0) {
+ RuntimeUIActivator.refreshRuntimes(shell, runtimePaths, null, false, 7);
+ }
}
});
}
12 years, 9 months
JBoss Tools SVN: r39231 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-03-01 13:41:15 -0500 (Thu, 01 Mar 2012)
New Revision: 39231
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java
Log:
Fixes for 3.3.0.Beta1
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/OpenOnHelper.java 2012-03-01 18:41:15 UTC (rev 39231)
@@ -20,6 +20,7 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTJBTExt;
+import org.jboss.tools.ui.bot.ext.SWTUtilExt;
import org.jboss.tools.ui.bot.ext.Timing;
/**
@@ -57,7 +58,8 @@
KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_F3);
- bot.sleep(Timing.time3S());
+ bot.sleep(Timing.time1S());
+ new SWTUtilExt(bot).waitForNonIgnoredJobs();
openedEditor = bot.activeEditor();
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml 2012-03-01 18:41:15 UTC (rev 39231)
@@ -1,6 +1,11 @@
-<BODY ID="__content__area__">
-<SPAN CLASS="vpe-text">
+<BODY id="__content__area__" >
+<SPAN class="vpe-text" >
+
...
-</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/>
+</SPAN>
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
+</BR>
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipsebeta1/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120224-2339-H52-Beta1/ve/dragIcon.gif" style="display: none ! important; position: absolute; cursor: move;" >
+</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2012-03-01 18:41:15 UTC (rev 39231)
@@ -16,7 +16,7 @@
<DIV class="__any__tag__caption" style="" title="tagunknown" >
tagunknown
</DIV>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipsebeta1/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120224-2339-H52-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2012-03-01 18:41:15 UTC (rev 39231)
@@ -16,7 +16,7 @@
<DIV class="__any__tag__caption" style="" title="tagunknown" >
tagunknown
</DIV>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</DIV>
<UL style="color: red; -moz-user-modify: read-only;" title="h:messages style: color: red" >
@@ -43,6 +43,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipsebeta1/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120224-2339-H52-Beta1/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 16px ! important; top: 17px ! important;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml 2012-03-01 18:41:15 UTC (rev 39231)
@@ -3,21 +3,21 @@
<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" >
jsp:directive.taglib
</SPAN>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
<SPAN >
<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" >
jsp:directive.taglib
</SPAN>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
<SPAN >
<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="f:loadBundle var: Message basename: demo.Messages" >
f:loadBundle
</SPAN>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
<DIV >
@@ -47,7 +47,7 @@
Error Messages
</LI>
</UL>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
<FORM style="border: 1px dotted rgb(255, 102, 0); padding: 5px;" title="h:form id: greetingForm" >
@@ -57,7 +57,14 @@
<SPAN >
<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
<SPAN class="vpe-text" title="h:inputText value: #{user.name} required: true" >
+<SPAN >
+<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="f:validateLength maximum: 30 minimum: 3" >
+f:validateLength
</SPAN>
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
+</BR>
+</SPAN>
+</SPAN>
<INPUT value="#{user.name}" title="h:inputText value: #{user.name} required: true" >
</INPUT>
</SPAN>
@@ -65,14 +72,14 @@
<SPAN style="border: 1px dashed GREY; color: GREY; font-size: 12px;" title="f:validateLength maximum: 30 minimum: 3" >
f:validateLength
</SPAN>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
</SPAN>
<SPAN >
<INPUT type="button" title="h:commandButton action: hello value: Say Hello!" value="Say Hello!" style="-moz-user-modify: read-only;" >
</INPUT>
-<BR style="font-style: italic; color: green; -moz-user-modify: read-only;" >
+<BR vpe:pseudo-element="yes" style="-moz-user-modify: read-only;" >
</BR>
</SPAN>
</FORM>
@@ -82,6 +89,6 @@
</TABLE>
</DIV>
</DIV>
-<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/jbdevstudio5.0.0.M3/studio/plugins/org.jboss.tools.vpe_3.3.0.v20110901-0136-H11-M3/ve/dragIcon.gif" style="position: absolute; cursor: move; left: 7px ! important; top: -14px ! important;" >
+<IMG vpetemporarydndelement="true" id="dragIcon" src="file:////opt/eclipse/eclipsebeta1/eclipse/plugins/org.jboss.tools.vpe_3.3.0.v20120224-2339-H52-Beta1/ve/dragIcon.gif" style="display: none ! important; position: absolute; cursor: move;" >
</IMG>
</BODY>
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2012-03-01 16:55:34 UTC (rev 39230)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/EditingELValueTest.java 2012-03-01 18:41:15 UTC (rev 39231)
@@ -59,14 +59,14 @@
jspGreetingPageEditor.save();
bot.sleep(Timing.time2S());
assertVisualEditorContainsNodeWithValue(new SWTBotWebBrowser(EditingELValueTest.GREETING_PAGE_NAME,botExt),
- "Template file is not found: \"#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml\"",
+ "Template file is not found: \"templates/common.xhtml\"",
EditingELValueTest.GREETING_PAGE_NAME);
jspInputNamePageEditor.setText(jspInputNamePageEditor.getText()
.replaceFirst("/templates/common.xhtml", "#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml"));
jspInputNamePageEditor.save();
bot.sleep(Timing.time2S());
assertVisualEditorContainsNodeWithValue(new SWTBotWebBrowser(EditingELValueTest.INPUT_NAME_PAGE_NAME,botExt),
- "Template file is not found: \"#{" + EditingELValueTest.EL_VARIABLE_NAME + "}templates/common.xhtml\"",
+ "Template file is not found: \"templates/common.xhtml\"",
EditingELValueTest.INPUT_NAME_PAGE_NAME);
// Opens Page Design Options Dialog
bot.toolbarButtonWithTooltip(PAGE_DESIGN).click();
12 years, 9 months
JBoss Tools SVN: r39230 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-01 11:55:34 -0500 (Thu, 01 Mar 2012)
New Revision: 39230
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
[JBIDE-11090] preselecting "use existing" when importing application from File->Import->Existing OpenShift Express Application
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-01 16:13:27 UTC (rev 39229)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-01 16:55:34 UTC (rev 39230)
@@ -221,8 +221,8 @@
setApplicationName(application.getName());
setSelectedCartridge(application.getCartridge());
setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(application.getEmbeddedCartridges()));
+ wizardModel.setApplication(application);
}
- wizardModel.setApplication(application);
}
public void resetExistingApplication() throws OpenShiftException {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-03-01 16:13:27 UTC (rev 39229)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-03-01 16:55:34 UTC (rev 39230)
@@ -18,7 +18,7 @@
* Constructor
*/
public ImportOpenShiftExpressApplicationWizard() {
- super("Import OpenShift Express Application");
+ super(true, "Import OpenShift Express Application");
}
/**
@@ -28,6 +28,6 @@
* @param application
*/
public ImportOpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application) {
- super(user, project, application, "Import OpenShift Express Application");
+ super(user, project, application, true, "Import OpenShift Express Application");
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-03-01 16:13:27 UTC (rev 39229)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-03-01 16:55:34 UTC (rev 39230)
@@ -15,10 +15,10 @@
* Constructor
*/
public NewOpenShiftExpressApplicationWizard() {
- super("New OpenShift Express Application");
+ super(false, "New OpenShift Express Application");
}
public NewOpenShiftExpressApplicationWizard(IUser user) {
- super(user, null, null, "New OpenShift Express Application");
+ super(user, null, null, false, "New OpenShift Express Application");
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-01 16:13:27 UTC (rev 39229)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-01 16:55:34 UTC (rev 39230)
@@ -58,15 +58,12 @@
private OpenShiftExpressApplicationWizardModel wizardModel;
- /**
- * @see #setUser called by CredentialsWizardPageModel#getValidityStatus
- */
- public OpenShiftExpressApplicationWizard(String wizardTitle) {
- this(null, null, null, wizardTitle);
+ public OpenShiftExpressApplicationWizard(boolean useExistingApplication, String wizardTitle) {
+ this(null, null, null, useExistingApplication, wizardTitle);
}
-
- public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application, String wizardTitle) {
- setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application));
+
+ public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application, boolean useExistingApplication, String wizardTitle) {
+ setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application, useExistingApplication));
setWindowTitle(wizardTitle);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-01 16:13:27 UTC (rev 39229)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-01 16:55:34 UTC (rev 39230)
@@ -43,15 +43,16 @@
private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges";
public OpenShiftExpressApplicationWizardModel(IUser user) {
- this(user, null, null);
+ this(user, null, null, false);
}
- public OpenShiftExpressApplicationWizardModel(IUser user, IProject project, IApplication application) {
+ public OpenShiftExpressApplicationWizardModel(IUser user, IProject project, IApplication application, boolean useExistingApplication) {
// default value(s)
setUser(user);
setProject(project);
setNewProject(true);
setApplication(application);
+ setUseExistingApplication(useExistingApplication);
setCreateServerAdapter(true);
setRepositoryPath(DEFAULT_REPOSITORY_PATH);
setRemoteName(NEW_PROJECT_REMOTE_NAME_DEFAULT);
12 years, 9 months
JBoss Tools SVN: r39229 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-01 11:13:27 -0500 (Thu, 01 Mar 2012)
New Revision: 39229
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java
Log:
JBIDE-11131 NPE when selecting some of requirements in new example wizard
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-03-01 15:53:55 UTC (rev 39228)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-03-01 16:13:27 UTC (rev 39229)
@@ -321,8 +321,8 @@
if (ProjectFix.WTP_RUNTIME.equals(fixType)
|| ProjectFix.SEAM_RUNTIME.equals(fixType)) {
DownloadRuntime downloadRuntime = getDownloadRuntime(fix);
+ downloadAndInstall.setEnabled(downloadRuntime != null);
if (downloadRuntime != null) {
- downloadAndInstall.setEnabled(true);
downloadAndInstall.setToolTipText("Download and install " + downloadRuntime.getName());
}
install.setEnabled(true);
12 years, 9 months
JBoss Tools SVN: r39228 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-03-01 10:53:55 -0500 (Thu, 01 Mar 2012)
New Revision: 39228
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java
Log:
JBIDE-11130 : Better handle unavailable downloadable runtimes
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-03-01 15:35:18 UTC (rev 39227)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesRequirementsPage.java 2012-03-01 15:53:55 UTC (rev 39228)
@@ -313,18 +313,21 @@
Object object = selection.getFirstElement();
if (object instanceof ProjectFix) {
ProjectFix fix = (ProjectFix) object;
- if (!unsatisfiedFixes.contains(fix) && !(ProjectFix.WTP_RUNTIME.equals(fix.getType())
- || ProjectFix.SEAM_RUNTIME.equals(fix.getType()))) {
+ String fixType = fix.getType();
+ if (!unsatisfiedFixes.contains(fix) && !(ProjectFix.WTP_RUNTIME.equals(fixType)
+ || ProjectFix.SEAM_RUNTIME.equals(fixType))) {
return;
}
- if (ProjectFix.WTP_RUNTIME.equals(fix.getType())
- || ProjectFix.SEAM_RUNTIME.equals(fix.getType())) {
+ if (ProjectFix.WTP_RUNTIME.equals(fixType)
+ || ProjectFix.SEAM_RUNTIME.equals(fixType)) {
DownloadRuntime downloadRuntime = getDownloadRuntime(fix);
- downloadAndInstall.setEnabled(downloadRuntime != null);
- downloadAndInstall.setToolTipText("Download and install " + downloadRuntime.getName());
+ if (downloadRuntime != null) {
+ downloadAndInstall.setEnabled(true);
+ downloadAndInstall.setToolTipText("Download and install " + downloadRuntime.getName());
+ }
install.setEnabled(true);
install.setToolTipText("JBoss Runtime Detection");
- } else if (ProjectFix.PLUGIN_TYPE.equals(fix.getType())) {
+ } else if (ProjectFix.PLUGIN_TYPE.equals(fixType)) {
install.setEnabled(fix.getProperties().get(ProjectFix.CONNECTOR_ID) != null);
install.setToolTipText("Install required feature(s)");
}
12 years, 9 months