JBoss Tools SVN: r42497 - in branches/jbosstools-3.3.x/maven/plugins: org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-07-10 18:21:29 -0400 (Tue, 10 Jul 2012)
New Revision: 42497
Modified:
branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java
branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
Log:
JBIDE-12111 : dynamically set the maven-compiler-plugin for seam projects, in order to avoid constraint violation occurring when mavenizing seam 2.3 projects
Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2012-07-10 21:42:54 UTC (rev 42496)
+++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2012-07-10 22:21:29 UTC (rev 42497)
@@ -708,7 +708,7 @@
resource = resource2;
}
- public static void addCompilerPlugin(Build build, IProject project) {
+ public static void addCompilerPlugin(List<org.apache.maven.model.Plugin> plugins, IProject project) {
String compilerLevel = JavaFacetUtil.getCompilerLevel(project);
if (compilerLevel == null || DEFAULT_COMPILER_LEVEL.equals(compilerLevel)) {
return;
@@ -716,7 +716,7 @@
org.apache.maven.model.Plugin plugin = new org.apache.maven.model.Plugin();
plugin.setGroupId("org.apache.maven.plugins"); //$NON-NLS-1$
plugin.setArtifactId("maven-compiler-plugin"); //$NON-NLS-1$
- plugin.setVersion("2.4");
+ plugin.setVersion("2.5.1");
Xpp3Dom configuration = new Xpp3Dom( "configuration" ); //$NON-NLS-1$
Xpp3Dom source = new Xpp3Dom("source"); //$NON-NLS-1$
source.setValue(compilerLevel); //$NON-NLS-1$
@@ -725,7 +725,7 @@
target.setValue(compilerLevel); //$NON-NLS-1$
configuration.addChild(target);
plugin.setConfiguration(configuration);
- build.getPlugins().add(plugin);
+ plugins.add(plugin);
}
public static PomResourceImpl loadResource(IFile pomFile)
Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java
===================================================================
--- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2012-07-10 21:42:54 UTC (rev 42496)
+++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2012-07-10 22:21:29 UTC (rev 42497)
@@ -114,7 +114,7 @@
}
IProjectFacet seamFacet = ProjectFacetsManager.getProjectFacet(SEAM_FACET_ID);
if (!"pom".equals(packaging) && !fpwc.hasProjectFacet(seamFacet)) {
- MavenCoreActivator.addCompilerPlugin(build, project);
+ MavenCoreActivator.addCompilerPlugin(build.getPlugins(), project);
}
if (!pom.exists()) {
Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml
===================================================================
--- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2012-07-10 21:42:54 UTC (rev 42496)
+++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2012-07-10 22:21:29 UTC (rev 42497)
@@ -499,18 +499,10 @@
</repositories>
<build>
+ <pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.7.2</version>
<configuration>
@@ -518,5 +510,6 @@
</configuration>
</plugin>
</plugins>
+ </pluginManagement>
</build>
</project>
\ No newline at end of file
Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2012-07-10 21:42:54 UTC (rev 42496)
+++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2012-07-10 22:21:29 UTC (rev 42497)
@@ -912,6 +912,9 @@
webProjectName = seamFacetModel.getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME);
IProject seamWebProject = ResourcesPlugin.getWorkspace().getRoot().getProject(webProjectName);
+
+ MavenCoreActivator.addCompilerPlugin(model.getBuild().getPluginManagement().getPlugins(), seamWebProject);
+
IPath location = seamWebProject.getLocation().removeLastSegments(1);
location = location.append(parentProjectName);
MavenCoreActivator.createMavenProject(parentProjectName, null, model, false, location);
13 years, 9 months
JBoss Tools SVN: r42496 - in trunk/common/plugins: org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2012-07-10 17:42:54 -0400 (Tue, 10 Jul 2012)
New Revision: 42496
Modified:
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/TempJavaProblemAnnotation.java
Log:
Make Quick Fix "Add @SuppressWarnings" work on Temporary annotations https://issues.jboss.org/browse/JBIDE-12303
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2012-07-10 21:40:25 UTC (rev 42495)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/AddSuppressWarningsMarkerResolution.java 2012-07-10 21:42:54 UTC (rev 42496)
@@ -35,13 +35,18 @@
import org.eclipse.jdt.core.dom.CompilationUnit;
import org.eclipse.jdt.core.refactoring.CompilationUnitChange;
import org.eclipse.jdt.internal.core.JavaElement;
+import org.eclipse.jdt.ui.text.java.IJavaCompletionProposal;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.contentassist.IContextInformation;
import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools;
import org.eclipse.ltk.core.refactoring.TextChange;
+import org.eclipse.ltk.core.refactoring.TextFileChange;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.text.edits.InsertEdit;
import org.eclipse.text.edits.ReplaceEdit;
@@ -60,7 +65,7 @@
* @author Daniel Azarov
*/
public class AddSuppressWarningsMarkerResolution implements
- IMarkerResolution2 {
+ IMarkerResolution2, IJavaCompletionProposal {
public static final String SUPPRESS_WARNINGS_ANNOTATION = "SuppressWarnings";
public static final String SPACE = " "; //$NON-NLS-1$
public static final String DOT = "."; //$NON-NLS-1$
@@ -73,6 +78,7 @@
private String preferenceKey;
private String label;
private String description;
+ private ICompilationUnit cu;
public AddSuppressWarningsMarkerResolution(IFile file, IJavaElement element, String preferenceKey){
this.file = file;
@@ -92,6 +98,13 @@
description = getPreview();
}
+ public AddSuppressWarningsMarkerResolution(IFile file, IJavaElement element, String preferenceKey, ICompilationUnit compilationUnit){
+ this(file, element, preferenceKey);
+ this.cu = compilationUnit;
+
+ description = getPreview();
+ }
+
private String getPreview(){
TextChange previewChange = getPreviewChange();
@@ -122,12 +135,16 @@
private TextChange getPreviewChange(){
if(element != null && preferenceKey != null){
try {
- ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
+ ICompilationUnit original = (cu != null) ? cu : EclipseUtil.getCompilationUnit(file);
if(original == null) {
return null;
}
+ ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
- return getChange(original);
+ TextChange change = getChange(compilationUnit);
+
+ compilationUnit.discardWorkingCopy();
+ return change;
} catch (JavaModelException e) {
CommonUIPlugin.getDefault().logError(e);
}
@@ -156,18 +173,24 @@
@Override
public void run(IMarker marker) {
- if(element != null && preferenceKey != null){
+ ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
+ if(original != null) {
+ do_run(original, false);
+ }
+ }
+
+ private void do_run(ICompilationUnit original, boolean leaveDirty){
+ if(element != null && preferenceKey != null && original != null){
disablePreference();
try {
- ICompilationUnit original = EclipseUtil.getCompilationUnit(file);
- if(original == null) {
- return;
- }
ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor());
CompilationUnitChange change = getChange(compilationUnit);
if(change != null){
+ if(leaveDirty){
+ change.setSaveMode(TextFileChange.LEAVE_DIRTY);
+ }
change.perform(new NullProgressMonitor());
original.reconcile(ICompilationUnit.NO_AST, false, null, new NullProgressMonitor());
}
@@ -451,5 +474,35 @@
}
}
+
+ @Override
+ public void apply(IDocument document) {
+ do_run(cu, true);
+ }
+
+ @Override
+ public Point getSelection(IDocument document) {
+ return null;
+ }
+
+ @Override
+ public String getAdditionalProposalInfo() {
+ return description;
+ }
+
+ @Override
+ public String getDisplayString() {
+ return label;
+ }
+
+ @Override
+ public IContextInformation getContextInformation() {
+ return null;
+ }
+
+ @Override
+ public int getRelevance() {
+ return 100;
+ }
}
Modified: trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2012-07-10 21:40:25 UTC (rev 42495)
+++ trunk/common/plugins/org.jboss.tools.common.ui/src/org/jboss/tools/common/ui/marker/ConfigureProblemSeverityResolutionGenerator.java 2012-07-10 21:42:54 UTC (rev 42496)
@@ -12,6 +12,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IMarker;
@@ -85,6 +87,18 @@
}
return null;
}
+
+ private IJavaElement findJavaElement(TempJavaProblemAnnotation annotation, int position){
+ try {
+ ICompilationUnit compilationUnit = annotation.getCompilationUnit();
+ if(compilationUnit != null){
+ return compilationUnit.getElementAt(position);
+ }
+ } catch (CoreException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ return null;
+ }
private ILocalVariable findParameter(IMethod method, int position) throws JavaModelException{
for(ILocalVariable parameter : method.getParameters()){
@@ -156,9 +170,45 @@
String preferenceKey = getPreferenceKey(annotation);
String preferencePageId = getPreferencePageId(annotation);
if(preferenceKey != null && preferencePageId != null){
+ if(annotation instanceof TempJavaProblemAnnotation){
+ TempJavaProblemAnnotation tAnnotation = (TempJavaProblemAnnotation)annotation;
+ int position = getPosition(tAnnotation);
+ IFile file = getFile(tAnnotation);
+ if(file != null){
+ IJavaElement element = findJavaElement(tAnnotation, position);
+ if(element != null){
+ if(element instanceof IMethod){
+ try{
+ ILocalVariable parameter = findParameter((IMethod)element, position);
+ if(parameter != null){
+ proposals.add(new AddSuppressWarningsMarkerResolution(file, parameter, preferenceKey, tAnnotation.getCompilationUnit()));
+ }
+ }catch(JavaModelException ex){
+ CommonUIPlugin.getDefault().logError(ex);
+ }
+ }
+ proposals.add(new AddSuppressWarningsMarkerResolution(file, element, preferenceKey, tAnnotation.getCompilationUnit()));
+ }
+ }
+ }
proposals.add(new ConfigureProblemSeverityMarkerResolution(preferencePageId, preferenceKey));
}
return proposals;
}
+
+ private int getPosition(TempJavaProblemAnnotation annotation){
+ return annotation.getPosition();
+ }
+
+ private IFile getFile(TempJavaProblemAnnotation annotation){
+ if(annotation.getCompilationUnit() != null){
+ try {
+ return (IFile)annotation.getCompilationUnit().getUnderlyingResource();
+ } catch (JavaModelException e) {
+ CommonUIPlugin.getDefault().logError(e);
+ }
+ }
+ return null;
+ }
}
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/TempJavaProblemAnnotation.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/TempJavaProblemAnnotation.java 2012-07-10 21:40:25 UTC (rev 42495)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/TempJavaProblemAnnotation.java 2012-07-10 21:42:54 UTC (rev 42496)
@@ -30,4 +30,8 @@
public Map getAttributes() {
return problem.getAttributes();
}
+
+ public int getPosition(){
+ return problem.getSourceStart();
+ }
}
\ No newline at end of file
13 years, 9 months
JBoss Tools SVN: r42495 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-10 17:40:25 -0400 (Tue, 10 Jul 2012)
New Revision: 42495
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java
Log:
JBIDE-12296
https://issues.jboss.org/browse/JBIDE-12296
Synchronized map is used in TypeResolutionCache.
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java 2012-07-10 21:16:59 UTC (rev 42494)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/util/TypeResolutionCache.java 2012-07-10 21:40:25 UTC (rev 42495)
@@ -10,10 +10,8 @@
******************************************************************************/
package org.jboss.tools.common.util;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.Hashtable;
import java.util.Map;
-import java.util.Set;
import org.eclipse.core.resources.IProject;
import org.eclipse.jdt.core.IJavaProject;
@@ -30,7 +28,7 @@
static class Resolved {
IType type;
- Map<String, String> types = new HashMap<String, String>();
+ Map<String, String> types = new Hashtable<String, String>();
Resolved(IType type) {
this.type = type;
}
@@ -42,7 +40,7 @@
}
static String NULL = ";;;"; //$NON-NLS-1$
- Map<String,Resolved> resolved = new HashMap<String, Resolved>();
+ Map<String,Resolved> resolved = new Hashtable<String, Resolved>();
private TypeResolutionCache() {}
@@ -72,7 +70,7 @@
}
public void clean() {
- resolved = new HashMap<String, Resolved>();
+ resolved = new Hashtable<String, Resolved>();
}
private String __resolveType(IType type, String typeName) {
13 years, 9 months
JBoss Tools SVN: r42494 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-10 17:16:59 -0400 (Tue, 10 Jul 2012)
New Revision: 42494
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java
Log:
JBIDE-12309
https://issues.jboss.org/browse/JBIDE-12309
Images used in AbstractTemporaryAnnotation are registered.
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java 2012-07-10 20:42:47 UTC (rev 42493)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/AbstractTemporaryAnnotation.java 2012-07-10 21:16:59 UTC (rev 42494)
@@ -14,6 +14,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.source.Annotation;
@@ -25,11 +28,11 @@
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Canvas;
import org.eclipse.ui.editors.text.EditorsUI;
+import org.eclipse.ui.internal.WorkbenchImages;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
-import org.eclipse.ui.internal.util.BundleUtility;
import org.eclipse.ui.texteditor.AnnotationPreference;
import org.eclipse.ui.texteditor.AnnotationPreferenceLookup;
-import org.eclipse.ui.texteditor.ImageUtilities;
+import org.eclipse.jface.text.source.ImageUtilities;
/**
* @author Alexey Kazakov
@@ -80,9 +83,15 @@
@Override
public void paint(GC gc, Canvas canvas, Rectangle bounds) {
String path = seveirty==WARNING_LAYER? getWarningIconPath() : getErrorIconPath();
- URL url = BundleUtility.find(IDEWorkbenchPlugin.IDE_WORKBENCH, path);
- ImageDescriptor descriptor = ImageDescriptor.createFromURL(url);
- Image image = descriptor.createImage(false);
+
+ Image image = CommonValidationPlugin.getDefault().getWorkbench().getSharedImages().getImage(path);
+ if(image == null || image.isDisposed()) {
+ URL url = FileLocator.find(Platform.getBundle(IDEWorkbenchPlugin.IDE_WORKBENCH), new Path(path), null);
+ ImageDescriptor descriptor = ImageDescriptor.createFromURL(url);
+ WorkbenchImages.declareImage(path, descriptor, true);
+ image = CommonValidationPlugin.getDefault().getWorkbench().getSharedImages().getImage(path);
+ }
+
ImageUtilities.drawImage(image, gc, canvas, bounds, SWT.CENTER, SWT.TOP);
}
13 years, 9 months
JBoss Tools SVN: r42493 - in branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui: src/org/jboss/tools/maven/ui/internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-07-10 16:42:47 -0400 (Tue, 10 Jul 2012)
New Revision: 42493
Modified:
branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
Log:
JBIDE-12207 : Bump default Seam version in the JBoss Maven Facet wizard page
Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2012-07-10 20:21:15 UTC (rev 42492)
+++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/META-INF/MANIFEST.MF 2012-07-10 20:42:47 UTC (rev 42493)
@@ -19,7 +19,7 @@
org.eclipse.jdt;bundle-version="3.7.0",
org.eclipse.compare;bundle-version="3.5.200"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.jboss.tools.maven.ui,
org.jboss.tools.maven.ui.internal.libprov,
Modified: branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
===================================================================
--- branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2012-07-10 20:21:15 UTC (rev 42492)
+++ branches/jbosstools-3.3.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2012-07-10 20:42:47 UTC (rev 42493)
@@ -157,11 +157,11 @@
if ("2.0".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$
seamVersion.setText("2.0.2.SP1"); //$NON-NLS-1$
} else if ("2.1".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$
- seamVersion.setText("2.1.1.GA"); //$NON-NLS-1$
+ seamVersion.setText("2.1.2.GA"); //$NON-NLS-1$
} else if ("2.2".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$
- seamVersion.setText("2.2.1.Final"); //$NON-NLS-1$
+ seamVersion.setText("2.2.2.Final"); //$NON-NLS-1$
} else if ("2.3".equals(seamFacetVersion.getVersionString())) { //$NON-NLS-1$
- seamVersion.setText("2.3.0.ALPHA"); //$NON-NLS-1$
+ seamVersion.setText("2.3.0.Beta2"); //$NON-NLS-1$
}
Button removeWTPContainers = new Button(composite,SWT.CHECK);
removeWTPContainers.setText(Messages.MavenFacetInstallPage_Remove_WTP_Classpath_containers);
13 years, 9 months
JBoss Tools SVN: r42492 - in trunk/build/aggregate: site and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-10 16:21:15 -0400 (Tue, 10 Jul 2012)
New Revision: 42492
Modified:
trunk/build/aggregate/coretests-site/site.xml
trunk/build/aggregate/site/site.xml
Log:
https://issues.jboss.org/browse/JBDS-2241 add sources to JBT aggregate sites so they can be found downstream by JBDS build
Modified: trunk/build/aggregate/coretests-site/site.xml
===================================================================
--- trunk/build/aggregate/coretests-site/site.xml 2012-07-10 20:20:59 UTC (rev 42491)
+++ trunk/build/aggregate/coretests-site/site.xml 2012-07-10 20:21:15 UTC (rev 42492)
@@ -48,7 +48,7 @@
<feature url="features/org.jboss.tools.birt.test.feature.source_0.0.0.jar" id="org.jboss.tools.birt.test.feature.source" version="0.0.0"><category name="JBoss Tools - Core Tests"/></feature>
<feature url="features/org.jboss.tools.cdi.seam.test.feature.source_0.0.0.jar" id="org.jboss.tools.cdi.seam.test.feature.source" version="0.0.0"><category name="JBoss Tools - Core Tests"/></feature>
<feature url="features/org.jboss.tools.cdi.test.feature.source_0.0.0.jar" id="org.jboss.tools.cdi.test.feature.source" version="0.0.0"><category name="JBoss Tools - Core Tests"/></feature>
-<!-- TODO add central sources <feature url="features/org.jboss.tools.central.test.feature.source_0.0.0.jar" id="org.jboss.tools.central.test.feature.source" version="0.0.0"><category name="JBoss Tools - Core Tests"/></feature> -->
+<feature url="features/org.jboss.tools.central.test.feature.source_0.0.0.jar" id="org.jboss.tools.central.test.feature.source" version="0.0.0"><category name="JBoss Tools - Core Tests"/></feature>
<feature url="features/org.jboss.tools.common.all.test.feature.source_0.0.0.jar" id="org.jboss.tools.common.all.test.feature.source" version="0.0.0"><category name="JBoss Tools - Core Tests"/></feature>
<feature url="features/org.jboss.tools.project.examples.test.feature.source_0.0.0.jar" id="org.jboss.tools.project.examples.test.feature.source" version="0.0.0"><category name="JBoss Tools - Core Tests"/></feature>
<feature url="features/org.jboss.tools.forge.test.feature.source_0.0.0.jar" id="org.jboss.tools.forge.test.feature.source" version="0.0.0"><category name="JBoss Tools - Core Tests"/></feature>
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2012-07-10 20:20:59 UTC (rev 42491)
+++ trunk/build/aggregate/site/site.xml 2012-07-10 20:21:15 UTC (rev 42492)
@@ -257,6 +257,13 @@
<!-- ####### -->
<!-- SOURCES -->
<!-- ####### -->
+ <feature url="features/org.jboss.tools.central.feature.source_0.0.0.jar" id="org.jboss.tools.central.feature.source" version="0.0.0">
+ </feature>
+ <feature url="features/org.jboss.tools.community.central.feature.source_0.0.0.jar" id="org.jboss.tools.community.central.feature.source" version="0.0.0">
+ <category name="AllSources" />
+ </feature>
+ <feature url="features/org.jboss.tools.central.discovery.feature.source_0.0.0.jar" id="org.jboss.tools.central.discovery.feature.source" version="0.0.0">
+ </feature>
<feature url="features/org.jboss.tools.richfaces.feature.source_0.0.0.jar" id="org.jboss.tools.richfaces.feature.source" version="0.0.0">
<category name="AllSources" />
</feature>
13 years, 9 months
JBoss Tools SVN: r42491 - in trunk/central: features/org.jboss.tools.central.discovery.feature and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-10 16:20:59 -0400 (Tue, 10 Jul 2012)
New Revision: 42491
Added:
trunk/central/features/org.jboss.tools.central.discovery.feature/sourceTemplateFeature/
trunk/central/features/org.jboss.tools.central.discovery.feature/sourceTemplateFeature/.gitkeep
trunk/central/features/org.jboss.tools.central.feature/sourceTemplateFeature/
trunk/central/features/org.jboss.tools.central.feature/sourceTemplateFeature/.gitkeep
trunk/central/features/org.jboss.tools.central.test.feature/license.html
trunk/central/features/org.jboss.tools.central.test.feature/sourceTemplateFeature/
trunk/central/features/org.jboss.tools.central.test.feature/sourceTemplateFeature/.gitkeep
trunk/central/features/org.jboss.tools.community.central.feature/sourceTemplateFeature/
trunk/central/features/org.jboss.tools.community.central.feature/sourceTemplateFeature/.gitkeep
Modified:
trunk/central/features/org.jboss.tools.central.discovery.feature/pom.xml
trunk/central/features/org.jboss.tools.central.feature/pom.xml
trunk/central/features/org.jboss.tools.central.test.feature/build.properties
trunk/central/features/org.jboss.tools.central.test.feature/pom.xml
trunk/central/features/org.jboss.tools.community.central.feature/pom.xml
trunk/central/plugins/org.jboss.tools.central/build.properties
trunk/central/pom.xml
trunk/central/site/category.xml
Log:
https://issues.jboss.org/browse/JBDS-2241 add sources to JBT Central so they can be found downstream by JBDS build
Modified: trunk/central/features/org.jboss.tools.central.discovery.feature/pom.xml
===================================================================
--- trunk/central/features/org.jboss.tools.central.discovery.feature/pom.xml 2012-07-10 19:08:27 UTC (rev 42490)
+++ trunk/central/features/org.jboss.tools.central.discovery.feature/pom.xml 2012-07-10 20:20:59 UTC (rev 42491)
@@ -9,4 +9,37 @@
<groupId>org.jboss.tools.central.features</groupId>
<artifactId>org.jboss.tools.central.discovery.feature</artifactId>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: trunk/central/features/org.jboss.tools.central.discovery.feature/sourceTemplateFeature/.gitkeep
===================================================================
Modified: trunk/central/features/org.jboss.tools.central.feature/pom.xml
===================================================================
--- trunk/central/features/org.jboss.tools.central.feature/pom.xml 2012-07-10 19:08:27 UTC (rev 42490)
+++ trunk/central/features/org.jboss.tools.central.feature/pom.xml 2012-07-10 20:20:59 UTC (rev 42491)
@@ -9,4 +9,37 @@
<groupId>org.jboss.tools.central.features</groupId>
<artifactId>org.jboss.tools.central.feature</artifactId>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added: trunk/central/features/org.jboss.tools.central.feature/sourceTemplateFeature/.gitkeep
===================================================================
Modified: trunk/central/features/org.jboss.tools.central.test.feature/build.properties
===================================================================
--- trunk/central/features/org.jboss.tools.central.test.feature/build.properties 2012-07-10 19:08:27 UTC (rev 42490)
+++ trunk/central/features/org.jboss.tools.central.test.feature/build.properties 2012-07-10 20:20:59 UTC (rev 42491)
@@ -1,2 +1,3 @@
bin.includes = feature.xml,\
- feature.properties
+ feature.properties,\
+ license.html
Added: trunk/central/features/org.jboss.tools.central.test.feature/license.html
===================================================================
--- trunk/central/features/org.jboss.tools.central.test.feature/license.html (rev 0)
+++ trunk/central/features/org.jboss.tools.central.test.feature/license.html 2012-07-10 20:20:59 UTC (rev 42491)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>Red Hat, Inc. licenses these features and plugins to you under
+certain open source licenses (or aggregations of such licenses), which
+in a particular case may include the Eclipse Public License, the GNU
+Lesser General Public License, and/or certain other open source
+licenses. For precise licensing details, consult the corresponding
+source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive,
+Raleigh NC 27606 USA.
+</p>
+</body>
+</html>
\ No newline at end of file
Modified: trunk/central/features/org.jboss.tools.central.test.feature/pom.xml
===================================================================
--- trunk/central/features/org.jboss.tools.central.test.feature/pom.xml 2012-07-10 19:08:27 UTC (rev 42490)
+++ trunk/central/features/org.jboss.tools.central.test.feature/pom.xml 2012-07-10 20:20:59 UTC (rev 42491)
@@ -11,4 +11,37 @@
<artifactId>org.jboss.tools.central.test.feature</artifactId>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Added: trunk/central/features/org.jboss.tools.central.test.feature/sourceTemplateFeature/.gitkeep
===================================================================
Modified: trunk/central/features/org.jboss.tools.community.central.feature/pom.xml
===================================================================
--- trunk/central/features/org.jboss.tools.community.central.feature/pom.xml 2012-07-10 19:08:27 UTC (rev 42490)
+++ trunk/central/features/org.jboss.tools.community.central.feature/pom.xml 2012-07-10 20:20:59 UTC (rev 42491)
@@ -11,4 +11,37 @@
<artifactId>org.jboss.tools.community.central.feature</artifactId>
<packaging>eclipse-feature</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-source-feature-plugin</artifactId>
+ <version>${tychoExtrasVersion}</version>
+ <executions>
+ <execution>
+ <id>source-feature</id>
+ <phase>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <id>attached-p2-metadata</id>
+ <phase>package</phase>
+ <goals>
+ <goal>p2-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Added: trunk/central/features/org.jboss.tools.community.central.feature/sourceTemplateFeature/.gitkeep
===================================================================
Modified: trunk/central/plugins/org.jboss.tools.central/build.properties
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/build.properties 2012-07-10 19:08:27 UTC (rev 42490)
+++ trunk/central/plugins/org.jboss.tools.central/build.properties 2012-07-10 20:20:59 UTC (rev 42491)
@@ -1,5 +1,7 @@
source.. = src/
output.. = bin/
+src.includes = *
+src.excludes = src
bin.includes = plugin.xml,\
META-INF/,\
.,\
Modified: trunk/central/pom.xml
===================================================================
--- trunk/central/pom.xml 2012-07-10 19:08:27 UTC (rev 42490)
+++ trunk/central/pom.xml 2012-07-10 20:20:59 UTC (rev 42491)
@@ -14,6 +14,9 @@
<name>central.all</name>
<packaging>pom</packaging>
<!--
+ Note: building the update site for this component may require that you first build
+ the tycho plugins in ../build/tycho-plugins/, if they can't be resolved from Nexus.
+
mvn clean install
or
mvn clean install -B -U -fae -e -P jbosstools-nightly-staging-composite,jboss-requirements-composite-mirror,jboss-requirements-composite-extras-mirror,local.site -Dlocal.site=file://home/nboldt/tmp/JBT_REPO_Indigo/
Modified: trunk/central/site/category.xml
===================================================================
--- trunk/central/site/category.xml 2012-07-10 19:08:27 UTC (rev 42490)
+++ trunk/central/site/category.xml 2012-07-10 20:20:59 UTC (rev 42491)
@@ -6,14 +6,24 @@
<feature url="features/org.jboss.tools.community.central.feature_0.0.0.jar" id="org.jboss.tools.community.central.feature" version="0.0.0">
<category name="JBoss Central Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.tools.community.central.feature.source_0.0.0.jar" id="org.jboss.tools.community.central.feature.source" version="0.0.0">
+ <category name="JBoss Central Nightly Build Update Site"/>
+ </feature>
<feature url="features/org.jboss.tools.central.feature_0.0.0.jar" id="org.jboss.tools.central.feature" version="0.0.0">
</feature>
+ <feature url="features/org.jboss.tools.central.feature.source_0.0.0.jar" id="org.jboss.tools.central.feature.source" version="0.0.0">
+ </feature>
<feature url="features/org.jboss.tools.central.discovery.feature_0.0.0.jar" id="org.jboss.tools.central.discovery.feature" version="0.0.0">
</feature>
+ <feature url="features/org.jboss.tools.central.discovery.feature.source_0.0.0.jar" id="org.jboss.tools.central.discovery.feature.source" version="0.0.0">
+ </feature>
<feature url="features/org.jboss.tools.central.test.feature_0.0.0.jar" id="org.jboss.tools.central.test.feature" version="0.0.0">
<category name="JBoss Central Nightly Build Update Site"/>
</feature>
+ <feature url="features/org.jboss.tools.central.test.feature.source_0.0.0.jar" id="org.jboss.tools.central.test.feature.source" version="0.0.0">
+ <category name="JBoss Central Nightly Build Update Site"/>
+ </feature>
<category-def name="JBoss Central Nightly Build Update Site" label="JBoss Central Nightly Build Update Site">
<description>
13 years, 9 months
JBoss Tools SVN: r42490 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-07-10 15:08:27 -0400 (Tue, 10 Jul 2012)
New Revision: 42490
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
Log:
https://issues.jboss.org/browse/JBIDE-10611 As-you-type CDI validation
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-07-10 18:14:58 UTC (rev 42489)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/TempMarkerManager.java 2012-07-10 19:08:27 UTC (rev 42490)
@@ -18,6 +18,7 @@
import java.util.Set;
import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -48,9 +49,20 @@
abstract public class TempMarkerManager extends ValidationErrorManager {
protected boolean asYouTypeValidation;
+ protected int messageCounter;
protected abstract String getMessageBundleName();
+ /*
+ * (non-Javadoc)
+ * @see org.jboss.tools.common.validation.ValidationErrorManager#init(org.eclipse.core.resources.IProject, org.jboss.tools.common.validation.ContextValidationHelper, org.jboss.tools.common.validation.IProjectValidationContext, org.eclipse.wst.validation.internal.provisional.core.IValidator, org.eclipse.wst.validation.internal.provisional.core.IReporter, boolean)
+ */
+ @Override
+ public void init(IProject project, ContextValidationHelper validationHelper, IProjectValidationContext validationContext, IValidator manager, IReporter reporter, boolean asYouTypeValidation) {
+ super.init(project, validationHelper, validationContext, manager, reporter, asYouTypeValidation);
+ messageCounter = 0;
+ }
+
/**
* @return the asYouTypeValidation
*/
@@ -154,21 +166,23 @@
}
private IMessage addMesssage(IResource target, int lineNumber, int offset, int length, int severity, String preferenceKey, String textMessage, String[] messageArguments) {
- if(lineNumber<0) {
- try {
- lineNumber = document.getLineOfOffset(offset) + 1;
- } catch (BadLocationException e) {
- CommonPlugin.getDefault().logError(e);
+ IMessage message = null;
+ if(messageCounter<=getMaxNumberOfMarkersPerFile(target.getProject())) {
+ if(lineNumber<0) {
+ try {
+ lineNumber = document.getLineOfOffset(offset) + 1;
+ } catch (BadLocationException e) {
+ CommonPlugin.getDefault().logError(e);
+ }
}
+ message = addMesssage(validationManager, shouldCleanAllAnnotations(), this.reporter, offset, length, target, lineNumber, severity, textMessage, messageArguments, getMessageBundleName());
+ messageCounter++;
+ String preferencePageId = getPreferencePageId();
+ if(preferencePageId != null && preferenceKey != null){
+ message.setAttribute(PREFERENCE_KEY_ATTRIBUTE_NAME, preferenceKey);
+ message.setAttribute(PREFERENCE_PAGE_ID_NAME, preferencePageId);
+ }
}
- IMessage message = addMesssage(validationManager, shouldCleanAllAnnotations(), this.reporter, offset, length, target, lineNumber, severity, textMessage, messageArguments, getMessageBundleName());
-
- String preferencePageId = getPreferencePageId();
- if(preferencePageId != null && preferenceKey != null){
- message.setAttribute(PREFERENCE_KEY_ATTRIBUTE_NAME, preferenceKey);
- message.setAttribute(PREFERENCE_PAGE_ID_NAME, preferencePageId);
- }
-
return message;
}
Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-07-10 18:14:58 UTC (rev 42489)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidationErrorManager.java 2012-07-10 19:08:27 UTC (rev 42490)
@@ -54,8 +54,7 @@
public static final String SUPPRESS_WARNINGS_ENABLED_ATTRIBUTE = "sup_warn_ena"; //$NON-NLS-1$
public static final String MESSAGE_ID_ATTRIBUTE_NAME = "Message_id"; //$NON-NLS-1$
- protected IStatus OK_STATUS = new Status(IStatus.OK,
- "org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
+ protected IStatus OK_STATUS = new Status(IStatus.OK, "org.eclipse.wst.validation", 0, "OK", null); //$NON-NLS-1$ //$NON-NLS-2$
protected IValidator validationManager;
protected ContextValidationHelper coreHelper;
@@ -67,8 +66,6 @@
protected IDocument document;
protected Set<IFile> dirtyFiles;
-
-
/**
* Constructor
*/
13 years, 9 months
JBoss Tools SVN: r42489 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-07-10 14:14:58 -0400 (Tue, 10 Jul 2012)
New Revision: 42489
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-12308 : VPE throws StackOverflowError and visual part is blank
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2012-07-10 15:22:19 UTC (rev 42488)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2012-07-10 18:14:58 UTC (rev 42489)
@@ -89,7 +89,8 @@
/*
* Pattern "|(//.*)" could be added at the end to remove single line comments.
*/
- public static final Pattern CSS_COMMENT_PATTERN = Pattern.compile("(/\\*([^*]|["+LINE_SEPARATOR+"]|(\\*+([^*/]|["+LINE_SEPARATOR+"])))*\\*+/)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ private static final String CSS_COMMENT_END = "*/"; //$NON-NLS-1$
+ private static final String CSS_COMMENT_START = "/*"; //$NON-NLS-1$
public static String ATTR_URL = "url"; //$NON-NLS-1$
public static String OPEN_BRACKET = "("; //$NON-NLS-1$
@@ -949,12 +950,27 @@
}
/**
- * Removes all the CSS comments from the text
+ * Removes all the CSS comments from the text.
*
- * @param cssText the css text
+ * @param css the CSS text
* @return updated string
*/
public static String removeAllCssComments(String cssText) {
- return CSS_COMMENT_PATTERN.matcher(cssText).replaceAll(Constants.EMPTY);
+ // It is too expensive to use regular expressions here, this is why they are not used. See JBIDE-12308
+
+ StringBuilder cssBuilder = new StringBuilder(cssText);
+ int curIndex = 0;
+ int commentStartIndex;
+ while ((commentStartIndex = cssBuilder.indexOf(CSS_COMMENT_START, curIndex)) >= 0) {
+ int afterCommentEndIndex = cssBuilder.indexOf(CSS_COMMENT_END, commentStartIndex + CSS_COMMENT_START.length());
+ if (afterCommentEndIndex >= 0) {
+ afterCommentEndIndex += CSS_COMMENT_END.length();
+ } else {
+ afterCommentEndIndex = cssBuilder.length();
+ }
+ cssBuilder.replace(commentStartIndex, afterCommentEndIndex, " "); //$NON-NLS-1$
+ curIndex = commentStartIndex + 1;
+ }
+ return cssBuilder.toString();
}
}
\ No newline at end of file
13 years, 9 months
JBoss Tools SVN: r42488 - 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-07-10 11:22:19 -0400 (Tue, 10 Jul 2012)
New Revision: 42488
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
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/GitCloningSettingsWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
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/ProjectAndServerAdapterSettingsWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java
Log:
[JBIDE-12306] resetting wizard models when user switches openshift user in the application wizard
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-07-10 14:44:38 UTC (rev 42487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-07-10 15:22:19 UTC (rev 42488)
@@ -36,6 +36,7 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.fieldassist.AutoCompleteField;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecoration;
@@ -161,6 +162,9 @@
ValueBindingBuilder.bind(existingAppNameTextObservable).to(existingAppNameModelObservable).in(dbc);
UIUtils.focusOnSelection(useExistingAppBtn, existingAppNameText);
createExistingAppNameContentAssist();
+ useExistingAppBtnSelection.addValueChangeListener(
+ onUseExistingApplication(
+ newAppConfigurationGroup, existingAppNameText, browseAppsButton));
this.browseAppsButton = new Button(existingAppSelectionGroup, SWT.NONE);
browseAppsButton.setText("Browse...");
@@ -236,11 +240,6 @@
GridDataFactory.fillDefaults()
.grab(true, true).align(SWT.FILL, SWT.FILL).applyTo(newAppConfigurationGroup);
- IObservableValue useExistingApplication = WidgetProperties.selection().observe(useExistingAppBtn);
- useExistingApplication.addValueChangeListener(
- onUseExistingApplication(
- newAppConfigurationGroup, existingAppNameText, browseAppsButton));
-
final Label newAppNameLabel = new Label(newAppConfigurationGroup, SWT.NONE);
newAppNameLabel.setText("Name:");
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).applyTo(newAppNameLabel);
@@ -662,24 +661,33 @@
@Override
protected void onPageActivated(final DataBindingContext dbc) {
if (ensureHasDomain()) {
- new Thread() {
- public void run() {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- loadOpenshiftResources(dbc);
- enableApplicationWidgets(pageModel.isUseExistingApplication());
- createExistingAppNameContentAssist();
- // this is needed because of weird issues with UI
- // not reacting to model changes while wizard
- // runnable is run. We force another update
- dbc.updateModels();
- }
- });
- }
- }.start();
+ enableApplicationWidgets(pageModel.isUseExistingApplication());
+ createExistingAppNameContentAssist();
+ // this is needed because of weird issues with UI
+ // not reacting to model changes while wizard
+ // runnable is run. We force another update
+ // dbc.updateModels();
+ this.newAppNameText.setFocus();
}
}
+ @Override
+ protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ if (direction == Direction.FORWARDS) {
+ try {
+ pageModel.reset();
+ // needs to be done before loading resources,
+ // otherwise: dbc.updateModels() will be
+ // called and old data could be restored
+ loadOpenshiftResources(dbc);
+ dbc.updateTargets();
+ setPageComplete(false);
+ } catch (OpenShiftException e) {
+ Logger.error("Failed to reset page fields", e);
+ }
+ }
+ }
+
/**
* Checks that the user has a domain, opens the creation dialog in case he
* hasn't, closes the wizard if the user does not create a domain (required
@@ -709,66 +717,25 @@
return true;
}
- /**
- *
- * @return private boolean ensureHasSshKey() {
- *
- * }
- */
-
protected void loadOpenshiftResources(final DataBindingContext dbc) {
try {
- WizardUtils.runInWizard(new Job("Loading existing applications...") {
+ WizardUtils.runInWizard(new Job("Loading applications, cartridges and gears...") {
@Override
protected IStatus run(IProgressMonitor monitor) {
try {
+ monitor.setTaskName("Loading existing applications...");
pageModel.loadExistingApplications();
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load applications", e);
- }
- }
-
- }, getContainer(), dbc);
-
- WizardUtils.runInWizard(new Job("Loading application cartridges...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
+ monitor.setTaskName("Loading application cartridges...");
pageModel.loadStandaloneCartridges();
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load application cartridges", e);
- }
- }
- }, getContainer(), dbc);
- WizardUtils.runInWizard(new Job("Loading embeddable cartridges...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
+ monitor.setTaskName("Loading embeddable cartridges...");
setViewerInput(pageModel.loadEmbeddedCartridges());
- return Status.OK_STATUS;
- } catch (NotFoundOpenShiftException e) {
- return Status.OK_STATUS;
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load embeddable cartridges", e);
- }
- }
- }, getContainer(), dbc);
- WizardUtils.runInWizard(new Job("Loading gear sizes...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- try {
+ monitor.setTaskName("Loading gear profiles...");
pageModel.loadGearProfiles();
return Status.OK_STATUS;
} catch (NotFoundOpenShiftException e) {
return Status.OK_STATUS;
} catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus("Could not load gear sizes", e);
+ return OpenShiftUIActivator.createErrorStatus("Could not load applications, cartridges and gears", e);
}
}
}, getContainer(), dbc);
@@ -821,14 +788,6 @@
return ValidationStatus.ok();
}
-
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(existingAppNameTextObservable);
- return targets;
- }
-
}
class NewApplicationNameValidator extends MultiValidator {
@@ -862,13 +821,6 @@
}
return ValidationStatus.ok();
}
-
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(applicationNameObservable);
- return targets;
- }
}
/**
@@ -879,18 +831,18 @@
*/
class NewApplicationTypeValidator extends MultiValidator {
- private final IObservableValue useExistingAppBtnbservable;
+ private final IObservableValue useExistingAppBtnObservable;
private final IObservableValue selectedApplicationTypeObservable;
public NewApplicationTypeValidator(IObservableValue useExistingAppBtnbservable,
IObservableValue selectedApplicationTypeObservable) {
- this.useExistingAppBtnbservable = useExistingAppBtnbservable;
+ this.useExistingAppBtnObservable = useExistingAppBtnbservable;
this.selectedApplicationTypeObservable = selectedApplicationTypeObservable;
}
@Override
protected IStatus validate() {
- final boolean useExistingApp = (Boolean) useExistingAppBtnbservable.getValue();
+ final boolean useExistingApp = (Boolean) useExistingAppBtnObservable.getValue();
final Integer selectedCartridgeIndex = (Integer) selectedApplicationTypeObservable.getValue();
if (useExistingApp) {
return ValidationStatus.ok();
@@ -901,13 +853,6 @@
}
return ValidationStatus.ok();
}
-
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(selectedApplicationTypeObservable);
- return targets;
- }
}
@Override
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-07-10 14:44:38 UTC (rev 42487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-07-10 15:22:19 UTC (rev 42488)
@@ -325,7 +325,10 @@
public void setExistingApplication(IApplication application) throws OpenShiftException {
if (application != null) {
setExistingApplicationName(application.getName());
- doSetExistingApplication(application);
+ // already called within setExistingApplicationName(String) above
+ // doSetExistingApplication(application);
+ } else {
+ setExistingApplicationName(null);
}
}
@@ -353,10 +356,6 @@
}
}
- public void resetExistingApplication() throws OpenShiftException, SocketTimeoutException {
- setExistingApplication((IApplication) null);
- }
-
public void setApplicationName(String applicationName) {
firePropertyChange(PROPERTY_APPLICATION_NAME
, wizardModel.getApplicationName()
@@ -426,4 +425,12 @@
public IDomain getDomain() throws SocketTimeoutException, OpenShiftException {
return wizardModel.getUser().getDefaultDomain();
}
+
+ public void reset() throws OpenShiftException {
+ setApplicationName(wizardModel.getApplication());
+ setExistingApplication(wizardModel.getApplication());
+ setUseExistingApplication(wizardModel.isUseExistingApplication());
+ setSelectedEmbeddableCartridges(wizardModel.getSelectedEmbeddableCartridges());
+ }
+
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-07-10 14:44:38 UTC (rev 42487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPage.java 2012-07-10 15:22:19 UTC (rev 42488)
@@ -24,6 +24,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.wizard.IWizardPage;
@@ -224,6 +225,14 @@
enableWidgets(pageModel.isNewProject());
}
+ @Override
+ protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ if (direction == Direction.FORWARDS) {
+ pageModel.reset();
+ dbc.updateTargets();
+ }
+ }
+
private void enableWidgets(boolean isNewProject) {
if (isNewProject) {
useDefaultRepoPathButton.setEnabled(true);
@@ -279,14 +288,6 @@
}
return ValidationStatus.ok();
}
-
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(repoPathObservable);
- return targets;
- }
-
}
/**
@@ -340,19 +341,15 @@
}
Repository repository = EGitUtils.getRepository(project);
+ if (repository == null) {
+ return false;
+ }
return EGitUtils.hasRemote(remoteName, repository);
} catch (Exception e) {
OpenShiftUIActivator.log(OpenShiftUIActivator.createErrorStatus(e.getMessage(), e));
return false;
}
}
-
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(remoteNameObservable);
- return targets;
- }
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-07-10 14:44:38 UTC (rev 42487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/GitCloningSettingsWizardPageModel.java 2012-07-10 15:22:19 UTC (rev 42488)
@@ -174,4 +174,8 @@
return useDefaultRemoteName;
}
+ public void reset() {
+ setRemoteName(wizardModel.getRemoteName());
+ setRepositoryPath(wizardModel.getRepositoryPath());
+ }
}
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-07-10 14:44:38 UTC (rev 42487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-07-10 15:22:19 UTC (rev 42488)
@@ -40,7 +40,10 @@
protected HashMap<String, Object> dataModel = new HashMap<String, Object>();
private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges";
-
+ private static final String DEFAULT_APPLICATION = "default_application";
+ private static final String DEFAULT_PROJECT = "default_project";
+ private static final String DEFAULT_USE_EXISTING_APPLICATION = "default_useExistingApplication";
+
public OpenShiftExpressApplicationWizardModel(UserDelegate user) {
this(user, null, null, false);
}
@@ -48,15 +51,10 @@
public OpenShiftExpressApplicationWizardModel(UserDelegate user, IProject project, IApplication application,
boolean useExistingApplication) {
// default value(s)
+ setDefaultProject(project);
+ setDefaultApplication(application);
+ setDefaultUseExistingApplication(useExistingApplication);
setUser(user);
- setProject(project);
- setNewProject(true);
- setApplication(application);
- setUseExistingApplication(useExistingApplication);
- setCreateServerAdapter(true);
- setRepositoryPath(DEFAULT_REPOSITORY_PATH);
- setRemoteName(NEW_PROJECT_REMOTE_NAME_DEFAULT);
- setServerType(ServerCore.findServerType(ExpressServerUtils.OPENSHIFT_SERVER_TYPE));
}
/**
@@ -202,6 +200,15 @@
return (IApplication) getProperty(APPLICATION);
}
+ public void setDefaultApplication(IApplication application) {
+ setProperty(DEFAULT_APPLICATION, application);
+ setApplication(application);
+ }
+
+ public IApplication getDefaultApplication() {
+ return (IApplication) getProperty(DEFAULT_APPLICATION);
+ }
+
@Override
public void setApplication(IApplication application) {
setProperty(APPLICATION, application);
@@ -259,6 +266,16 @@
return (String) setProperty(PROJECT_NAME, projectName);
}
+ public IProject setDefaultProject(IProject project) {
+ setProperty(DEFAULT_PROJECT, project);
+ setProject(project);
+ return project;
+ }
+
+ public IProject getDefaultProject() {
+ return (IProject) getProperty(DEFAULT_PROJECT);
+ }
+
@Override
public IProject setProject(IProject project) {
if (project != null && project.exists()) {
@@ -331,6 +348,20 @@
return (Boolean) getProperty(USE_EXISTING_APPLICATION);
}
+ public boolean setDefaultUseExistingApplication(boolean useExistingApplication) {
+ setProperty(DEFAULT_USE_EXISTING_APPLICATION, useExistingApplication);
+ setUseExistingApplication(useExistingApplication);
+ return useExistingApplication;
+ }
+
+ public boolean getDefaultUseExistingApplication() {
+ Object useExistingApp = getProperty(DEFAULT_USE_EXISTING_APPLICATION);
+ if (useExistingApp != null) {
+ return (Boolean) useExistingApp;
+ }
+ return false;
+ }
+
@Override
public boolean setUseExistingApplication(boolean useExistingApplication) {
Boolean isUseExistingApplication = (Boolean) setProperty(USE_EXISTING_APPLICATION, useExistingApplication);
@@ -433,10 +464,22 @@
@Override
public UserDelegate setUser(UserDelegate user) {
- UserDelegate oldValue = (UserDelegate) getProperty(USER);
- return (UserDelegate) setProperty(USER, user);
+ setProperty(USER, user);
+ resetWizardModel();
+ return user;
}
+ public void resetWizardModel() {
+ setApplication(getDefaultApplication());
+ setUseExistingApplication(getDefaultUseExistingApplication());
+ setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>());
+ setNewProject(true);
+ setCreateServerAdapter(true);
+ setRepositoryPath(IOpenShiftExpressWizardModel.DEFAULT_REPOSITORY_PATH);
+ setRemoteName(IOpenShiftExpressWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT);
+ setServerType(ServerCore.findServerType(ExpressServerUtils.OPENSHIFT_SERVER_TYPE));
+ }
+
@Override
public void addUserToModel() {
UserDelegate user = getUser();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-07-10 14:44:38 UTC (rev 42487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-07-10 15:22:19 UTC (rev 42488)
@@ -15,8 +15,6 @@
import org.eclipse.core.databinding.DataBindingContext;
import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.validation.MultiValidator;
import org.eclipse.core.resources.IProject;
@@ -27,6 +25,7 @@
import org.eclipse.jface.databinding.swt.ISWTObservableValue;
import org.eclipse.jface.databinding.swt.WidgetProperties;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.PageChangingEvent;
import org.eclipse.jface.fieldassist.AutoCompleteField;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.fieldassist.FieldDecoration;
@@ -301,18 +300,19 @@
}
return status;
}
-
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(projectNameObservable);
- return targets;
- }
}
@Override
+ protected void onPageWillGetActivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ if (direction == Direction.FORWARDS) {
+ pageModel.reset();
+ }
+ }
+
+ @Override
protected void onPageActivated(DataBindingContext dbc) {
setPageTitle();
+ dbc.updateTargets();
}
private void setPageTitle() {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java 2012-07-10 14:44:38 UTC (rev 42487)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPageModel.java 2012-07-10 15:22:19 UTC (rev 42488)
@@ -85,4 +85,10 @@
public String getApplicationName() {
return wizardModel.getApplicationName();
}
+
+ public void reset() {
+ setNewProject(!wizardModel.isExistingProject());
+ setProjectName(wizardModel.getProjectName());
+ setCreateServerAdapter(wizardModel.isCreateServerAdapter());
+ }
}
13 years, 9 months