JBoss Tools SVN: r32251 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-21 08:26:01 -0400 (Tue, 21 Jun 2011)
New Revision: 32251
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/util/ServerConverter.java
Log:
[JBIDE-9215] extracted checked get for jboss server to ServerConverter
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-21 12:11:17 UTC (rev 32250)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-21 12:26:01 UTC (rev 32251)
@@ -69,12 +69,7 @@
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy, IServer server) throws CoreException {
- JBossServer jbs = ServerConverter.findJBossServer(server.getId());
- if (jbs == null) {
- throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- NLS.bind(Messages.CannotSetUpImproperServer, server.getName())));
- }
-
+ JBossServer jbs = ServerConverter.checkedGetJBossServer(server);
if (!workingCopy.getAttributes().containsKey(DEFAULTS_SET)) {
forceDefaultsSet(workingCopy, jbs);
}
@@ -104,9 +99,9 @@
throws CoreException {
String serverHome = ServerUtil.getServerHome(jbs);
IJBossServerRuntime runtime = RuntimeUtils.getJBossServerRuntime(jbs.getServer());
-
+
updateVMPath(runtime, wc);
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY,
serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN);
updateArguments(wc, jbs, runtime);
updateVMArgs(wc, runtime);
@@ -210,7 +205,6 @@
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
NLS.bind(Messages.ServerRuntimeNotFound, jbs.getServer().getName())));
-
updateVMPath(jbrt, wc);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, getDefaultArgs(jbs));
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, jbrt.getDefaultRunVMArgs());
@@ -234,7 +228,7 @@
return jbrt;
}
-
+
private List<String> getClasspath(JBossServer jbs) throws CoreException {
IJBossServerRuntime jbrt = RuntimeUtils.getJBossServerRuntime(jbs.getServer());
ArrayList<IRuntimeClasspathEntry> classpath = new ArrayList<IRuntimeClasspathEntry>();
@@ -289,7 +283,7 @@
} catch (CoreException ce) {
// ignore
}
-
+
try {
return super.computeUnresolvedClasspath(config);
} catch (CoreException ce) {
@@ -314,15 +308,16 @@
JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if (!jbsBehavior.canStart(mode).isOK())
throw new CoreException(jbsBehavior.canStart(mode));
- String ignore = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS, (String)null);
+ String ignore = jbsBehavior.getServer().getAttribute(IJBossToolingConstants.IGNORE_LAUNCH_COMMANDS,
+ (String) null);
Boolean ignoreB = ignore == null ? new Boolean(false) : new Boolean(ignore);
- if( ignoreB.booleanValue()) {
+ if (ignoreB.booleanValue()) {
jbsBehavior.setServerStarting();
jbsBehavior.setServerStarted();
return false;
}
boolean started = WebPortPoller.onePing(jbsBehavior.getServer());
- if( started ) {
+ if (started) {
jbsBehavior.setServerStarting();
jbsBehavior.setServerStarted();
return false;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-21 12:11:17 UTC (rev 32250)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2011-06-21 12:26:01 UTC (rev 32251)
@@ -7,17 +7,22 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.util;
import java.util.ArrayList;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerAttributes;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
+import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
@@ -25,7 +30,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ServerBehavior;
/**
- *
+ *
* @author rob.stryker(a)jboss.com
* @author adietish(a)redhat.com
*/
@@ -42,49 +47,63 @@
}
public static JBossServer getJBossServer(IServer server) {
- JBossServer jbServer = (JBossServer)server.getAdapter(JBossServer.class);
+ JBossServer jbServer = (JBossServer) server.getAdapter(JBossServer.class);
if (jbServer == null) {
jbServer = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor());
}
return jbServer;
}
+
+ public static JBossServer checkedGetJBossServer(IServer server) throws CoreException {
+ JBossServer jBossServer = getJBossServer(server);
+ if (jBossServer == null) {
+ throw new CoreException(
+ new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ NLS.bind(Messages.CannotSetUpImproperServer, server.getName())));
+ }
+ return jBossServer;
+ }
+
public static JBossServer getJBossServer(IServerWorkingCopy server) {
- JBossServer jbServer = (JBossServer)server.getAdapter(JBossServer.class);
+ JBossServer jbServer = (JBossServer) server.getAdapter(JBossServer.class);
if (jbServer == null) {
jbServer = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor());
}
return jbServer;
}
-
+
public static IDeployableServer getDeployableServer(IServer server) {
- IDeployableServer dep = (IDeployableServer)server.getAdapter(IDeployableServer.class);
+ IDeployableServer dep = (IDeployableServer) server.getAdapter(IDeployableServer.class);
if (dep == null) {
dep = (IDeployableServer) server.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
}
return dep;
}
-
+
public static DeployableServerBehavior getDeployableServerBehavior(IServer server) {
- if( server == null ) return null;
- return (DeployableServerBehavior)server.loadAdapter(
+ if (server == null)
+ return null;
+ return (DeployableServerBehavior) server.loadAdapter(
DeployableServerBehavior.class, new NullProgressMonitor());
}
public static JBoss7ServerBehavior getJBoss7ServerBehavior(IServer server) {
- if( server == null ) return null;
- return (JBoss7ServerBehavior)server.loadAdapter(
+ if (server == null)
+ return null;
+ return (JBoss7ServerBehavior) server.loadAdapter(
JBoss7ServerBehavior.class, new NullProgressMonitor());
}
/**
* Return all JBossServer instances from the ServerCore
+ *
* @return
*/
public static JBossServer[] getAllJBossServers() {
ArrayList<JBossServer> servers = new ArrayList<JBossServer>();
IServer[] iservers = ServerCore.getServers();
- for( int i = 0; i < iservers.length; i++ ) {
- if( getJBossServer(iservers[i]) != null ) {
+ for (int i = 0; i < iservers.length; i++) {
+ if (getJBossServer(iservers[i]) != null) {
servers.add(getJBossServer(iservers[i]));
}
}
@@ -92,12 +111,12 @@
servers.toArray(ret);
return ret;
}
-
+
public static IServer[] getJBossServersAsIServers() {
ArrayList<IServer> servers = new ArrayList<IServer>();
IServer[] iservers = ServerCore.getServers();
- for( int i = 0; i < iservers.length; i++ ) {
- if( getJBossServer(iservers[i]) != null ) {
+ for (int i = 0; i < iservers.length; i++) {
+ if (getJBossServer(iservers[i]) != null) {
servers.add(iservers[i]);
}
}
@@ -109,8 +128,8 @@
public static IDeployableServer[] getAllDeployableServers() {
ArrayList<IDeployableServer> servers = new ArrayList<IDeployableServer>();
IServer[] iservers = ServerCore.getServers();
- for( int i = 0; i < iservers.length; i++ ) {
- if( getDeployableServer(iservers[i]) != null ) {
+ for (int i = 0; i < iservers.length; i++) {
+ if (getDeployableServer(iservers[i]) != null) {
servers.add(getDeployableServer(iservers[i]));
}
}
@@ -118,11 +137,12 @@
servers.toArray(ret);
return ret;
}
+
public static IServer[] getDeployableServersAsIServers() {
ArrayList<IServer> servers = new ArrayList<IServer>();
IServer[] iservers = ServerCore.getServers();
- for( int i = 0; i < iservers.length; i++ ) {
- if( getDeployableServer(iservers[i]) != null ) {
+ for (int i = 0; i < iservers.length; i++) {
+ if (getDeployableServer(iservers[i]) != null) {
servers.add(iservers[i]);
}
}
@@ -130,12 +150,12 @@
servers.toArray(ret);
return ret;
}
-
+
@Deprecated
public static IJBossServerRuntime getJBossRuntime(IServer server) throws CoreException {
return RuntimeUtils.getJBossServerRuntime(server);
}
-
+
@Deprecated
public static IJBossServerRuntime getJBossRuntime(IServerAttributes server) {
return RuntimeUtils.checkedGetJBossServerRuntime(server);
14 years, 9 months
JBoss Tools SVN: r32250 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-06-21 08:11:17 -0400 (Tue, 21 Jun 2011)
New Revision: 32250
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
Log:
[JBIDE-9215] corrected API
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java 2011-06-21 08:57:30 UTC (rev 32249)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7RuntimeLaunchConfigurator.java 2011-06-21 12:11:17 UTC (rev 32250)
@@ -26,6 +26,7 @@
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.LaunchConfigUtils;
+import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
public class JBoss7RuntimeLaunchConfigurator {
@@ -36,8 +37,10 @@
this.launchConfig = launchConfig;
}
- public void apply(IServer server, IRuntime runtime, IJBossServerRuntime jbossRuntime) throws CoreException {
+ public void apply(IServer server) throws CoreException {
if (!areDefaultsSet()) {
+ IRuntime runtime = server.getRuntime();
+ IJBossServerRuntime jbossRuntime = RuntimeUtils.getJBossServerRuntime(server);
setVmContainer(jbossRuntime)
.setClassPath(server, jbossRuntime)
.setDefaultArguments(jbossRuntime)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-21 08:57:30 UTC (rev 32249)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-06-21 12:11:17 UTC (rev 32250)
@@ -36,12 +36,9 @@
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBoss7ManagerService;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class JBoss7ServerBehavior extends JBossServerBehavior {
@@ -76,8 +73,7 @@
throws CoreException {
IServer server = getServer();
IRuntime runtime = server.getRuntime();
- IJBossServerRuntime serverRuntime = (IJBossServerRuntime) runtime.loadAdapter(IJBossServerRuntime.class, null);
- new JBoss7RuntimeLaunchConfigurator(launchConfig).apply(server, runtime, serverRuntime);
+ new JBoss7RuntimeLaunchConfigurator(launchConfig).apply(server);
}
public void setProcess(IProcess process) {
14 years, 9 months
JBoss Tools SVN: r32249 - in branches/jbosstools-3.2.x/smooks: plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2011-06-21 04:57:30 -0400 (Tue, 21 Jun 2011)
New Revision: 32249
Modified:
branches/jbosstools-3.2.x/smooks/
branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java
branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java
branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java
branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties
Log:
JBIDE-9197: No user error message for UnsupportedClassVersionError
https://issues.jboss.org/browse/JBIDE-9197
Property changes on: branches/jbosstools-3.2.x/smooks
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/smooks:29129-29130,29167-29168,32217-32218
+ /trunk/smooks:29129-29130,29167-29168,32217-32218,32227-32228
Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java
===================================================================
--- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java 2011-06-21 08:14:15 UTC (rev 32248)
+++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/ProjectClassLoader.java 2011-06-21 08:57:30 UTC (rev 32249)
@@ -77,17 +77,18 @@
.getLocation();
for (int i = 0; i < roots.length; i++) {
try {
- if (roots[i].isArchive()) {
+ IPackageFragmentRoot iPackageFragmentRoot = roots[i];
+ if (iPackageFragmentRoot.isArchive()) {
File f = new File(FileLocator.resolve(
- installPath.append(roots[i].getPath()).toFile()
+ installPath.append(iPackageFragmentRoot.getPath()).toFile()
.toURL()).getFile());
if (!f.exists()) {
f = new File(FileLocator.resolve(
- roots[i].getPath().makeAbsolute().toFile()
+ iPackageFragmentRoot.getPath().makeAbsolute().toFile()
.toURL()).getFile());
}
if (!f.exists()) {
- IJavaElement javaElement = roots[i].getPrimaryElement();
+ IJavaElement javaElement = iPackageFragmentRoot.getPrimaryElement();
String jarName = javaElement.getElementName();
IResource jarResource = project.getProject().findMember(jarName);
@@ -98,14 +99,14 @@
list.add(f.toURL());
} else {
- IPath path = roots[i].getJavaProject().getOutputLocation();
+ IPath path = iPackageFragmentRoot.getJavaProject().getOutputLocation();
if (path.segmentCount() > 1) {
IWorkspaceRoot root = ResourcesPlugin.getWorkspace()
.getRoot();
path = root.getFolder(path).getLocation();
list.add(path.toFile().toURL());
} else {
- path = roots[i].getJavaProject().getProject()
+ path = iPackageFragmentRoot.getJavaProject().getProject()
.getLocation();
list.add(path.toFile().toURL());
}
Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java
===================================================================
--- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2011-06-21 08:14:15 UTC (rev 32248)
+++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/JavaBeanCreationWizardPage.java 2011-06-21 08:57:30 UTC (rev 32249)
@@ -439,6 +439,8 @@
}
protected void refreshJavaBeanModel() {
+ String error = null;
+
if (beanClass == null || "".equals(beanClass.trim())) { //$NON-NLS-1$
viewer.setInput(""); //$NON-NLS-1$
} else {
@@ -471,8 +473,13 @@
viewer.setInput(""); //$NON-NLS-1$
} catch (ClassNotFoundException e1) {
viewer.setInput(""); //$NON-NLS-1$
+ error = Messages.JavaBeanCreationWizardPage_ClassNotFoundException;
+ } catch (UnsupportedClassVersionError classVersion) {
+ error = Messages.JavaBeanCreationWizardPage_UnsupportedClassVersionError;
}
}
+ this.setErrorMessage(error);
+ this.setPageComplete(error == null);
}
private void createBeanClassControls(Composite mainComposite) {
Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java
===================================================================
--- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2011-06-21 08:14:15 UTC (rev 32248)
+++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/Messages.java 2011-06-21 08:57:30 UTC (rev 32249)
@@ -8,6 +8,8 @@
public static String JavaBeanCreationWizardPage_27;
public static String JavaBeanCreationWizardPage_ArrayButtonText;
public static String JavaBeanCreationWizardPage_BeanClassEmptyErrorMessage;
+ public static String JavaBeanCreationWizardPage_UnsupportedClassVersionError;
+ public static String JavaBeanCreationWizardPage_ClassNotFoundException;
public static String JavaBeanCreationWizardPage_BeanClassLabel;
public static String JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage1;
public static String JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage2;
Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties
===================================================================
--- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2011-06-21 08:14:15 UTC (rev 32248)
+++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/wizards/messages.properties 2011-06-21 08:57:30 UTC (rev 32249)
@@ -2,6 +2,8 @@
JavaBeanCreationWizardPage_27="
JavaBeanCreationWizardPage_ArrayButtonText=Array
JavaBeanCreationWizardPage_BeanClassEmptyErrorMessage=Java Class must be configured
+JavaBeanCreationWizardPage_UnsupportedClassVersionError=Class compile version not supported by Java Environment
+JavaBeanCreationWizardPage_ClassNotFoundException=Class not found on project Classpath
JavaBeanCreationWizardPage_BeanClassLabel=Java Class :
JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage1=Bean ID '
JavaBeanCreationWizardPage_BeanIDDuplicateErrorMessage2=' is duplicate
14 years, 9 months
JBoss Tools SVN: r32248 - in branches/jbosstools-3.2.x/smooks: plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tfennelly
Date: 2011-06-21 04:14:15 -0400 (Tue, 21 Jun 2011)
New Revision: 32248
Modified:
branches/jbosstools-3.2.x/smooks/
branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksSAXXMLHandler.java
branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
Log:
JBIDE-8917: NPE when validating transform_XML2XML_date_manipulation project example
https://issues.jboss.org/browse/JBIDE-8917
Property changes on: branches/jbosstools-3.2.x/smooks
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/smooks:29129-29130,29167-29168
+ /trunk/smooks:29129-29130,29167-29168,32217-32218
Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksSAXXMLHandler.java
===================================================================
--- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksSAXXMLHandler.java 2011-06-21 07:53:56 UTC (rev 32247)
+++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/core/SmooksSAXXMLHandler.java 2011-06-21 08:14:15 UTC (rev 32248)
@@ -129,7 +129,7 @@
@Override
public void comment(char[] ch, int start, int length) {
String comment = new String(ch, start, length);
- Object obj = objects.get(objects.size() - 1);
+ Object obj = getObject(objects.size() - 1);
if (mixedTargets.peek() != null) {
if (text != null) {
@@ -158,6 +158,24 @@
}
+ /**
+ * @return
+ */
+ private Object getObject(int index) {
+ if(index < 0 || index >= objects.size()) {
+ return null;
+ }
+
+ // Need to perform the following check on the underlying objects.data[], before calling objects.get(),
+ // otherwise BasicEList throws a wobbler...
+ Object[] data = objects.data();
+ if(data == null || data[index] == null) {
+ return null;
+ }
+
+ return objects.get(index);
+ }
+
/*
* (non-Javadoc)
*
Modified: branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
===================================================================
--- branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2011-06-21 07:53:56 UTC (rev 32247)
+++ branches/jbosstools-3.2.x/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2011-06-21 08:14:15 UTC (rev 32248)
@@ -671,7 +671,7 @@
try {
smooksResource.load(Collections.emptyMap());
smooksModel = smooksResource.getContents().get(0);
- } catch (IOException e) {
+ } catch (Exception e) {
initSmooksModelException = e;
}
} else {
14 years, 9 months
JBoss Tools SVN: r32247 - 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-21 03:53:56 -0400 (Tue, 21 Jun 2011)
New Revision: 32247
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
Log:
[JBIDE-9200] deprecated unnused method
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-06-21 03:56:00 UTC (rev 32246)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2011-06-21 07:53:56 UTC (rev 32247)
@@ -80,6 +80,10 @@
}
}
+ /**
+ * looks like nobody uses this method. deprecating it.
+ */
+ @Deprecated
public String[] getJavaLibraryPath(ILaunchConfiguration configuration) throws CoreException {
IServer server = ServerUtil.getServer(configuration);
JBossServer jbs = ServerConverter.findJBossServer(server.getId());
14 years, 9 months
JBoss Tools SVN: r32246 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-06-20 23:56:00 -0400 (Mon, 20 Jun 2011)
New Revision: 32246
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewSessionBeanWizardPage.java
Log:
JBIDE-9129 to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewSessionBeanWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewSessionBeanWizardPage.java 2011-06-21 01:59:20 UTC (rev 32245)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewSessionBeanWizardPage.java 2011-06-21 03:56:00 UTC (rev 32246)
@@ -177,9 +177,7 @@
setControl(composite);
IJavaElement element = getInitialJavaElement(selection);
- if (element.getElementType() == IJavaElement.PACKAGE_FRAGMENT)
-// || element.getElementType() == IJavaElement.PACKAGE_FRAGMENT_ROOT)
- {
+ if (element != null && element.getElementType() == IJavaElement.PACKAGE_FRAGMENT) {
beanPackageName.setText(element.getElementName());
remoteInterfacePackageText.setText(element.getElementName());
}
14 years, 9 months
JBoss Tools SVN: r32245 - trunk/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-06-20 21:59:20 -0400 (Mon, 20 Jun 2011)
New Revision: 32245
Modified:
trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
Log:
added known issue has brought to my attention by brian f
Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml
===================================================================
--- trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2011-06-21 01:29:47 UTC (rev 32244)
+++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 2011-06-21 01:59:20 UTC (rev 32245)
@@ -12,8 +12,15 @@
<itemizedlist>
<listitem>
<para>
- <ulink url="http://jira.jboss.com/jira/browse/JBIDE-0000">JBIDE-0000</ulink>:
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1643">JBDS-1643</ulink> and <ulink url="http://jira.jboss.com/jira/browse/SOA-3051">SOA-3051</ulink>: JBoss Developer Studio 4.1 assumes the use of Drools 5.0 or above for project creation. If using an earlier version of Drools or JBoss Rules, code compatibility must be set to your version of Drools or JBoss Rules in the last page of the project creation wizard.
</para>
+ <para>
+ If you need to set code compatibility to an older version of Drools or JBoss Rules, you may notice multiple warnings when creating a project relating to the new Drools 5 API. These warnings will not affect your project and can be turned off by navigating to <menuchoice>
+ <guimenuitem>Window</guimenuitem>
+ <guimenuitem>Preferences</guimenuitem>
+ <guimenuitem>Drools</guimenuitem>
+ </menuchoice> and setting the <guilabel>Internal Drools classes are</guilabel> drop-down box to <guilabel>Accessible</guilabel>.
+ </para>
</listitem>
</itemizedlist>
</para>
14 years, 9 months
JBoss Tools SVN: r32244 - trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 21:29:47 -0400 (Mon, 20 Jun 2011)
New Revision: 32244
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
Log:
JBIDE-9207
https://issues.jboss.org/browse/JBIDE-9207
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-06-21 00:45:45 UTC (rev 32243)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2011-06-21 01:29:47 UTC (rev 32244)
@@ -38,7 +38,12 @@
org.jboss.tools.jst.jsp,
org.jboss.tools.common.model.test,
org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.jsf.core
+ org.eclipse.jst.jsf.core,
+ org.eclipse.jst.j2ee,
+ org.eclipse.wst.web,
+ org.eclipse.jst.jee.ejb,
+ org.eclipse.jst.jee.web,
+ org.eclipse.jst.jsf.common
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
14 years, 9 months
JBoss Tools SVN: r32243 - trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 20:45:45 -0400 (Mon, 20 Jun 2011)
New Revision: 32243
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
Log:
JBIDE-9193
https://issues.jboss.org/browse/JBIDE-9193
Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-06-21 00:45:29 UTC (rev 32242)
+++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/SeamDefinitionsTest.java 2011-06-21 00:45:45 UTC (rev 32243)
@@ -52,6 +52,17 @@
public class SeamDefinitionsTest extends SeamConfigTest {
public SeamDefinitionsTest() {}
+ public void testLineNumber() {
+ ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
+ ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext();
+ SeamBeansDefinition d = getBeansDefinition(context, "src/META-INF/beans.xml");
+
+ Set<SeamBeanDefinition> ds = findBeanDefinitionByTagName(d, "test602:Report");
+ assertEquals(1, ds.size());
+ SeamBeanDefinition report = ds.iterator().next();
+ assertEquals(20, report.getElement().getLocation().getLine());
+ }
+
public void testReplacingAndModifyingBeans() throws CoreException, IOException {
ICDIProject cdi = CDICorePlugin.getCDIProject(project, true);
ConfigDefinitionContext context = (ConfigDefinitionContext)getConfigExtension(cdi).getContext();
14 years, 9 months
JBoss Tools SVN: r32242 - trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-06-20 20:45:29 -0400 (Mon, 20 Jun 2011)
New Revision: 32242
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java
Log:
JBIDE-9193
https://issues.jboss.org/browse/JBIDE-9193
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java 2011-06-21 00:32:01 UTC (rev 32241)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/xml/SAXParser.java 2011-06-21 00:45:29 UTC (rev 32242)
@@ -192,10 +192,16 @@
String message = e.getMessage();
errors.add(message);
}
-
+
+ /**
+ * Returns line number in text for offset 'start'; the first line has number 1.
+ *
+ * @param start
+ * @return
+ */
private int getLine(int start) {
try {
- return document.getLineOfOffset(start);
+ return document.getLineOfOffset(start) + 1;
} catch (BadLocationException e) {
CommonPlugin.getPluginLog().logError(e);
return -1;
14 years, 9 months