JBoss Tools SVN: r32345 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-24 05:48:02 -0400 (Fri, 24 Jun 2011)
New Revision: 32345
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
Cleanup of runtime wizard fragments with some string changes
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-06-24 09:47:18 UTC (rev 32344)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-06-24 09:48:02 UTC (rev 32345)
@@ -62,6 +62,7 @@
public static String rwf_homeDirBlank;
public static String rwf_NoVMSelected;
public static String rwf_jre6NotFound;
+ public static String rwf_noValidJRE;
public static String swf_Title;
public static String swf_RuntimeInformation;
public static String swf_AuthorizationDescription;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-06-24 09:47:18 UTC (rev 32344)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-06-24 09:48:02 UTC (rev 32345)
@@ -13,13 +13,14 @@
rwf_JBossRuntime=JBoss Runtime
rwf_Explanation=A JBoss Server runtime references a JBoss installation directory.\nIt can be used to set up classpaths for projects which depend on this runtime,\nas well as by a "server" which will be able to start and stop instances of JBoss.
rwf_NameInUse=Runtime name already in use
-rwf_homeMissingFiles=The home directory does not exist or is missing the run.jar.
+rwf_homeMissingFiles=The home directory does not exist or is missing a required file or folder: {0}
rwf_jboss7homeNotValid=The home directory does not point to a valid JBoss installation.
rwf_homeIncorrectVersion=This server type expects a version of {0} but the server directory is of version {1}.
rwf_nameTextBlank=The name field must not be blank
rwf_homeDirBlank=The directory field must not be blank
rwf_NoVMSelected=No VM selected
rwf_jre6NotFound=No Java 6 runtime environment found
+rwf_noValidJRE=No valid JREs found for execution environment "{0}"
J2EEModuleExportOperation_could_not_export_module=Could not export module {1} to {0}.
J2EEModuleExportOperation_ErrorExportingArchive=Error Exporting Archive: {0}
JBAS_version=JBoss Application Server {0}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-06-24 09:47:18 UTC (rev 32344)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-06-24 09:48:02 UTC (rev 32345)
@@ -8,10 +8,12 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.core.TaskModel;
+import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -62,7 +64,7 @@
return Messages.rwf_NameInUse;
if (!isHomeValid())
- return Messages.rwf_homeMissingFiles;
+ return NLS.bind(Messages.rwf_homeMissingFiles, getSystemJarPath());
if (name == null || name.equals("")) //$NON-NLS-1$
return Messages.rwf_nameTextBlank;
@@ -86,11 +88,9 @@
.toString();
return new File(standaloneScriptPath).exists();
}
-
@Override
- protected String getVersionString(File loc) {
- // TODO clean this up for later
- return "7.0"; //$NON-NLS-1$
+ protected String getSystemJarPath() {
+ return JBossServerType.AS7.getSystemJarPath();
}
@Override
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-06-24 09:47:18 UTC (rev 32344)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-06-24 09:48:02 UTC (rev 32345)
@@ -615,14 +615,13 @@
}
if( getValidJREs().size() == 0 ) {
- String error = "No valid JREs found for execution environment \""
- + getRuntime().getExecutionEnvironment().getId() + "\"";
+ String error = NLS.bind(Messages.rwf_noValidJRE, getRuntime().getExecutionEnvironment().getId());
return error;
}
if (!isHomeValid())
- return Messages.rwf_homeMissingFiles;
+ return NLS.bind(Messages.rwf_homeMissingFiles, getSystemJarPath());
if (name == null || name.equals("")) //$NON-NLS-1$
return Messages.rwf_nameTextBlank;
@@ -652,8 +651,12 @@
return version;
}
+ protected String getSystemJarPath() {
+ return JBossServerType.AS.getSystemJarPath();
+ }
+
protected String getHomeVersionWarning() {
- File loc = new File(homeDir, JBossServerType.AS.getSystemJarPath());
+ File loc = new File(homeDir, getSystemJarPath() );
String version = getVersionString(loc);
IRuntime rt = (IRuntime) getTaskModel().getObject(
TaskModel.TASK_RUNTIME);
@@ -675,8 +678,8 @@
}
protected void browseHomeDirClicked() {
- File file = new File(homeDir);
- if (!file.exists()) {
+ File file = homeDir == null ? null : new File(homeDir);
+ if (file != null && !file.exists()) {
file = null;
}
14 years, 9 months
JBoss Tools SVN: r32344 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-24 05:47:18 -0400 (Fri, 24 Jun 2011)
New Revision: 32344
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
Log:
fixed obviously wrong check when updating host argument in launch config (was: checking if new host is equal to new host - should have been: checking if current host is equal to new host)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-24 06:12:54 UTC (rev 32343)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-24 09:47:18 UTC (rev 32344)
@@ -166,7 +166,7 @@
IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
IJBossRuntimeConstants.STARTUP_ARG_HOST_LONG);
- if (!host.equals(host))
+ if (!host.equals(argsHost))
args = ArgsUtil.setArg(args,
IJBossRuntimeConstants.STARTUP_ARG_HOST_SHORT,
IJBossRuntimeConstants.STARTUP_ARG_HOST_LONG, host);
14 years, 9 months
JBoss Tools SVN: r32343 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/perspective and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-24 02:12:54 -0400 (Fri, 24 Jun 2011)
New Revision: 32343
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-9225 - removal of AS perspective
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java 2011-06-24 04:35:20 UTC (rev 32342)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java 2011-06-24 06:12:54 UTC (rev 32343)
@@ -35,6 +35,7 @@
* @author Rob Stryker <rob.stryker(a)redhat.com>
*
*/
+@Deprecated
public class ASPerspective implements IPerspectiveFactory {
public static final String ID = "org.jboss.ide.eclipse.as.ui.ASPerspective";
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-06-24 04:35:20 UTC (rev 32342)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2011-06-24 06:12:54 UTC (rev 32343)
@@ -115,6 +115,7 @@
markerType="org.eclipse.wst.common.project.facet.core.validation.marker"/>
</extension>
+<!-- Delete this for 3.3.1, and delete the class and plugin.properties name
<extension
point="org.eclipse.ui.perspectives">
<perspective
@@ -122,7 +123,9 @@
icon="$nl$/icons/jboss.gif"
id="org.jboss.ide.eclipse.as.ui.ASPerspective"
name="%perspective.name"/>
- </extension>
+ </extension>
+
+ -->
<extension
point="org.eclipse.wst.server.ui.initialSelectionProvider">
<selectionProvider
14 years, 9 months
JBoss Tools SVN: r32342 - trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-24 00:35:20 -0400 (Fri, 24 Jun 2011)
New Revision: 32342
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java
Log:
JBIDE-9228 - deprecated some classes, added protections, switched constants
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2011-06-24 04:10:26 UTC (rev 32341)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2011-06-24 04:35:20 UTC (rev 32342)
@@ -34,7 +34,6 @@
import org.eclipse.wst.common.project.facet.core.runtime.IRuntimeComponent;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
-import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.classpath.core.runtime.WebtoolsProjectJBossClasspathContainerInitializer.WebtoolsProjectJBossClasspathContainer;
@@ -82,19 +81,18 @@
// Bad name, I know, but checks if this is
// an ear, war, ejb, or other top level facet
protected boolean isPrimaryFacet(IProjectFacet facet) {
-
- return facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.WEB_FACET)
- || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.EJB_FACET)
- || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.EAR_FACET)
- || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.CONNECTOR_FACET)
- || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.APP_CLIENT_FACET);
+ return facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_WEB)
+ || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_EJB)
+ || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_EAR)
+ || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_CONNECTOR)
+ || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_APP_CLIENT);
}
// Also a bad name, but facets the server automatically knows
// how to provide classpath entries for
protected boolean isSecondaryFacet(IProjectFacet facet) {
- return facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.JSF_FACET)
- || facet.equals(WebtoolsProjectJBossClasspathContainerInitializer.JPA_FACET);
+ return facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_JSF)
+ || facet.getId().equals(WebtoolsProjectJBossClasspathContainerInitializer.FACET_JPA);
}
public static final class Factory implements IAdapterFactory {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2011-06-24 04:10:26 UTC (rev 32341)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2011-06-24 04:35:20 UTC (rev 32342)
@@ -48,18 +48,21 @@
*/
public class WebtoolsProjectJBossClasspathContainerInitializer extends
ClasspathContainerInitializer implements ClasspathConstants {
+ public static IProjectFacet getSafeFacet(String id) {
+ return ProjectFacetsManager.isProjectFacetDefined(id) ? ProjectFacetsManager.getProjectFacet(id) : null;
+ }
- public static final IProjectFacet WEB_FACET = ProjectFacetsManager.getProjectFacet(FACET_WEB);
- public static final IProjectFacet EJB_FACET = ProjectFacetsManager.getProjectFacet(FACET_EJB);
- public static final IProjectFacet EAR_FACET = ProjectFacetsManager.getProjectFacet(FACET_EAR);
- public static final IProjectFacet UTILITY_FACET = ProjectFacetsManager.getProjectFacet(FACET_UTILITY);
- public static final IProjectFacet CONNECTOR_FACET = ProjectFacetsManager.getProjectFacet(FACET_CONNECTOR);
- public static final IProjectFacet APP_CLIENT_FACET = ProjectFacetsManager.getProjectFacet(FACET_APP_CLIENT);
+// @Deprecated public static final IProjectFacet WEB_FACET = getSafeFacet(FACET_WEB);
+// @Deprecated public static final IProjectFacet EJB_FACET = getSafeFacet(FACET_EJB);
+// @Deprecated public static final IProjectFacet EAR_FACET = getSafeFacet(FACET_EAR);
+// @Deprecated public static final IProjectFacet UTILITY_FACET = getSafeFacet(FACET_UTILITY);
+// @Deprecated public static final IProjectFacet CONNECTOR_FACET = getSafeFacet(FACET_CONNECTOR);
+// @Deprecated public static final IProjectFacet APP_CLIENT_FACET = getSafeFacet(FACET_APP_CLIENT);
+//
+// @Deprecated public static final IProjectFacet JSF_FACET = getSafeFacet(FACET_JSF);
+// @Deprecated public static final IProjectFacet JPA_FACET = getSafeFacet(FACET_JPA);
- public static final IProjectFacet JSF_FACET = ProjectFacetsManager.getProjectFacet(FACET_JSF);
- public static final IProjectFacet JPA_FACET = ProjectFacetsManager.getProjectFacet(FACET_JPA);
-
public WebtoolsProjectJBossClasspathContainerInitializer() {
// TODO Auto-generated constructor stub
}
@@ -155,7 +158,7 @@
}
protected boolean isEjb30(String facetId, String facetVersion) {
- if( facetId.equals(EJB_FACET.getId()) && facetVersion.equals(V3_0))
+ if( facetId.equals(FACET_EJB) && facetVersion.equals(V3_0))
return true;
return false;
}
@@ -187,13 +190,13 @@
IPath homePath = new Path(serverHome);
IPath configPath = homePath.append(SERVER).append(configName);
ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
- if (facetId.equals(WEB_FACET.getId())) {
+ if (facetId.equals(FACET_WEB)) {
IPath jsfDir = configPath.append(DEPLOY).append(JBOSS_WEB_DEPLOYER).append(JSF_LIB);
list.add(getEntry(configPath.append(LIB).append(JSP_API_JAR)));
list.add(getEntry(homePath.append(CLIENT).append(SERVLET_API_JAR)));
list.add(getEntry(jsfDir.append(JSF_API_JAR)));
list.add(getEntry(jsfDir.append(JSF_IMPL_JAR)));
- } else if( facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion)) {
+ } else if( facetId.equals(FACET_EJB) && !isEjb30(facetId, facetVersion)) {
list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR)));
} else if( isEjb30(facetId, facetVersion)) {
// path roots
@@ -216,9 +219,9 @@
// persistence jar
list.add(getEntry(client.append(EJB3_PERSISTENCE_JAR)));
- } else if( facetId.equals(EAR_FACET.getId())) {
+ } else if( facetId.equals(FACET_EAR)) {
list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR)));
- } else if( facetId.equals(APP_CLIENT_FACET.getId())) {
+ } else if( facetId.equals(FACET_APP_CLIENT)) {
list.add(getEntry(homePath.append(CLIENT).append(JBOSSALL_CLIENT_JAR)));
}
return list.toArray(new IClasspathEntry[list.size()]);
@@ -228,12 +231,12 @@
IPath homePath = new Path(serverHome);
IPath configPath = homePath.append(SERVER).append(configName);
ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
- if (facetId.equals(WEB_FACET.getId())) {
+ if (facetId.equals(FACET_WEB)) {
IPath jsfDir = configPath.append(DEPLOY).append(JBOSSWEB_TOMCAT55_SAR).append(JSF_LIB);
list.add(getEntry(configPath.append(LIB).append(JAVAX_SERVLET_JSP_JAR)));
list.add(getEntry(homePath.append(CLIENT).append(JAVAX_SERVLET_JAR)));
list.addAll(Arrays.asList(getEntries(jsfDir)));
- } else if( facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion)) {
+ } else if( facetId.equals(FACET_EJB) && !isEjb30(facetId, facetVersion)) {
list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR)));
} else if( isEjb30(facetId, facetVersion)) {
// path roots
@@ -253,9 +256,9 @@
// hibernate
list.add(getEntry(homePath.append(CLIENT).append(HIBERNATE_CLIENT_JAR)));
- } else if( facetId.equals(EAR_FACET.getId())) {
+ } else if( facetId.equals(FACET_EAR)) {
list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR)));
- } else if( facetId.equals(APP_CLIENT_FACET.getId())) {
+ } else if( facetId.equals(FACET_APP_CLIENT)) {
list.add(JavaRuntime.newArchiveRuntimeClasspathEntry(homePath.append(CLIENT).append(JBOSSALL_CLIENT_JAR)).getClasspathEntry());
}
return list.toArray(new IClasspathEntry[list.size()]);
@@ -266,14 +269,14 @@
IPath homePath = new Path(serverHome);
IPath configPath = homePath.append(SERVER).append(configName);
ArrayList<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
- if (facetId.equals(WEB_FACET.getId())) {
+ if (facetId.equals(FACET_WEB)) {
IPath p = configPath.append(DEPLOY).append(JBOSSWEB_TOMCAT_50_SAR);
list.add(getEntry(p.append(JSP_API_JAR)));
list.add(getEntry(p.append(SERVLET_API_JAR)));
- } else if( (facetId.equals(EJB_FACET.getId()) && !isEjb30(facetId, facetVersion))
- || facetId.equals(EAR_FACET.getId()) ) {
+ } else if( (facetId.equals(FACET_EJB) && !isEjb30(facetId, facetVersion))
+ || facetId.equals(FACET_EAR) ) {
list.add(getEntry(homePath.append(CLIENT).append(JBOSS_J2EE_JAR)));
- } else if( facetId.equals(APP_CLIENT_FACET.getId())) {
+ } else if( facetId.equals(FACET_APP_CLIENT)) {
list.add(getEntry(homePath.append(CLIENT).append(JBOSSALL_CLIENT_JAR)));
}
return list.toArray(new IClasspathEntry[list.size()]);
14 years, 9 months
JBoss Tools SVN: r32341 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-24 00:10:26 -0400 (Fri, 24 Jun 2011)
New Revision: 32341
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
Log:
JBIDE-9241 - npe in deployment detail editing
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-24 03:58:36 UTC (rev 32340)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2011-06-24 04:10:26 UTC (rev 32341)
@@ -782,8 +782,14 @@
DeploymentModulePrefs p = preferences.getOrCreatePreferences(MAIN)
.getOrCreateModulePrefs(module);
if (property == COLUMN_LOC) {
- String outputName = new Path(((String)value)).lastSegment();
- String outPath = ((String)value).substring(0, ((String)value).length()-outputName.length());
+ String outputName, outPath;
+ if( ((String)value).equals("")) {
+ outputName = null;
+ outPath = null;
+ } else {
+ outputName = new Path(((String)value)).lastSegment();
+ outPath = ((String)value).substring(0, ((String)value).length()-outputName.length());
+ }
page.firePropertyChangeCommand(p,
new String[]{COLUMN_LOC, OUTPUT_NAME},
new String[]{outPath,outputName},
14 years, 9 months
JBoss Tools SVN: r32340 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-23 23:58:36 -0400 (Thu, 23 Jun 2011)
New Revision: 32340
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
Log:
JBIDE-9128 i18n
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-06-24 03:35:12 UTC (rev 32339)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2011-06-24 03:58:36 UTC (rev 32340)
@@ -40,7 +40,6 @@
public static String wf_ConfigLabel;
public static String J2EEModuleExportOperation_could_not_export_module;
- public static String J2EEModuleExportOperation_DestinationFileIsDirectoryError;
public static String J2EEModuleExportOperation_ErrorExportingArchive;
public static String JBAS_version;
public static String JBEAP_version;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-06-24 03:35:12 UTC (rev 32339)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2011-06-24 03:58:36 UTC (rev 32340)
@@ -21,6 +21,7 @@
rwf_NoVMSelected=No VM selected
rwf_jre6NotFound=No Java 6 runtime environment found
J2EEModuleExportOperation_could_not_export_module=Could not export module {1} to {0}.
+J2EEModuleExportOperation_ErrorExportingArchive=Error Exporting Archive: {0}
JBAS_version=JBoss Application Server {0}
JBEAP_version=JBoss Enterprise Application Platform {0}
JBoss7ServerWizardFragment_could_not_create_ui=Could not create UI for runtime {0}
@@ -220,4 +221,3 @@
#Change Timestamp
ChangeTimestampServerListDialog_Title=Touch project
ChangeTimestampServerListDialog_Message=Project {0} has no files to touch.\nSelect servers in which to republish the project.
-
14 years, 9 months
JBoss Tools SVN: r32339 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-23 23:35:12 -0400 (Thu, 23 Jun 2011)
New Revision: 32339
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
JBIDE-9245 - renaming 6.0 to 6.x
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-06-24 00:29:12 UTC (rev 32338)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-06-24 03:35:12 UTC (rev 32339)
@@ -60,15 +60,20 @@
}
protected String getNextRuntimeName() {
+ String rtVersion = getRuntime().getRuntimeType().getVersion();
+ String prefix = Messages.jboss;
if( isEAP(getRuntime())) {
- String version = "5.x"; //$NON-NLS-1$
- String base = Messages.jboss + " EAP " + version + " " + Messages.runtime; //$NON-NLS-1$ //$NON-NLS-2$
- return getNextRuntimeName(base);
+ prefix = Messages.jboss + " EAP "; //$NON-NLS-1$
+ if( rtVersion.equals(IJBossToolingConstants.V5_0)) {
+ rtVersion = "5.x"; //$NON-NLS-1$
+ }
+ } else if( rtVersion.equals(IJBossToolingConstants.V6_0)) {
+ rtVersion = "6.x"; //$NON-NLS-1$
}
- return super.getNextRuntimeName();
+ String base = prefix + SPACE + rtVersion + SPACE + Messages.runtime;
+ return getNextRuntimeName(base);
}
-
public static boolean isEAP(IRuntime rt) {
return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-06-24 00:29:12 UTC (rev 32338)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-06-24 03:35:12 UTC (rev 32339)
@@ -24,9 +24,9 @@
jboss.version.51.description=JBoss Application Server 5.1
jboss.version.51.runtime.name=JBoss 5.1 Runtime
-jboss.version.60.name=JBoss AS 6.0
-jboss.version.60.description=JBoss Application Server 6.0
-jboss.version.60.runtime.name=JBoss 6.0 Runtime
+jboss.version.60.name=JBoss AS 6.x
+jboss.version.60.description=JBoss Application Server 6.x
+jboss.version.60.runtime.name=JBoss 6.x Runtime
jboss.version.70.name=JBoss AS 7.0
jboss.version.70.description=JBoss Application Server 7.0
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-06-24 00:29:12 UTC (rev 32338)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-06-24 03:35:12 UTC (rev 32339)
@@ -145,9 +145,13 @@
// make modifications to parent
IRuntime r = (IRuntime) getTaskModel()
.getObject(TaskModel.TASK_RUNTIME);
+ // TODO: Unify with code in LocalJBossServerRuntime and in getHomeVersionWarning
String version = r.getRuntimeType().getVersion();
if( isEAP() && version.startsWith("5."))
version = "5.x";
+ if( !isEAP() && version.startsWith("6."))
+ version = "6.x";
+
handle.setTitle( Messages.rwf_JBossRuntime);
String description = NLS.bind(
isEAP() ? Messages.JBEAP_version : Messages.JBAS_version,
@@ -660,8 +664,13 @@
* EAP 5.0 was started as named 5.0, but is now 5.x.
* So a jar with 5.1 should work here also.
*/
+ // This really needs to be extracted into an API
+ // To determine what server types work for what actual underlying version
+ // Unify with the core code in LocalJBossServerRuntime which changes 6.0 to 6.x
if( isEAP() && v.startsWith("5."))
v = "5.";
+ if( !isEAP() && v.startsWith("6."))
+ v = "6.";
return version.startsWith(v) ? null : NLS.bind(Messages.rwf_homeIncorrectVersion, v, version);
}
14 years, 9 months
JBoss Tools SVN: r32338 - in trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test: src/org/jboss/tools/cdi/seam/solder/core/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-23 20:29:12 -0400 (Thu, 23 Jun 2011)
New Revision: 32338
Added:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
Log:
JBIDE-8695
https://issues.jboss.org/browse/JBIDE-8695
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java 2011-06-24 00:29:12 UTC (rev 32338)
@@ -0,0 +1,12 @@
+package org.jboss.generic;
+
+import javax.inject.Inject;
+
+import org.jboss.seam.solder.bean.generic.Generic;
+import org.jboss.seam.solder.bean.generic.GenericConfiguration;
+
+(a)GenericConfiguration(Override.class)
+public class BrokenGenericBean {
+ int x;
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericBean.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java 2011-06-24 00:29:12 UTC (rev 32338)
@@ -0,0 +1,8 @@
+package org.jboss.generic;
+
+import org.jboss.seam.solder.bean.generic.GenericType;
+
+(a)GenericType(MyGenericBean.class)
+public @interface BrokenGenericType {
+ boolean value();
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/projects/CDISolderTest/src/org/jboss/generic/BrokenGenericType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-06-24 00:25:28 UTC (rev 32337)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/GenericBeanValidationTest.java 2011-06-24 00:29:12 UTC (rev 32338)
@@ -31,6 +31,24 @@
public GenericBeanValidationTest() {}
+ public void testBrokenGenericType() throws CoreException {
+ /*
+ * BrokenGenericType is annotated @GenericType(MyGenericBean.class)
+ * Generic configuration types may not be generic beans.
+ */
+ IFile file = project.getFile(new Path("src/org/jboss/generic/BrokenGenericType.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN, 5);
+ }
+
+ public void testBrokenGenericBean() throws CoreException {
+ /*
+ * BrokenGenericBean is annotated @GenericConfiguration(Override.class)
+ * Annotation type mismatch: 'Override' is not a generic configuration annotation.
+ */
+ IFile file = project.getFile(new Path("src/org/jboss/generic/BrokenGenericBean.java"));
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, SeamSolderValidationMessages.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE.substring(0, 25) + ".*", 8);
+ }
+
public void testRemovingGenericPointConfiguration() throws CoreException {
/*
* Injection point: in class MessageManager
14 years, 9 months
JBoss Tools SVN: r32337 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-23 20:25:28 -0400 (Thu, 23 Jun 2011)
New Revision: 32337
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
Log:
JBIDE-8695
https://issues.jboss.org/browse/JBIDE-8695
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java 2011-06-24 00:24:52 UTC (rev 32336)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamConfigurationBlockDescriptionProvider.java 2011-06-24 00:25:28 UTC (rev 32337)
@@ -27,8 +27,10 @@
private static SectionDescription SECTION_SOLDER = new SectionDescription(
CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_section_solder,
new String[][]{
+ {CDISeamSolderPreferences.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_wrongGenericConfigurationAnnotationReference_label},
{CDISeamSolderPreferences.AMBIGUOUS_GENERIC_CONFIGURATION_POINT, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_ambiguousGenericConfigurationPoint_label},
{CDISeamSolderPreferences.WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_wrongTypeOfGenericConfigurationPoint_label},
+ {CDISeamSolderPreferences.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN, CDISeamPreferencesMessages.CDIValidatorConfigurationBlock_pb_genericConfigurationTypeIsGenericBean_label},
},
CDISeamSolderCorePlugin.PLUGIN_ID
);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java 2011-06-24 00:24:52 UTC (rev 32336)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.java 2011-06-24 00:25:28 UTC (rev 32337)
@@ -17,6 +17,8 @@
public static String CDIValidatorConfigurationBlock_section_solder;
public static String CDIValidatorConfigurationBlock_pb_ambiguousGenericConfigurationPoint_label;
public static String CDIValidatorConfigurationBlock_pb_wrongTypeOfGenericConfigurationPoint_label;
+ public static String CDIValidatorConfigurationBlock_pb_wrongGenericConfigurationAnnotationReference_label;
+ public static String CDIValidatorConfigurationBlock_pb_genericConfigurationTypeIsGenericBean_label;
public static String CDI_SEAM_VALIDATOR_PREFERENCE_PAGE_TITLE;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties 2011-06-24 00:24:52 UTC (rev 32336)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.ui/src/org/jboss/tools/cdi/seam/config/ui/preferences/CDISeamPreferencesMessages.properties 2011-06-24 00:25:28 UTC (rev 32337)
@@ -11,4 +11,6 @@
##Section Seam Solder
CDIValidatorConfigurationBlock_section_solder=Seam Solder
CDIValidatorConfigurationBlock_pb_ambiguousGenericConfigurationPoint_label=Duplicate Generic Configuration Point:
-CDIValidatorConfigurationBlock_pb_wrongTypeOfGenericConfigurationPoint_label=Wrong Type of Generic Configuration Point:
\ No newline at end of file
+CDIValidatorConfigurationBlock_pb_wrongTypeOfGenericConfigurationPoint_label=Wrong Type of Generic Configuration Point:
+CDIValidatorConfigurationBlock_pb_wrongGenericConfigurationAnnotationReference_label=Wrong Generic Configuration Annotation Reference:
+CDIValidatorConfigurationBlock_pb_genericConfigurationTypeIsGenericBean_label=Generic Configuration Type is a Generic Bean:
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r32336 - in trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core: generic and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-23 20:24:52 -0400 (Thu, 23 Jun 2011)
New Revision: 32336
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferences.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/SeamSolderValidationMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties
Log:
JBIDE-8695
https://issues.jboss.org/browse/JBIDE-8695
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferences.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferences.java 2011-06-24 00:20:46 UTC (rev 32335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderPreferences.java 2011-06-24 00:24:52 UTC (rev 32336)
@@ -27,6 +27,8 @@
public static final String AMBIGUOUS_GENERIC_CONFIGURATION_POINT = INSTANCE.createSeverityOption("ambiguousGenericConfigurationPoint");
public static final String WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT = INSTANCE.createSeverityOption("wrongTypeOfGenericConfigurationPoint");
+ public static final String WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE = INSTANCE.createSeverityOption("wrongGenericConfigurationAnnotationReference");
+ public static final String GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN = INSTANCE.createSeverityOption("genericConfigurationTypeIsGenericBean");
public static CDISeamSolderPreferences getInstance() {
return INSTANCE;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-06-24 00:20:46 UTC (rev 32335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/CDISeamSolderGenericBeanExtension.java 2011-06-24 00:24:52 UTC (rev 32336)
@@ -11,6 +11,7 @@
package org.jboss.tools.cdi.seam.solder.core.generic;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -189,7 +190,9 @@
@Override
public void processAnnotatedType(TypeDefinition typeDefinition, IRootDefinitionContext context) {
- if(typeDefinition.isAnnotationPresent(GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME)) {
+ if(typeDefinition.isAnnotationPresent(VETO_ANNOTATION_TYPE_NAME)) {
+ //ignore
+ } else if(typeDefinition.isAnnotationPresent(GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME)) {
typeDefinition.veto();
IAnnotationDeclaration d = typeDefinition.getAnnotation(GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME);
Object o = d.getMemberValue(null);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-06-24 00:20:46 UTC (rev 32335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanDefinitionContext.java 2011-06-24 00:24:52 UTC (rev 32336)
@@ -10,13 +10,16 @@
******************************************************************************/
package org.jboss.tools.cdi.seam.solder.core.generic;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IType;
import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
/**
@@ -40,6 +43,15 @@
@Override
protected void doApplyWorkingCopy() {
genericConfiguartions = ((GenericBeanDefinitionContext)workingCopy).genericConfiguartions;
+
+ for (GenericConfiguration c: genericConfiguartions.values()) {
+ if(c.getGenericTypeDefinition() == null) {
+ for (TypeDefinition d: c.getGenericBeans()) {
+ //Do last minute correction. This is a wrong generic bean, let it be a usual bean to be validated.
+ d.unveto();
+ }
+ }
+ }
//
}
@@ -70,7 +82,17 @@
if(annotation.isAnnotationPresent(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME)) {
annotation.setExtendedKind(CDISeamSolderConstants.GENERIC_ANNOTATION_KIND);
String qn = annotation.getType().getFullyQualifiedName();
- getGenericConfiguration(qn).setGenericTypeDefinition(annotation, this);
+ GenericConfiguration c = getGenericConfiguration(qn);
+ c.setGenericTypeDefinition(annotation, this);
+ if(!annotation.getType().isBinary()) {
+ IPath newPath = annotation.getType().getResource().getFullPath();
+ Set<IPath> ps = c.getInvolvedTypes();
+ for (IPath p: ps) {
+ getRootContext().addDependency(p, newPath);
+ getRootContext().addDependency(newPath, p);
+ }
+ ps.add(newPath);
+ }
}
}
@@ -90,4 +112,16 @@
}
return result;
}
+
+ public boolean isGenericBean(String typeName) {
+ for (GenericConfiguration c: genericConfiguartions.values()) {
+ Set<TypeDefinition> bs = c.getGenericBeans();
+ for (TypeDefinition d: bs) {
+ if(typeName.equals(d.getType().getFullyQualifiedName())) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-06-24 00:20:46 UTC (rev 32335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/generic/GenericBeanValidator.java 2011-06-24 00:24:52 UTC (rev 32336)
@@ -28,6 +28,7 @@
import org.jboss.tools.cdi.internal.core.impl.CDIProject;
import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition;
+import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition;
import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderCorePlugin;
@@ -57,6 +58,26 @@
}
public void validateConfiguration(IFile file, GenericConfiguration c, CDICoreValidator validator, CDICoreNature project, GenericBeanDefinitionContext context) throws CoreException {
+ IParametedType t = c.getConfigType();
+ AnnotationDefinition genericType = c.getGenericTypeDefinition();
+
+ if(genericType == null) {
+ String n = c.getGenericTypeName();
+ for (TypeDefinition d: c.getGenericBeans()) {
+ if(d.getResource() != null && d.getResource().equals(file)) {
+ IAnnotationDeclaration a = d.getAnnotation(CDISeamSolderConstants.GENERIC_CONFIGURATION_ANNOTATION_TYPE_NAME);
+ validator.addError(SeamSolderValidationMessages.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE,
+ CDISeamSolderPreferences.WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE, new String[]{n}, a, file);
+ }
+ }
+ } else if(file.equals(genericType.getResource())) {
+ if(t != null && context.isGenericBean(t.getType().getFullyQualifiedName())) {
+ IAnnotationDeclaration a = genericType.getAnnotation(CDISeamSolderConstants.GENERIC_TYPE_ANNOTATION_TYPE_NAME);
+ validator.addError(SeamSolderValidationMessages.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN,
+ CDISeamSolderPreferences.GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN, new String[0], a, file);
+ }
+ }
+
Map<AbstractMemberDefinition, List<IQualifierDeclaration>> bs = c.getGenericConfigurationPoints();
for (AbstractMemberDefinition d: bs.keySet()) {
if(d.getResource() != null && d.getResource().equals(file) && !d.getTypeDefinition().isVetoed()) {
@@ -79,7 +100,6 @@
/*
* Type of generic configuration point must be assignable to the configuration type.
*/
- IParametedType t = c.getConfigType();
IBean b = findGenericBean(file, (IMember)d.getMember(), project);
if(t == null || b == null || !CDIProject.containsType(b.getAllTypes(), t)) {
validator.addError(SeamSolderValidationMessages.WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT,
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/SeamSolderValidationMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/SeamSolderValidationMessages.java 2011-06-24 00:20:46 UTC (rev 32335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/SeamSolderValidationMessages.java 2011-06-24 00:24:52 UTC (rev 32336)
@@ -23,6 +23,8 @@
public static String AMBIGUOUS_GENERIC_CONFIGURATION_POINT;
public static String WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT;
+ public static String WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE;
+ public static String GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN;
static {
NLS.initializeMessages(BUNDLE_NAME, SeamSolderValidationMessages.class);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties 2011-06-24 00:20:46 UTC (rev 32335)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/validation/messages.properties 2011-06-24 00:24:52 UTC (rev 32336)
@@ -1,2 +1,4 @@
AMBIGUOUS_GENERIC_CONFIGURATION_POINT=Duplicate generic configuration point.
WRONG_TYPE_OF_GENERIC_CONFIGURATION_POINT=Type of generic configuration point must be assignable to the generic configuration type.
+WRONG_GENERIC_CONFIGURATION_ANNOTATION_REFERENCE=Annotation type mismatch: {0} is not a generic configuration annotation.
+GENERIC_CONFIGURATION_TYPE_IS_A_GENERIC_BEAN=Generic configuration types may not be generic beans.
14 years, 9 months