JBoss Tools SVN: r28703 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 10:44:37 -0500 (Fri, 28 Jan 2011)
New Revision: 28703
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
Log:
corrected typo
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-28 15:28:17 UTC (rev 28702)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-28 15:44:37 UTC (rev 28703)
@@ -350,7 +350,7 @@
firePropertyChange(PROP_INSTANCES, oldInstances, repo.get());
} catch (DeltaCloudClientException e) {
throw new DeltaCloudException(MessageFormat.format(
- "Could not load instanceRepo of cloud {0}: {1}", getName(), e.getMessage()), e);
+ "Could not load instances of cloud {0}: {1}", getName(), e.getMessage()), e);
}
}
13 years, 4 months
JBoss Tools SVN: r28702 - in branches/jbosstools-3.2.x/deltacloud/plugins: org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 10:28:17 -0500 (Fri, 28 Jan 2011)
New Revision: 28702
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Log:
[JBIDE-8250]
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-28 15:13:35 UTC (rev 28701)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2011-01-28 15:28:17 UTC (rev 28702)
@@ -636,7 +636,7 @@
} catch (DeltaCloudAuthClientException e) {
return false;
} catch (DeltaCloudClientException e) {
- throw new DeltaCloudException(MessageFormat.format("Could not connection to cloud \"{0}\" at \"{1}\"",
+ throw new DeltaCloudException(MessageFormat.format("Could not connect to cloud \"{0}\" at \"{1}\"",
name, url), e);
}
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-28 15:13:35 UTC (rev 28701)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClientImpl.java 2011-01-28 15:28:17 UTC (rev 28702)
@@ -138,7 +138,7 @@
int statusCode = httpResponse.getStatusLine().getStatusCode();
if (HttpStatusCode.OK.isStatus(statusCode)) {
return;
- } else if (HttpStatusCode.FORBIDDEN.isStatus(statusCode)) {
+ } else if (HttpStatusCode.UNAUTHORIZED.isStatus(statusCode)) {
throw new DeltaCloudAuthClientException(
MessageFormat
.format("The server reported an authorization error \"{0}\" on requesting \"{1}\"",
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java 2011-01-28 15:13:35 UTC (rev 28701)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java 2011-01-28 15:28:17 UTC (rev 28702)
@@ -15,7 +15,7 @@
*/
public enum HttpStatusCode {
- OK(200), NOT_FOUND(404), FORBIDDEN(403);
+ OK(200), NOT_FOUND(404), FORBIDDEN(403), UNAUTHORIZED(401);
private int code;
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-01-28 15:13:35 UTC (rev 28701)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-01-28 15:28:17 UTC (rev 28702)
@@ -92,7 +92,7 @@
} catch (DeltaCloudException e) {
ErrorUtils.handleErrorAsync(WizardMessages.getString("CloudConnectionAuthError.title"),
WizardMessages.getFormattedString("CloudConnectionAuthError.message", url), e, getShell());
- return true;
+ return false;
}
}
13 years, 4 months
JBoss Tools SVN: r28701 - in branches/jbosstools-3.2.x/maven/plugins: org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-01-28 10:13:35 -0500 (Fri, 28 Jan 2011)
New Revision: 28701
Modified:
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/configurators/HibernateProjectConfigurator.java
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
Log:
JBIDE-8252 JBoss Maven Configurators don't check transitive dependencies
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/configurators/HibernateProjectConfigurator.java
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/configurators/HibernateProjectConfigurator.java 2011-01-28 14:58:43 UTC (rev 28700)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.hibernate/src/org/jboss/tools/maven/hibernate/configurators/HibernateProjectConfigurator.java 2011-01-28 15:13:35 UTC (rev 28701)
@@ -1,7 +1,10 @@
package org.jboss.tools.maven.hibernate.configurators;
+import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.eclipse.core.resources.IProject;
@@ -67,14 +70,21 @@
}
private boolean isHibernateProject(MavenProject mavenProject) {
- List<Dependency> dependencies = mavenProject.getDependencies();
- for (Dependency dependency:dependencies) {
- String groupId = dependency.getGroupId();
- if (groupId != null && HIBERNATE_GROUP_ID.equals(groupId)) {
- String artifactId = dependency.getArtifactId();
+ List<Artifact> artifacts = new ArrayList<Artifact>();
+ ArtifactFilter filter = new org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter(
+ Artifact.SCOPE_TEST);
+ for (Artifact artifact : mavenProject.getArtifacts()) {
+ if (filter.include(artifact)) {
+ artifacts.add(artifact);
+ }
+ }
+ for (Artifact artifact:artifacts) {
+ String groupId = artifact.getGroupId();
+ if (HIBERNATE_GROUP_ID.equals(groupId)) {
+ String artifactId = artifact.getArtifactId();
if (artifactId != null && artifactId.startsWith(HIBERNATE_ARTIFACT_ID_PREFIX)) {
return true;
- }
+ }
}
}
return false;
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-01-28 14:58:43 UTC (rev 28700)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-01-28 15:13:35 UTC (rev 28701)
@@ -5,6 +5,8 @@
import java.util.Iterator;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.eclipse.core.commands.ExecutionException;
@@ -455,21 +457,28 @@
}
private String getSeamVersion(MavenProject mavenProject) {
- List<Dependency> dependencies = mavenProject.getDependencies();
- Dependency seamDependency = null;
- for (Dependency dependency:dependencies) {
- String groupId = dependency.getGroupId();
+ List<Artifact> artifacts = new ArrayList<Artifact>();
+ ArtifactFilter filter = new org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter(
+ Artifact.SCOPE_TEST);
+ for (Artifact artifact : mavenProject.getArtifacts()) {
+ if (filter.include(artifact)) {
+ artifacts.add(artifact);
+ }
+ }
+ Artifact seamArtifact = null;
+ for (Artifact artifact:artifacts) {
+ String groupId = artifact.getGroupId();
if (groupId != null && ORG_JBOSS_SEAM_GROUP_ID.equals(groupId)) {
- String artifactId = dependency.getArtifactId();
+ String artifactId = artifact.getArtifactId();
if (artifactId != null && JBOSS_SEAM_ARTIFACT_ID.equals(artifactId)) {
- return dependency.getVersion();
+ return artifact.getVersion();
} else if (artifactId != null && artifactId.startsWith(JBOSS_SEAM_ARTIFACT_PREFIX)) {
- seamDependency = dependency;
+ seamArtifact = artifact;
}
}
}
- if (seamDependency != null) {
- return seamDependency.getVersion();
+ if (seamArtifact != null) {
+ return seamArtifact.getVersion();
}
return null;
}
Modified: branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java
===================================================================
--- branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-01-28 14:58:43 UTC (rev 28700)
+++ branches/jbosstools-3.2.x/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/Activator.java 2011-01-28 15:13:35 UTC (rev 28701)
@@ -1,7 +1,10 @@
package org.jboss.tools.maven.ui;
+import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.model.Dependency;
import org.apache.maven.project.MavenProject;
import org.eclipse.core.runtime.IStatus;
@@ -106,13 +109,20 @@
}
public String getDependencyVersion(MavenProject mavenProject, String gid, String aid) {
- List<Dependency> dependencies = mavenProject.getDependencies();
- for (Dependency dependency:dependencies) {
- String groupId = dependency.getGroupId();
+ List<Artifact> artifacts = new ArrayList<Artifact>();
+ ArtifactFilter filter = new org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter(
+ Artifact.SCOPE_TEST);
+ for (Artifact artifact : mavenProject.getArtifacts()) {
+ if (filter.include(artifact)) {
+ artifacts.add(artifact);
+ }
+ }
+ for (Artifact artifact:artifacts) {
+ String groupId = artifact.getGroupId();
if (groupId != null && (groupId.equals(gid)) ) {
- String artifactId = dependency.getArtifactId();
+ String artifactId = artifact.getArtifactId();
if (artifactId != null && artifactId.equals(aid)) {
- return dependency.getVersion();
+ return artifact.getVersion();
}
}
}
13 years, 4 months
JBoss Tools SVN: r28700 - in trunk/vpe/plugins/org.jboss.tools.vpe: src/org/jboss/tools/vpe/editor/template/textformating and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2011-01-28 09:58:43 -0500 (Fri, 28 Jan 2011)
New Revision: 28700
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/StyleFormatController.java
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/resources/textFormatting.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://issues.jboss.org/browse/JBIDE-8220 , CSSStyleDialog should be on the Formatting toolbar
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/resources/textFormatting.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/resources/textFormatting.xml 2011-01-28 14:42:16 UTC (rev 28699)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/resources/textFormatting.xml 2011-01-28 14:58:43 UTC (rev 28700)
@@ -24,4 +24,7 @@
<vpe:format type="ForegroundColorFormat">
<vpe:formatAttribute type="style" />
</vpe:format>
+ <vpe:format type="StyleFormat">
+ <vpe:formatAttribute type="style" />
+ </vpe:format>
</vpe:textFormatting>
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java 2011-01-28 14:42:16 UTC (rev 28699)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java 2011-01-28 14:58:43 UTC (rev 28700)
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.editor.template.textformating;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
-
-/**
- * Class contains data from template for text formating (Text Formating Tollbar).
- * @author Igels
- */
-public class TextFormatingData {
-
- private FormatData[] formats;
-
- /**
- * @param templateTextFormatingElement - Element <vpe:textFormatting>
- */
- public TextFormatingData(Element templateTextFormatingElement) {
- NodeList list = templateTextFormatingElement.getElementsByTagName(VpeTemplateManager.TAG_FORMAT);
-
- List<FormatData> defaultFormats = new ArrayList<FormatData>();
-
- if(VpeTemplateManager.ATTR_VALUE_YES.
- equals(templateTextFormatingElement.getAttribute(VpeTemplateManager.ATTR_USE_DEFAULT_FORMATS))) {
- //adds default format data
- FormatData[] formats =VpeTemplateManager.getDefaultTextFormattingData().getAllFormatData();
- for (FormatData formatData :formats) {
-
- defaultFormats.add(formatData);
- }
- }
- List<FormatData> localFormats=new ArrayList<FormatData>();
-
- for(int i=0;i<list.getLength();i++) {
- Element element = (Element)list.item(i);
- localFormats.add(new FormatData(element));
- }
- formats=(FormatData[])mergeLocalAndDefaultFormats(defaultFormats, localFormats).toArray(new FormatData[0]);
- }
- /**
- * Merges local and default formats.
- * If format with some type exist in local copy and remote, we use
- * local format
- *
- * @return merged list
- */
- private List<FormatData> mergeLocalAndDefaultFormats(List<FormatData> defaultFormats,List<FormatData> localFormats) {
-
- List<FormatData> result = new ArrayList<FormatData>(localFormats);
- for (FormatData formatData : defaultFormats) {
- if(!isFormatExistInList(result,formatData)) {
- result.add(formatData);
- }
- }
- return result;
- }
-
- private boolean isFormatExistInList(List<FormatData> formatData, FormatData data) {
-
- if(data.getType()==null) {
-
- return false;
- }
-
- for (FormatData format : formatData) {
-
- if(data.getType().equals(format.getType())) {
- return true;
- }
- }
-
- return false;
- }
- /**
- * @return children - <vpe:format>
- */
- public FormatData[] getAllFormatData() {
- return formats;
- }
-
- /**
- * @param type
- * @return
- */
- public FormatData[] getFormatDatas(String type) {
- ArrayList<FormatData> result = new ArrayList<FormatData>();
- for(int i=0; i<formats.length; i++) {
- if(type.equals(formats[i].getType())) {
- result.add(formats[i]);
- }
- }
- return result.toArray(new FormatData[]{});
- }
-
- /**
- * @param type
- * @return
- */
- public boolean hasFormatData(String type) {
- return getFormatDatas(type).length>0;
- }
-
-}
\ No newline at end of file
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/textformating/TextFormatingData.java 2011-01-28 14:58:43 UTC (rev 28700)
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.editor.template.textformating;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+import org.jboss.tools.vpe.editor.template.VpeTemplateManager;
+
+/**
+ * Class contains data from template for text formating (Text Formating Tollbar).
+ * @author Igels
+ */
+public class TextFormatingData {
+
+ private FormatData[] formats;
+
+ /**
+ * @param templateTextFormatingElement - Element <vpe:textFormatting>
+ */
+ public TextFormatingData(Element templateTextFormatingElement) {
+ NodeList list = templateTextFormatingElement.getElementsByTagName(VpeTemplateManager.TAG_FORMAT);
+
+ List<FormatData> defaultFormats = new ArrayList<FormatData>();
+
+ if(VpeTemplateManager.ATTR_VALUE_YES.
+ equals(templateTextFormatingElement.getAttribute(VpeTemplateManager.ATTR_USE_DEFAULT_FORMATS))) {
+ //adds default format data
+ FormatData[] formats =VpeTemplateManager.getDefaultTextFormattingData().getAllFormatData();
+ for (FormatData formatData :formats) {
+
+ defaultFormats.add(formatData);
+ }
+ }
+ List<FormatData> localFormats=new ArrayList<FormatData>();
+
+ for(int i=0;i<list.getLength();i++) {
+ Element element = (Element)list.item(i);
+ localFormats.add(new FormatData(element));
+ }
+ formats=(FormatData[])mergeLocalAndDefaultFormats(defaultFormats, localFormats).toArray(new FormatData[0]);
+ }
+ /**
+ * Merges local and default formats.
+ * If format with some type exist in local copy and remote, we use
+ * local format
+ *
+ * @return merged list
+ */
+ private List<FormatData> mergeLocalAndDefaultFormats(List<FormatData> defaultFormats,List<FormatData> localFormats) {
+
+ List<FormatData> result = new ArrayList<FormatData>(localFormats);
+ for (FormatData formatData : defaultFormats) {
+ if(!isFormatExistInList(result,formatData)) {
+ result.add(formatData);
+ }
+ }
+ return result;
+ }
+
+ private boolean isFormatExistInList(List<FormatData> formatData, FormatData data) {
+
+ if(data.getType()==null) {
+
+ return false;
+ }
+
+ for (FormatData format : formatData) {
+
+ if(data.getType().equals(format.getType())) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+ /**
+ * @return children - <vpe:format>
+ */
+ public FormatData[] getAllFormatData() {
+ return formats;
+ }
+
+ /**
+ * @param type
+ * @return
+ */
+ public FormatData[] getFormatDatas(String type) {
+ ArrayList<FormatData> result = new ArrayList<FormatData>();
+ for(int i=0; i<formats.length; i++) {
+ if(type.equals(formats[i].getType())) {
+ result.add(formats[i]);
+ }
+ }
+ return result.toArray(new FormatData[]{});
+ }
+
+ /**
+ * @param type
+ * @return
+ */
+ public boolean hasFormatData(String type) {
+ return getFormatDatas(type).length>0;
+ }
+
+}
\ No newline at end of file
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/StyleFormatController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/StyleFormatController.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/StyleFormatController.java 2011-01-28 14:58:43 UTC (rev 28700)
@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2011 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.editor.toolbar.format;
+
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.jst.css.dialog.CSSStyleDialog;
+import org.jboss.tools.vpe.editor.template.textformating.FormatAttributeData;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+/**
+ * @author dmaliarevich
+ *
+ * CSSStyleDialog should be on the Formatting toolbar.
+ * https://issues.jboss.org/browse/JBIDE-8220
+ */
+public class StyleFormatController extends AttributeFormatController {
+
+ public static final String TYPE = "StyleFormat"; //$NON-NLS-1$
+
+ protected ToolItem toolItem;
+ private String styleString = null;
+
+ public StyleFormatController(FormatControllerManager manager, ToolItem toolItem) {
+ super(manager);
+ this.toolItem = toolItem;
+ setToolbarItemEnabled(false);
+ }
+
+ @Override
+ public String getType() {
+ return TYPE;
+ }
+
+ @Override
+ public void setToolbarItemEnabled(boolean enabled) {
+ toolItem.setEnabled(enabled);
+ }
+
+ @Override
+ public void handleEvent(Event event) {
+ String baseStyle = ""; //$NON-NLS-1$
+ Node node = manager.getCurrentSelectedNode();
+ /*
+ * Try to get style attribute value
+ */
+ if (node instanceof Element) {
+ Element element = (Element) node;
+ if (element.hasAttribute(FormatAttributeData.STYLE_TYPE)) {
+ baseStyle = element.getAttribute(FormatAttributeData.STYLE_TYPE);
+ }
+ }
+ /*
+ * Open the dialog
+ */
+ CSSStyleDialog cssDialog = new CSSStyleDialog(PlatformUI.getWorkbench().getDisplay()
+ .getActiveShell(), baseStyle);
+ if (cssDialog.open() == Window.OK) {
+ styleString = cssDialog.getStyle();
+ }
+ super.handleEvent(event);
+ }
+
+ @Override
+ protected void setStyle(Attr styleAttribute,
+ FormatAttributeData templateData) {
+ /*
+ * 'styleString' is not null when user has pressed OK in the dialog.
+ * Thus node's style should be replaced with the new value.
+ * Otherwise nothing should be and will be changed.
+ */
+ if (null != styleString) {
+ styleAttribute.setValue(styleString);
+ }
+ }
+
+ @Override
+ protected boolean isStyleSet(Attr attribute,
+ FormatAttributeData templateData) {
+ return false;
+ }
+
+ @Override
+ public void setToolbarItemSelection() {
+ /*
+ * Do nothing
+ */
+ }
+
+ @Override
+ protected void setToolbarItemSelection(boolean selected) {
+ /*
+ * Do nothing
+ */
+ }
+
+}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java 2011-01-28 14:42:16 UTC (rev 28699)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/TextFormattingToolBar.java 2011-01-28 14:58:43 UTC (rev 28700)
@@ -26,6 +26,8 @@
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
+import org.jboss.tools.jst.css.CSSPlugin;
+import org.jboss.tools.jst.css.dialog.common.Util;
import org.jboss.tools.vpe.VpePlugin;
import org.jboss.tools.vpe.editor.mozilla.MozillaEditor;
import org.jboss.tools.vpe.editor.toolbar.SplitToolBar;
@@ -169,7 +171,17 @@
listener = new ForegroundColorFormatController(formatControllerManager, item);
item.addListener(SWT.Selection, listener);
// itemDescriptors.add(new ToolItemDescriptor(item, true, listener, true));
-
+
+ /*
+ * Fixes https://issues.jboss.org/browse/JBIDE-8220
+ * CSSStyleDialog should be on the Formatting toolbar.
+ */
+ item = createToolItem(toolBar, SWT.CHECK,
+ CSSPlugin.getImageDescriptor(Util.IMAGE_COLORLARGE_FILE_LOCATION).createImage(),
+ VpeUIMessages.EDIT_STYLE_ATTRIBUTE);
+ listener = new StyleFormatController(formatControllerManager, item);
+ item.addListener(SWT.Selection, listener);
+
// sep = new ToolItem(horBar, SWT.SEPARATOR);
//
// item = createToolItem(horBar, SWT.PUSH, "icons/left.gif", VpeToolbarFormatMessages.getInstance().getString(ALIGN_LEFT_KEY));
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2011-01-28 14:42:16 UTC (rev 28699)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2011-01-28 14:58:43 UTC (rev 28700)
@@ -62,6 +62,7 @@
public static String ITALIC;
public static String UNDERLINE;
public static String FOREGROUND_COLOR;
+ public static String EDIT_STYLE_ATTRIBUTE;
public static String VPE_UPDATE_JOB_TITLE;
public static String VPE_VISUAL_REFRESH_JOB;
public static String VpeDnD_PLACE_AFTER_INSIDE;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2011-01-28 14:42:16 UTC (rev 28699)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2011-01-28 14:58:43 UTC (rev 28700)
@@ -45,6 +45,7 @@
ITALIC=Italic
UNDERLINE=Underline
FOREGROUND_COLOR=Foreground Color
+EDIT_STYLE_ATTRIBUTE=Edit Style
VPE_UPDATE_JOB_TITLE=Visual Editor View Update
VPE_VISUAL_REFRESH_JOB=Visual Editor Refresh
13 years, 4 months
JBoss Tools SVN: r28699 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-28 09:42:16 -0500 (Fri, 28 Jan 2011)
New Revision: 28699
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
Log:
JBIDE-8263
https://issues.jboss.org/browse/JBIDE-8263
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-01-28 14:34:02 UTC (rev 28698)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewBeanWizardPage.java 2011-01-28 14:42:16 UTC (rev 28699)
@@ -75,6 +75,7 @@
*
*/
public class NewBeanWizardPage extends NewClassWizardPage {
+ protected CheckBoxEditorWrapper alternative = null;
protected CheckBoxEditorWrapper isNamed;
protected BeanNameEditorWrapper beanName;
@@ -200,11 +201,18 @@
void addAnnotations(ImportsManager imports, StringBuffer sb,
String lineDelimiter) {
+ addAlternativeAnnotation(imports, sb, lineDelimiter);
addNamedAnnotation(imports, sb, lineDelimiter);
addScopeAnnotation(imports, sb, lineDelimiter);
addQualifiersAnnotations(imports, sb, lineDelimiter);
}
+ protected void addAlternativeAnnotation(ImportsManager imports, StringBuffer sb, String lineDelimiter) {
+ if(alternative != null && alternative.composite.getValue() == Boolean.TRUE) {
+ NewCDIAnnotationWizardPage.addAnnotation(CDIConstants.ALTERNATIVE_ANNOTATION_TYPE_NAME, imports, sb, lineDelimiter);
+ }
+ }
+
protected void addNamedAnnotation(ImportsManager imports, StringBuffer sb, String lineDelimiter) {
if(isNamed.checkBox != null && isNamed.checkBox.getValue() != null && "true".equals(isNamed.checkBox.getValueAsString())) {
if(beanName.text.getValue() != null && beanName.text.getValueAsString().length() > 0) {
@@ -245,6 +253,7 @@
protected void createCustomFields(Composite composite) {
createBeanNameField(composite);
+ createAlternativeField(composite);
createScopeField(composite);
createQualifiersField(composite);
}
@@ -368,6 +377,11 @@
}});
}
+ protected void createAlternativeField(Composite composite) {
+ String label = "Add @Alternative";
+ alternative = createCheckBoxField(composite, "isAlternative", label, false);
+ }
+
protected CheckBoxEditorWrapper createCheckBoxField(Composite composite, String name, String label, boolean defaultValue) {
CheckBoxEditorWrapper wrapper = new CheckBoxEditorWrapper();
wrapper.checkBox = new CheckBoxFieldEditor(name,"",Boolean.valueOf(defaultValue));
13 years, 4 months
JBoss Tools SVN: r28698 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 09:34:02 -0500 (Fri, 28 Jan 2011)
New Revision: 28698
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudPasswordStorageKey.java
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/SecurePasswordStore.java
Log:
[JBIDE-8248] moved encoding to storage (was in key), url encoding keys now
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudPasswordStorageKey.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudPasswordStorageKey.java 2011-01-28 14:17:52 UTC (rev 28697)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudPasswordStorageKey.java 2011-01-28 14:34:02 UTC (rev 28698)
@@ -10,7 +10,6 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core;
-import org.eclipse.equinox.security.storage.EncodingUtils;
import org.jboss.tools.deltacloud.core.SecurePasswordStore.IStorageKey;
/**
@@ -21,23 +20,24 @@
*/
public class DeltaCloudPasswordStorageKey implements IStorageKey {
- private static final String PREFERNCES_BASEKEY = Activator.PLUGIN_ID.replace('.', '/');
+ private static final char SEPARATOR = '/';
+
+ private static final String PREFERNCES_BASEKEY = Activator.PLUGIN_ID.replace('.', SEPARATOR);
private String cloudName;
private String userName;
public DeltaCloudPasswordStorageKey(String cloudName, String userName) {
- this.userName = EncodingUtils.encodeBase64(userName.getBytes());
- this.cloudName = EncodingUtils.encodeBase64(cloudName.getBytes());
+ this.userName = userName;
+ this.cloudName = userName;
}
@Override
public String getKey() {
- String key = new StringBuilder(PREFERNCES_BASEKEY)
+ return new StringBuilder(PREFERNCES_BASEKEY)
.append(cloudName)
- .append('/') //$NON-NLS-1$
+ .append(SEPARATOR)
.append(userName)
.toString();
- return EncodingUtils.encodeSlashes(key);
}
@Override
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/SecurePasswordStore.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/SecurePasswordStore.java 2011-01-28 14:17:52 UTC (rev 28697)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/SecurePasswordStore.java 2011-01-28 14:34:02 UTC (rev 28698)
@@ -10,17 +10,27 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import org.eclipse.equinox.security.storage.EncodingUtils;
import org.eclipse.equinox.security.storage.ISecurePreferences;
import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
import org.eclipse.equinox.security.storage.StorageException;
/**
* @author Andre Dietisheim
+ *
+ * TODO: replace DeltaCloudException by SecurePasswordStoreException
+ * (decouple from Deltacloud)
*/
public class SecurePasswordStore {
+ private static final String ENCODING = "UTF-8";
+
public static interface IStorageKey {
public String getKey();
+
public boolean equals(IStorageKey key);
}
@@ -43,13 +53,13 @@
} else {
try {
return this.password = getFromPreferences(storageKey);
- } catch (StorageException e) {
+ } catch (Exception e) {
// TODO: internationalize strings
throw new DeltaCloudException("Could get password", e);
}
}
}
-
+
public void setPassword(String password) throws DeltaCloudException {
update(storageKey, password);
}
@@ -72,32 +82,44 @@
}
public void remove() throws DeltaCloudException {
- ISecurePreferences node = getNode(storageKey);
- if (node == null) {
- // TODO: internationalize strings
- throw new DeltaCloudException("Could not remove password");
+ try {
+ ISecurePreferences node = getNode(storageKey);
+ if (node == null) {
+ // TODO: internationalize strings
+ throw new DeltaCloudException("Could not remove password");
+ }
+ node.clear();
+ } catch (Exception e) {
+ throw new DeltaCloudException("Could not remove password", e);
}
- node.clear();
}
- private String getFromPreferences(IStorageKey key) throws StorageException {
+ private String getFromPreferences(IStorageKey key) throws StorageException, UnsupportedEncodingException {
ISecurePreferences node = getNode(key);
String password = node.get("password", null); //$NON-NLS-1$
- return password;
+ if (password == null) {
+ return null;
+ }
+ return EncodingUtils.encodeBase64(password.getBytes());
}
private void storeInPreferences(String password, IStorageKey key) throws DeltaCloudException {
try {
ISecurePreferences node = getNode(key);
- node.put("password", password, true /* encrypt */); //$NON-NLS-1$
- } catch (StorageException e) {
+ node.put("password", EncodingUtils.encodeBase64(password.getBytes()), true /* encrypt */); //$NON-NLS-1$
+ } catch (Exception e) {
// TODO: internationalize string
throw new DeltaCloudException("Could not store password", e);
}
}
- private ISecurePreferences getNode(IStorageKey key) {
+ private ISecurePreferences getNode(IStorageKey key) throws UnsupportedEncodingException {
+ if (key == null) {
+ return null;
+ }
+
ISecurePreferences root = SecurePreferencesFactory.getDefault();
- return root.node(key.getKey());
+ String keyString = URLEncoder.encode(key.getKey(), ENCODING);
+ return root.node(keyString);
}
}
13 years, 4 months
JBoss Tools SVN: r28697 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-28 09:17:52 -0500 (Fri, 28 Jan 2011)
New Revision: 28697
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
Log:
JBIDE-8244
https://issues.jboss.org/browse/JBIDE-8244
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2011-01-28 14:16:08 UTC (rev 28696)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewDecoratorWizardPage.java 2011-01-28 14:17:52 UTC (rev 28697)
@@ -65,6 +65,8 @@
public class NewDecoratorWizardPage extends NewClassWizardPage {
protected InterceptorBindingSelectionProvider interceptorBindingsProvider = new InterceptorBindingSelectionProvider();
IFieldEditor fieldName = null;
+ String defaultTypeName = null;
+ String defaultFieldName = null;
protected StatusInfo fieldNameStatus = new StatusInfo();
@@ -76,6 +78,8 @@
public void init(IStructuredSelection selection) {
super.init(selection);
+ defaultTypeName = null;
+ defaultFieldName = null;
if (!selection.isEmpty()) {
Object o = selection.iterator().next();
IType type = null;
@@ -125,13 +129,25 @@
String elementName = interfaceName.substring(d + 1, b);
String typeName = elementName + "Decorator";
typeName += interfaceName.substring(b);
- setTypeName(typeName, true);
- typeNameChanged();
- String defaultFieldName = elementName;
- if(defaultFieldName.length() > 0) {
- defaultFieldName = defaultFieldName.substring(0, 1).toLowerCase() + defaultFieldName.substring(1);
+
+ String currentTypeName = getTypeName();
+ boolean isDefault = currentTypeName == null || currentTypeName.length() == 0 || currentTypeName.equals(defaultTypeName);
+ if(isDefault) {
+ setTypeName(typeName, true);
+ typeNameChanged();
+ }
+ defaultTypeName = typeName;
+
+ String _defaultFieldName = elementName;
+ if(_defaultFieldName.length() > 0) {
+ _defaultFieldName = _defaultFieldName.substring(0, 1).toLowerCase() + _defaultFieldName.substring(1);
if(fieldName != null) {
- fieldName.setValue(defaultFieldName);
+ String currentFieldName = fieldName.getValueAsString();
+ isDefault = currentFieldName == null || currentFieldName.length() == 0 || currentFieldName.equals(defaultFieldName);
+ if(isDefault) {
+ fieldName.setValue(_defaultFieldName);
+ }
+ defaultFieldName = _defaultFieldName;
}
}
13 years, 4 months
JBoss Tools SVN: r28696 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-01-28 09:16:08 -0500 (Fri, 28 Jan 2011)
New Revision: 28696
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java
Log:
[JBIDE-8173]
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java 2011-01-28 12:01:15 UTC (rev 28695)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/UrlBuilder.java 2011-01-28 14:16:08 UTC (rev 28696)
@@ -11,15 +11,20 @@
package org.jboss.tools.deltacloud.core.client.utils;
+import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLEncoder;
import java.util.Collection;
/**
* A builder for an url. Currently no state checking is done, the user is
* responsible to build something that makes sense.
+ *
+ * @author André Dietisheim
*/
public class UrlBuilder {
+ private static final String URL_ENCODING = "UTF-8";
private static final String HOST_PROTOCOL_DELIMITER = ":";
private static final String HTTP_PROTOCOL_PREFIX = "http://";
private static final char PARAMETER_URL_DELIMITER = '?';
@@ -94,10 +99,9 @@
public UrlBuilder parameter(String name, String value) {
if (value != null) {
appendParameterDelimiter();
- urlStringBuilder.append(name).append(PARAMETER_NAME_VALUE_DELIMITER).append(value);
+ urlStringBuilder.append(name).append(PARAMETER_NAME_VALUE_DELIMITER).append(urlEncode(value));
}
return this;
-
}
private void appendParameterDelimiter() {
@@ -118,10 +122,18 @@
public UrlBuilder parameter(String parameter) {
appendParameterDelimiter();
- urlStringBuilder.append(parameter);
+ urlStringBuilder.append(urlEncode(parameter));
return this;
}
+ private String urlEncode(String value) {
+ try {
+ return URLEncoder.encode(value, URL_ENCODING);
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
public URL toUrl() throws MalformedURLException {
return new URL(urlStringBuilder.toString());
}
13 years, 4 months
JBoss Tools SVN: r28695 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-28 07:01:15 -0500 (Fri, 28 Jan 2011)
New Revision: 28695
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java
Log:
JBIDE-8244
https://issues.jboss.org/browse/JBIDE-8244
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java 2011-01-28 11:09:59 UTC (rev 28694)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java 2011-01-28 12:01:15 UTC (rev 28695)
@@ -74,6 +74,7 @@
public class NewAnnotationLiteralWizardPage extends NewClassWizardPage {
protected QualifierSelectionProvider qualifiersProvider = new QualifierSelectionProvider();
CompositeEditor qualifiers = null;
+ String defaultTypeName = null;
protected StatusInfo qualifierStatus = new StatusInfo();
@@ -87,6 +88,7 @@
public void init(IStructuredSelection selection) {
super.init(selection);
+ defaultTypeName = null;
if (!selection.isEmpty()) {
Object o = selection.iterator().next();
IType type = null;
@@ -144,8 +146,13 @@
String elementName = interfaceName.substring(d + 1, b);
String typeName = elementName + "Literal";
typeName += interfaceName.substring(b);
- setTypeName(typeName, true);
- typeNameChanged();
+ String currentTypeName = getTypeName();
+ boolean isDefault = currentTypeName == null || currentTypeName.length() == 0 || currentTypeName.equals(defaultTypeName);
+ if(isDefault) {
+ setTypeName(typeName, true);
+ typeNameChanged();
+ }
+ defaultTypeName = typeName;
}
public void createControl(Composite parent) {
13 years, 4 months
JBoss Tools SVN: r28694 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-28 06:09:59 -0500 (Fri, 28 Jan 2011)
New Revision: 28694
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectCDIAnnotationDialog.java
Log:
JBIDE-8265
https://issues.jboss.org/browse/JBIDE-8265
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java 2011-01-28 10:38:32 UTC (rev 28693)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/CDIAnnotationSelectionProvider.java 2011-01-28 11:09:59 UTC (rev 28694)
@@ -25,10 +25,20 @@
public abstract class CDIAnnotationSelectionProvider implements ListFieldEditorProvider<ICDIAnnotation> {
protected ICDIProject project;
protected IFieldEditor editor;
+ protected boolean multi = true;
protected IPackageFragment packageFragment = null;
public CDIAnnotationSelectionProvider() {}
+
+ /**
+ * Defines if selection dialog allows multiselection.
+ * By default set to true since cases when single choice is required are rare.
+ * @param multi
+ */
+ public void setMulti(boolean multi) {
+ this.multi = multi;
+ }
public void setEditorField(IFieldEditor editor) {
this.editor = editor;
@@ -48,7 +58,7 @@
public FilteredItemsSelectionDialog createSelectionDialog() {
Shell shell = CDIUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
- SelectCDIAnnotationDialog dialog = new SelectCDIAnnotationDialog(shell);
+ SelectCDIAnnotationDialog dialog = new SelectCDIAnnotationDialog(shell, multi);
dialog.setTitle(getDialogTitle());
dialog.setProvider(this);
return dialog;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java 2011-01-28 10:38:32 UTC (rev 28693)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/NewAnnotationLiteralWizardPage.java 2011-01-28 11:09:59 UTC (rev 28694)
@@ -81,6 +81,8 @@
setTitle(CDIUIMessages.NEW_ANNOTATION_LITERAL_WIZARD_PAGE_NAME);
setDescription(CDIUIMessages.NEW_ANNOTATION_LITERAL_WIZARD_DESCRIPTION);
setImageDescriptor(CDIUiImages.getImageDescriptor(CDIUiImages.WELD_WIZARD_IMAGE_PATH));
+
+ qualifiersProvider.setMulti(false);
}
public void init(IStructuredSelection selection) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectCDIAnnotationDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectCDIAnnotationDialog.java 2011-01-28 10:38:32 UTC (rev 28693)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectCDIAnnotationDialog.java 2011-01-28 11:09:59 UTC (rev 28694)
@@ -62,8 +62,8 @@
ListFieldEditorProvider<ICDIAnnotation> provider = null;
- public SelectCDIAnnotationDialog(Shell shell) {
- super(shell);
+ public SelectCDIAnnotationDialog(Shell shell, boolean multi) {
+ super(shell, multi);
setSelectionHistory(new SeamComponentSelectionHistory());
13 years, 4 months