JBoss Tools SVN: r12480 - branches.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-08 19:51:01 -0500 (Mon, 08 Dec 2008)
New Revision: 12480
Added:
branches/jbosstools-3.0.0.CR1/
Log:
17 years, 4 months
JBoss Tools SVN: r12479 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-08 17:43:41 -0500 (Mon, 08 Dec 2008)
New Revision: 12479
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
Log:
JBIDE-3368
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-12-08 21:02:14 UTC (rev 12478)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2008-12-08 22:43:41 UTC (rev 12479)
@@ -39,6 +39,7 @@
import org.eclipse.wst.server.core.model.ServerDelegate;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.ModuleUtil;
@@ -109,13 +110,41 @@
public String getDeployFolder() {
+ String type = getDeployLocationType();
+ if( type.equals(DEPLOY_CUSTOM))
+ return makeGlobal(getRuntime(), new Path(getAttribute(DEPLOY_DIRECTORY, ""))).toString();
+ if( type.equals(DEPLOY_METADATA)) {
+ return IJBossServerConstants.PLUGIN_LOCATION.append(getServer().getId().replace(' ', '_')).
+ append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
+ } else if( type.equals(DEPLOY_SERVER)){
+ IJBossServerRuntime jbsrt = getRuntime();
+ String config = jbsrt.getJBossConfiguration();
+ return new Path(IJBossServerConstants.SERVER)
+ .append(config)
+ .append(IJBossServerConstants.DEPLOY).makeRelative().toString();
+ }
return makeGlobal(getRuntime(), new Path(getAttribute(DEPLOY_DIRECTORY, ""))).toString();
}
+
public void setDeployFolder(String folder) {
setAttribute(DEPLOY_DIRECTORY, makeRelative(getRuntime(), new Path(folder)).toString());
}
public String getTempDeployFolder() {
+ String type = getDeployLocationType();
+ if( type.equals(DEPLOY_CUSTOM))
+ return makeGlobal(getRuntime(), new Path(getAttribute(TEMP_DEPLOY_DIRECTORY, ""))).toString();
+ if( type.equals(DEPLOY_METADATA)) {
+ return IJBossServerConstants.PLUGIN_LOCATION.append(getServer().getId().replace(' ', '_')).
+ append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
+ } else if( type.equals(DEPLOY_SERVER)){
+ IJBossServerRuntime jbsrt = getRuntime();
+ String config = jbsrt.getJBossConfiguration();
+ return new Path(IJBossServerConstants.SERVER)
+ .append(config)
+ .append(IJBossServerConstants.TMP)
+ .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString();
+ }
return makeGlobal(getRuntime(), new Path(getAttribute(TEMP_DEPLOY_DIRECTORY, ""))).toString();
}
public void setTempDeployFolder(String folder) {
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2008-12-08 22:43:41 UTC (rev 12479)
@@ -0,0 +1,5 @@
+package org.jboss.ide.eclipse.as.core.util;
+
+public class ServerUtil {
+
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-08 21:02:14 UTC (rev 12478)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-08 22:43:41 UTC (rev 12479)
@@ -320,12 +320,12 @@
private Button newSelection, oldSelection;
private String oldDir, newDir;
private String oldTemp, newTemp;
- private String name;
+ private String id;
public RadioClickedCommand(Button clicked, Button previous) {
super(DeploySection.this.server, Messages.EditorSetRadioClicked);
newSelection = clicked;
oldSelection = previous;
- name = DeploySection.this.server.getName();
+ id = DeploySection.this.server.getId();
}
public void execute() {
boolean custom = newSelection == customRadio;
@@ -340,9 +340,9 @@
if( newSelection == metadataRadio ) {
- newDir = IJBossServerConstants.PLUGIN_LOCATION.append(name).
+ newDir = IJBossServerConstants.PLUGIN_LOCATION.append(id.replace(' ', '_')).
append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
- newTemp = IJBossServerConstants.PLUGIN_LOCATION.append(name).
+ newTemp = IJBossServerConstants.PLUGIN_LOCATION.append(id.replace(' ', '_')).
append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute().toString();
type = IDeployableServer.DEPLOY_METADATA;
new File(newDir).mkdirs();
17 years, 4 months
JBoss Tools SVN: r12478 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: extensions/descriptors and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-08 16:02:14 -0500 (Mon, 08 Dec 2008)
New Revision: 12478
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
Log:
Renamed the startup listener to be more generic and do more initializations
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2008-12-08 20:52:25 UTC (rev 12477)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2008-12-08 21:02:14 UTC (rev 12478)
@@ -31,7 +31,7 @@
import org.eclipse.core.runtime.Plugin;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerStartupListener;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerListener;
import org.osgi.framework.BundleContext;
/**
@@ -73,9 +73,9 @@
super.start(context);
// Start the array of models that need to be started
- XPathModel.getDefault();
UnitedServerListenerManager.getDefault();
- UnitedServerListenerManager.getDefault().addListener(ServerStartupListener.getDefault());
+ UnitedServerListenerManager.getDefault().addListener(XPathModel.getDefault());
+ UnitedServerListenerManager.getDefault().addListener(ServerListener.getDefault());
}
/**
@@ -83,7 +83,7 @@
*/
public void stop(BundleContext context) throws Exception {
super.stop(context);
- UnitedServerListenerManager.getDefault().removeListener(ServerStartupListener.getDefault());
+ UnitedServerListenerManager.getDefault().removeListener(ServerListener.getDefault());
}
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2008-12-08 20:52:25 UTC (rev 12477)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2008-12-08 21:02:14 UTC (rev 12478)
@@ -34,15 +34,13 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerLifecycleListener;
-import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
@@ -52,7 +50,7 @@
* @author rob.stryker(a)redhat.com
*
*/
-public class XPathModel {
+public class XPathModel extends UnitedServerListener {
public static final String EMPTY_STRING = "org.jboss.ide.eclipse.as.core.model.descriptor.EmptyString";
public static final String PORTS_CATEGORY_NAME = "Ports";
@@ -74,45 +72,37 @@
}
protected HashMap<String, ArrayList<XPathCategory>> serverToCategories;
-
- /* Constructor. Adds lifecycle listener to know when there's a new server and
- * properly add the default XPaths to that server object.
- */
+
public XPathModel() {
serverToCategories = new HashMap<String, ArrayList<XPathCategory>>();
- ServerCore.addServerLifecycleListener(new IServerLifecycleListener() {
- public void serverAdded(IServer server) {
- final ServerAttributeHelper helper = new ServerAttributeHelper(server, server.createWorkingCopy());
- if( !helper.getAttribute(DEFAULTS_SET, false)) {
- final IServer server2 = server;
- new Job("Add Server XPath Details") {
- protected IStatus run(IProgressMonitor monitor) {
-
- if(server2==null || server2.getRuntime()==null) {
- return Status.OK_STATUS; // server has no runtime so we can't set this up.
- }
-
- LocalJBossServerRuntime ajbsr = (LocalJBossServerRuntime)
- server2.getRuntime().loadAdapter(LocalJBossServerRuntime.class, null);
- if(ajbsr != null ) {
- IPath loc = server2.getRuntime().getLocation();
- IPath configFolder = loc.append("server").append(ajbsr.getJBossConfiguration());
- loadDefaults(server2, configFolder.toOSString());
- helper.setAttribute(DEFAULTS_SET, true);
- helper.save();
- save(server2);
- }
- return Status.OK_STATUS;
- }
-
- }.schedule();
+ }
+
+ public void serverAdded(IServer server) {
+ final ServerAttributeHelper helper = new ServerAttributeHelper(server, server.createWorkingCopy());
+ if( !helper.getAttribute(DEFAULTS_SET, false)) {
+ final IServer server2 = server;
+ new Job("Add Server XPath Details") {
+ protected IStatus run(IProgressMonitor monitor) {
+
+ if(server2==null || server2.getRuntime()==null) {
+ return Status.OK_STATUS; // server has no runtime so we can't set this up.
+ }
+
+ LocalJBossServerRuntime ajbsr = (LocalJBossServerRuntime)
+ server2.getRuntime().loadAdapter(LocalJBossServerRuntime.class, null);
+ if(ajbsr != null ) {
+ IPath loc = server2.getRuntime().getLocation();
+ IPath configFolder = loc.append("server").append(ajbsr.getJBossConfiguration());
+ loadDefaults(server2, configFolder.toOSString());
+ helper.setAttribute(DEFAULTS_SET, true);
+ helper.save();
+ save(server2);
+ }
+ return Status.OK_STATUS;
}
- }
- public void serverChanged(IServer server) {
- }
- public void serverRemoved(IServer server) {
- }
- });
+
+ }.schedule();
+ }
}
public XPathQuery getQuery(IServer server, IPath path) {
@@ -241,7 +231,7 @@
return new XPathQuery[] {};
String[] queriesByName = list.split(DELIMITER);
List<String> queryAsStringValues;
- ArrayList<XPathQuery> returnList = new ArrayList();
+ ArrayList<XPathQuery> returnList = new ArrayList<XPathQuery>();
for( int i = 0; i < queriesByName.length; i++ ) {
queryAsStringValues = helper.getAttribute(QUERY + "." + queriesByName[i].replace(' ', '_'), (List)null);
if( queryAsStringValues != null ) {
@@ -272,8 +262,6 @@
public void loadDefaults(IServer server, String configFolder) {
ArrayList<XPathCategory> retVal = new ArrayList<XPathCategory>();
- LocalJBossServerRuntime ajbsr = (LocalJBossServerRuntime)
- server.getRuntime().loadAdapter(LocalJBossServerRuntime.class, new NullProgressMonitor());
Path p = (Path)rtToPortsFile.get(server.getRuntime().getRuntimeType().getVersion());
if( p == null ) return;
URL url = FileLocator.find(JBossServerCorePlugin.getDefault().getBundle(), p, null);
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java (from rev 12474, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java 2008-12-08 21:02:14 UTC (rev 12478)
@@ -0,0 +1,120 @@
+package org.jboss.ide.eclipse.as.core.server.internal;
+
+import java.io.File;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerEvent;
+import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
+import org.jboss.ide.eclipse.as.core.util.FileUtil;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.tools.jmx.core.IJMXRunnable;
+import org.jboss.tools.jmx.core.JMXException;
+
+public class ServerListener extends UnitedServerListener {
+ private static ServerListener instance;
+ public static ServerListener getDefault() {
+ if( instance == null )
+ instance = new ServerListener();
+ return instance;
+ }
+
+ public void serverAdded(IServer server) {
+ // create metadata area
+ IJBossServerConstants.PLUGIN_LOCATION.append(server.getId()).toFile().mkdirs();
+
+ // create temp deploy folder
+ IRuntime rt = server.getRuntime();
+ IJBossServerRuntime jbsrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+ String config = jbsrt.getJBossConfiguration();
+ String newTemp = new Path(IJBossServerConstants.SERVER).append(config)
+ .append(IJBossServerConstants.TMP)
+ .append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString();
+ new File(newTemp).mkdirs();
+
+ }
+
+ public void serverRemoved(IServer server) {
+ // delete metadata area
+ File f = IJBossServerConstants.PLUGIN_LOCATION.append(server.getId()).toFile();
+ FileUtil.safeDelete(f);
+
+ // delete temp folder
+ }
+
+ public void serverChanged(ServerEvent event) {
+ IServer server = event.getServer();
+ JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ if( jbs != null ) {
+ doDeploymentAddition(event);
+ }
+ }
+
+ protected void doDeploymentAddition(final ServerEvent event) {
+ int eventKind = event.getKind();
+ if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
+ // server change event
+ if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
+ if( event.getServer().getServerState() == IServer.STATE_STARTED ) {
+ if( shouldAddDeployLocation(event.getServer())) {
+ IJMXRunnable r = new IJMXRunnable() {
+ public void run(MBeanServerConnection connection) throws Exception {
+ ensureDeployLocationAdded(event.getServer(), connection);
+ }
+ };
+ try {
+ JBossServerConnectionProvider.run(event.getServer(), r);
+ } catch( JMXException jmxe ) {
+ // TODO log
+ }
+ }
+ }
+ }
+ }
+ }
+
+ protected boolean shouldAddDeployLocation(IServer server) {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ boolean shouldAdd = server.getServerState() == IServer.STATE_STARTED;
+ String type = ds.getDeployLocationType();
+ String deployFolder = ds.getDeployFolder();
+ if( type.equals(IDeployableServer.DEPLOY_SERVER))
+ shouldAdd = false;
+ else if( type.equals(IDeployableServer.DEPLOY_METADATA))
+ shouldAdd = true;
+ else if( type.equals( IDeployableServer.DEPLOY_CUSTOM )) {
+ if( !new File(deployFolder).exists())
+ shouldAdd = false;
+ else {
+ IRuntime rt = server.getRuntime();
+ IJBossServerRuntime jbsrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+ String config = jbsrt.getJBossConfiguration();
+ IPath deploy = new Path(IJBossServerConstants.SERVER)
+ .append(config)
+ .append(IJBossServerConstants.DEPLOY).makeRelative();
+ IPath deployGlobal = DeployableServer.makeGlobal(jbsrt, deploy);
+ if( new Path(deployFolder).equals(deployGlobal))
+ shouldAdd = false;
+ }
+ }
+ return shouldAdd;
+ }
+
+ protected void ensureDeployLocationAdded(IServer server, MBeanServerConnection connection) throws Exception {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ String deployFolder = ds.getDeployFolder();
+ String asURL = new File(deployFolder).toURL().toString();
+ ObjectName name = new ObjectName("jboss.deployment:flavor=URL,type=DeploymentScanner");
+ connection.invoke(name, "addURL", new Object[] { asURL }, new String[] {String.class.getName()});
+ }
+}
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerListener.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java 2008-12-08 20:52:25 UTC (rev 12477)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java 2008-12-08 21:02:14 UTC (rev 12478)
@@ -1,92 +0,0 @@
-package org.jboss.ide.eclipse.as.core.server.internal;
-
-import java.io.File;
-
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerEvent;
-import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider;
-import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.tools.jmx.core.IJMXRunnable;
-import org.jboss.tools.jmx.core.JMXException;
-
-public class ServerStartupListener extends UnitedServerListener {
- private static ServerStartupListener instance;
- public static ServerStartupListener getDefault() {
- if( instance == null )
- instance = new ServerStartupListener();
- return instance;
- }
-
- public void serverChanged(ServerEvent event) {
- int eventKind = event.getKind();
- if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
- // server change event
- if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
- checkState(event.getServer());
- }
- }
- }
-
- protected void checkState(final IServer server) {
- if( server.getServerState() == IServer.STATE_STARTED ) {
- if( shouldAddDeployLocation(server)) {
- IJMXRunnable r = new IJMXRunnable() {
- public void run(MBeanServerConnection connection) throws Exception {
- ensureDeployLocationAdded(server, connection);
- }
- };
- try {
- JBossServerConnectionProvider.run(server, r);
- } catch( JMXException jmxe ) {
- // TODO log
- }
- }
- }
- }
-
- protected boolean shouldAddDeployLocation(IServer server) {
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
- boolean shouldAdd = server.getServerState() == IServer.STATE_STARTED;
- String type = ds.getDeployLocationType();
- String deployFolder = ds.getDeployFolder();
- if( type.equals(IDeployableServer.DEPLOY_SERVER))
- shouldAdd = false;
- else if( type.equals(IDeployableServer.DEPLOY_METADATA))
- shouldAdd = true;
- else if( type.equals( IDeployableServer.DEPLOY_CUSTOM )) {
- if( !new File(deployFolder).exists())
- shouldAdd = false;
- else {
- IRuntime rt = server.getRuntime();
- IJBossServerRuntime jbsrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
- String config = jbsrt.getJBossConfiguration();
- IPath deploy = new Path(IJBossServerConstants.SERVER)
- .append(config)
- .append(IJBossServerConstants.DEPLOY).makeRelative();
- IPath deployGlobal = DeployableServer.makeGlobal(jbsrt, deploy);
- if( new Path(deployFolder).equals(deployGlobal))
- shouldAdd = false;
- }
- }
- return shouldAdd;
- }
-
- protected void ensureDeployLocationAdded(IServer server, MBeanServerConnection connection) throws Exception {
- IDeployableServer ds = ServerConverter.getDeployableServer(server);
- String deployFolder = ds.getDeployFolder();
- String asURL = new File(deployFolder).toURL().toString();
- ObjectName name = new ObjectName("jboss.deployment:flavor=URL,type=DeploymentScanner");
- connection.invoke(name, "addURL", new Object[] { asURL }, new String[] {String.class.getName()});
- }
-}
17 years, 4 months
JBoss Tools SVN: r12477 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-08 15:52:25 -0500 (Mon, 08 Dec 2008)
New Revision: 12477
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java
Log:
fix encoding issue
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java 2008-12-08 20:42:13 UTC (rev 12476)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java 2008-12-08 20:52:25 UTC (rev 12477)
@@ -46,7 +46,7 @@
IProject project = null;
// TODO move Build related constants to separate class accessible for all tests
- static final String INIT_ERROR_MЕSSAGE = "System property ''{0}'' must be configured with -D to run these tests";
+ static final String INIT_ERROR_MESSAGE = "System property ''{0}'' must be configured with -D to run these tests";
static final String PROJECT_NAME = "TestSeamSettingsPreferencesPage";
static final String MODEL_PACKAGE_NAME = ("org.domain." + PROJECT_NAME + ".entity").toLowerCase();
static final String ACTION_PACKAGE_NAME = ("org.domain." + PROJECT_NAME + ".session").toLowerCase();
@@ -59,7 +59,7 @@
static {
SEAM_1_2_HOME_PATH = System.getProperty(PROP_SEAM_1_2_HOME_PATH);
if(SEAM_1_2_HOME_PATH == null) {
- throw new IllegalArgumentException(MessageFormat.format(INIT_ERROR_MЕSSAGE, PROP_SEAM_1_2_HOME_PATH));
+ throw new IllegalArgumentException(MessageFormat.format(INIT_ERROR_MESSAGE, PROP_SEAM_1_2_HOME_PATH));
}
}
17 years, 4 months
JBoss Tools SVN: r12476 - 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: 2008-12-08 15:42:13 -0500 (Mon, 08 Dec 2008)
New Revision: 12476
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
Log:
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-08 20:14:25 UTC (rev 12475)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-12-08 20:42:13 UTC (rev 12476)
@@ -357,6 +357,7 @@
newTemp = new Path(IJBossServerConstants.SERVER).append(config)
.append(IJBossServerConstants.TMP)
.append(IJBossServerConstants.JBOSSTOOLS_TMP).makeRelative().toString();
+ new File(newTemp).mkdirs();
type = IDeployableServer.DEPLOY_SERVER;
} else {
newDir = lastCustomDeploy;
17 years, 4 months
JBoss Tools SVN: r12475 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-12-08 15:14:25 -0500 (Mon, 08 Dec 2008)
New Revision: 12475
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java
Log:
fix seam JUnit test error: testSettingsPage Failure Settings page is not valid: Seam Runtime 'Seam 1.2.0 Seam Settings Page Test' templates directory doesn't exist for selected Seam Web Project
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java 2008-12-08 20:14:14 UTC (rev 12474)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/preferences/SeamSettingsPreferencesPageTest.java 2008-12-08 20:14:25 UTC (rev 12475)
@@ -13,6 +13,7 @@
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.text.MessageFormat;
import junit.framework.TestCase;
@@ -43,12 +44,25 @@
public class SeamSettingsPreferencesPageTest extends TestCase {
IProject project = null;
- static String PROJECT_NAME = "TestSeamSettingsPreferencesPage";
- static String MODEL_PACKAGE_NAME = ("org.domain." + PROJECT_NAME + ".entity").toLowerCase();
- static String ACTION_PACKAGE_NAME = ("org.domain." + PROJECT_NAME + ".session").toLowerCase();
- static String TEST_PACKAGE_NAME = ("org.domain." + PROJECT_NAME + ".test").toLowerCase();
- static String RUNTIME_NAME = "Seam 1.2.0 Seam Settings Page Test";
+ // TODO move Build related constants to separate class accessible for all tests
+ static final String INIT_ERROR_MЕSSAGE = "System property ''{0}'' must be configured with -D to run these tests";
+ static final String PROJECT_NAME = "TestSeamSettingsPreferencesPage";
+ static final String MODEL_PACKAGE_NAME = ("org.domain." + PROJECT_NAME + ".entity").toLowerCase();
+ static final String ACTION_PACKAGE_NAME = ("org.domain." + PROJECT_NAME + ".session").toLowerCase();
+ static final String TEST_PACKAGE_NAME = ("org.domain." + PROJECT_NAME + ".test").toLowerCase();
+ static final String RUNTIME_NAME = "Seam 1.2.0 Seam Settings Page Test";
+
+ public static final String PROP_SEAM_1_2_HOME_PATH = "jbosstools.test.seam.1.2.1.eap.home";
+ public static final String SEAM_1_2_HOME_PATH;
+
+ static {
+ SEAM_1_2_HOME_PATH = System.getProperty(PROP_SEAM_1_2_HOME_PATH);
+ if(SEAM_1_2_HOME_PATH == null) {
+ throw new IllegalArgumentException(MessageFormat.format(INIT_ERROR_MЕSSAGE, PROP_SEAM_1_2_HOME_PATH));
+ }
+ }
+
public SeamSettingsPreferencesPageTest() {
super("Seam Settings Preferences Page Tests");
}
@@ -71,13 +85,7 @@
seamSuport.setValue(Boolean.TRUE);
Bundle seamCoreTest = Platform.getBundle("org.jboss.tools.seam.core.test");
- URL seamUrl = null;
- try {
- seamUrl = FileLocator.resolve(seamCoreTest.getEntry("/seam/seam-1.2.0"));
- } catch (IOException e) {
- fail("Can't resolve org.jboss.tools.seam.core.test/seam/seam-1.2.0");
- }
- File folder = new File(seamUrl.getPath());
+ File folder = new File(SEAM_1_2_HOME_PATH);
SeamRuntimeManager manager = SeamRuntimeManager.getInstance();
assertNotNull("Cannot obtainSeamRuntimeManager instance", manager);
manager.addRuntime(RUNTIME_NAME, folder.getAbsolutePath(), SeamVersion.SEAM_1_2, true);
17 years, 4 months
JBoss Tools SVN: r12474 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-12-08 15:14:14 -0500 (Mon, 08 Dec 2008)
New Revision: 12474
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
Log:
JBIDE-3362 - adding deployment location now works directly after startup but not during each publish.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2008-12-08 19:54:59 UTC (rev 12473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 2008-12-08 20:14:14 UTC (rev 12474)
@@ -31,6 +31,7 @@
import org.eclipse.core.runtime.Plugin;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
+import org.jboss.ide.eclipse.as.core.server.internal.ServerStartupListener;
import org.osgi.framework.BundleContext;
/**
@@ -74,6 +75,7 @@
// Start the array of models that need to be started
XPathModel.getDefault();
UnitedServerListenerManager.getDefault();
+ UnitedServerListenerManager.getDefault().addListener(ServerStartupListener.getDefault());
}
/**
@@ -81,6 +83,7 @@
*/
public void stop(BundleContext context) throws Exception {
super.stop(context);
+ UnitedServerListenerManager.getDefault().removeListener(ServerStartupListener.getDefault());
}
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2008-12-08 19:54:59 UTC (rev 12473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2008-12-08 20:14:14 UTC (rev 12474)
@@ -21,17 +21,12 @@
*/
package org.jboss.ide.eclipse.as.core.server.internal;
-import java.io.File;
-
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugException;
@@ -39,20 +34,15 @@
import org.eclipse.debug.core.IDebugEventSetListener;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IProcess;
-import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider;
import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXClassLoaderRepository;
-import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration;
-import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.tools.jmx.core.IJMXRunnable;
/**
@@ -203,14 +193,11 @@
super.publishStart(monitor);
JMXClassLoaderRepository.getDefault().addConcerned(getServer(), this);
final boolean suspend = shouldSuspendScanner();
- final boolean add = shouldAddDeployLocation();
- if( suspend || add) {
+ if( suspend ) {
IJMXRunnable r = new IJMXRunnable() {
public void run(MBeanServerConnection connection) throws Exception {
if( suspend )
suspendDeployment(connection);
- if( add )
- ensureDeployLocationAdded(connection);
}
};
JBossServerConnectionProvider.run(getServer(), r);
@@ -230,42 +217,6 @@
super.publishFinish(monitor);
}
-
- protected boolean shouldAddDeployLocation() {
- IDeployableServer ds = ServerConverter.getDeployableServer(getServer());
- boolean shouldAdd = getServer().getServerState() == IServer.STATE_STARTED;
- String type = ds.getDeployLocationType();
- String deployFolder = ds.getDeployFolder();
- if( type.equals(IDeployableServer.DEPLOY_SERVER))
- shouldAdd = false;
- else if( type.equals(IDeployableServer.DEPLOY_METADATA))
- shouldAdd = true;
- else if( type.equals( IDeployableServer.DEPLOY_CUSTOM )) {
- if( !new File(deployFolder).exists())
- shouldAdd = false;
- else {
- IRuntime rt = getServer().getRuntime();
- IJBossServerRuntime jbsrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
- String config = jbsrt.getJBossConfiguration();
- IPath deploy = new Path(IJBossServerConstants.SERVER)
- .append(config)
- .append(IJBossServerConstants.DEPLOY).makeRelative();
- IPath deployGlobal = DeployableServer.makeGlobal(jbsrt, deploy);
- if( new Path(deployFolder).equals(deployGlobal))
- shouldAdd = false;
- }
- }
- return shouldAdd;
- }
-
- protected void ensureDeployLocationAdded(MBeanServerConnection connection) throws Exception {
- IDeployableServer ds = ServerConverter.getDeployableServer(getServer());
- String deployFolder = ds.getDeployFolder();
- String asURL = new File(deployFolder).toURL().toString();
- ObjectName name = new ObjectName("jboss.deployment:flavor=URL,type=DeploymentScanner");
- connection.invoke(name, "addURL", new Object[] { asURL }, new String[] {String.class.getName()});
- }
-
protected boolean shouldSuspendScanner() {
if( getServer().getServerType().getId().equals("org.jboss.ide.eclipse.as.50"))
return false;
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ServerStartupListener.java 2008-12-08 20:14:14 UTC (rev 12474)
@@ -0,0 +1,92 @@
+package org.jboss.ide.eclipse.as.core.server.internal;
+
+import java.io.File;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerEvent;
+import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
+import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.tools.jmx.core.IJMXRunnable;
+import org.jboss.tools.jmx.core.JMXException;
+
+public class ServerStartupListener extends UnitedServerListener {
+ private static ServerStartupListener instance;
+ public static ServerStartupListener getDefault() {
+ if( instance == null )
+ instance = new ServerStartupListener();
+ return instance;
+ }
+
+ public void serverChanged(ServerEvent event) {
+ int eventKind = event.getKind();
+ if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
+ // server change event
+ if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
+ checkState(event.getServer());
+ }
+ }
+ }
+
+ protected void checkState(final IServer server) {
+ if( server.getServerState() == IServer.STATE_STARTED ) {
+ if( shouldAddDeployLocation(server)) {
+ IJMXRunnable r = new IJMXRunnable() {
+ public void run(MBeanServerConnection connection) throws Exception {
+ ensureDeployLocationAdded(server, connection);
+ }
+ };
+ try {
+ JBossServerConnectionProvider.run(server, r);
+ } catch( JMXException jmxe ) {
+ // TODO log
+ }
+ }
+ }
+ }
+
+ protected boolean shouldAddDeployLocation(IServer server) {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ boolean shouldAdd = server.getServerState() == IServer.STATE_STARTED;
+ String type = ds.getDeployLocationType();
+ String deployFolder = ds.getDeployFolder();
+ if( type.equals(IDeployableServer.DEPLOY_SERVER))
+ shouldAdd = false;
+ else if( type.equals(IDeployableServer.DEPLOY_METADATA))
+ shouldAdd = true;
+ else if( type.equals( IDeployableServer.DEPLOY_CUSTOM )) {
+ if( !new File(deployFolder).exists())
+ shouldAdd = false;
+ else {
+ IRuntime rt = server.getRuntime();
+ IJBossServerRuntime jbsrt = (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+ String config = jbsrt.getJBossConfiguration();
+ IPath deploy = new Path(IJBossServerConstants.SERVER)
+ .append(config)
+ .append(IJBossServerConstants.DEPLOY).makeRelative();
+ IPath deployGlobal = DeployableServer.makeGlobal(jbsrt, deploy);
+ if( new Path(deployFolder).equals(deployGlobal))
+ shouldAdd = false;
+ }
+ }
+ return shouldAdd;
+ }
+
+ protected void ensureDeployLocationAdded(IServer server, MBeanServerConnection connection) throws Exception {
+ IDeployableServer ds = ServerConverter.getDeployableServer(server);
+ String deployFolder = ds.getDeployFolder();
+ String asURL = new File(deployFolder).toURL().toString();
+ ObjectName name = new ObjectName("jboss.deployment:flavor=URL,type=DeploymentScanner");
+ connection.invoke(name, "addURL", new Object[] { asURL }, new String[] {String.class.getName()});
+ }
+}
17 years, 4 months
JBoss Tools SVN: r12473 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-12-08 14:54:59 -0500 (Mon, 08 Dec 2008)
New Revision: 12473
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml
Log:
RESOLVED - issue JBIDE-3265: rich:dataDefenitionList bugs.
https://jira.jboss.org/jira/browse/JBIDE-3265
Tests of rich:dataDefenitionList have been fixed.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2008-12-08 19:31:53 UTC (rev 12472)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2008-12-08 19:54:59 UTC (rev 12473)
@@ -37,7 +37,10 @@
*/
public class RichFacesDataDefinitionListTemplate extends VpeAbstractTemplate {
- private static final String FACET_DEFINITION = "facet";
+ /**
+ *
+ */
+ private static final String DEFAULT_DD_CLASS = "columnClass"; //$NON-NLS-1$
private static final String FACET_URI = "http://java.sun.com/jsf/core";
private static final String FACET_NAME_ATTR = "name";
private static final String FACET_NAME_ATTR_VALUE = "term";
@@ -84,7 +87,7 @@
}
child = (Element) nodeChild;
- if (!child.getLocalName().equals(FACET_DEFINITION)) {
+ if (!child.getLocalName().equals(RichFaces.TAG_FACET)) {
dataDefinitionElements.add(child);
} else if (facetElement == null
&& (FACET_URI.equals(pageContext.getSourceTaglibUri(child)))
@@ -120,7 +123,7 @@
}
if (!dataDefinitionElements.isEmpty()) {
- String ddClass = "columnClass";
+ String ddClass = DEFAULT_DD_CLASS;
if (rowClassesSize > 0) {
ddClass+= " " + rowClasses.get(row % rowClassesSize); //$NON-NLS-1$
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml 2008-12-08 19:31:53 UTC (rev 12472)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml 2008-12-08 19:54:59 UTC (rev 12473)
@@ -7,14 +7,28 @@
xmlns:rich="http://richfaces.org/rich">
<head>
+ <style type="text/css">
+ .red-text {
+ color:red;
+ }
+ .blue-text {
+ color:blue;
+ }
+ .yellow-background {
+ background-color: yellow;
+ }
+ </style>
</head>
<body>
<f:view>
- <rich:dataDefinitionList id="dataDefinitionList" rows="5">
- <h:outputText value="row=1" />
- <h:outputText value="row=2" />
- <h:outputText value="row=3" />
- <h:outputText value="row=4" />
+ <rich:dataDefinitionList id="dataDefinitionList" rows="5"
+ styleClass="yellow-background" rowClasses="red-text, blue-text">
+ <f:facet name="term"><h:outputText value="TERM-VISIBLE"/></f:facet>
+ <f:facet name="term"><h:outputText value="TERM-INVISIBLE"/></f:facet>
+ <h:outputText value="col1" />
+ <h:outputText value="col2" />
+ <h:outputText value="col3" />
+ <h:outputText value="col4" />
</rich:dataDefinitionList>
</f:view>
</body>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2008-12-08 19:31:53 UTC (rev 12472)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2008-12-08 19:54:59 UTC (rev 12473)
@@ -1,18 +1,112 @@
<tests>
<test id="dataDefinitionList">
- <DL CLASS="listClass">
- <DD CLASS="columnClass">
- <SPAN> row=1 </SPAN>
+
+ <DL CLASS="yellow-background">
+ <DT CLASS="headerClass">
+ <DIV>
+ <SPAN>
+ TERM-VISIBLE
+</SPAN>
+ </DIV>
+ </DT>
+ <DD CLASS="columnClass red-text">
+ <SPAN>
+ col1
+</SPAN>
+ <SPAN>
+ col2
+</SPAN>
+ <SPAN>
+ col3
+</SPAN>
+ <SPAN>
+ col4
+</SPAN>
</DD>
- <DD CLASS="columnClass">
- <SPAN> row=2 </SPAN>
+ <DT CLASS="headerClass">
+ <DIV>
+ <SPAN>
+ TERM-VISIBLE
+</SPAN>
+ </DIV>
+ </DT>
+ <DD CLASS="columnClass blue-text">
+ <SPAN>
+ col1
+</SPAN>
+ <SPAN>
+ col2
+</SPAN>
+ <SPAN>
+ col3
+</SPAN>
+ <SPAN>
+ col4
+</SPAN>
</DD>
- <DD CLASS="columnClass">
- <SPAN> row=3 </SPAN>
+ <DT CLASS="headerClass">
+ <DIV>
+ <SPAN>
+ TERM-VISIBLE
+</SPAN>
+ </DIV>
+ </DT>
+ <DD CLASS="columnClass red-text">
+ <SPAN>
+ col1
+</SPAN>
+ <SPAN>
+ col2
+</SPAN>
+ <SPAN>
+ col3
+</SPAN>
+ <SPAN>
+ col4
+</SPAN>
</DD>
- <DD CLASS="columnClass">
- <SPAN> row=4 </SPAN>
+ <DT CLASS="headerClass">
+ <DIV>
+ <SPAN>
+ TERM-VISIBLE
+</SPAN>
+ </DIV>
+ </DT>
+ <DD CLASS="columnClass blue-text">
+ <SPAN>
+ col1
+</SPAN>
+ <SPAN>
+ col2
+</SPAN>
+ <SPAN>
+ col3
+</SPAN>
+ <SPAN>
+ col4
+</SPAN>
</DD>
+ <DT CLASS="headerClass">
+ <DIV>
+ <SPAN>
+ TERM-VISIBLE
+</SPAN>
+ </DIV>
+ </DT>
+ <DD CLASS="columnClass red-text">
+ <SPAN>
+ col1
+</SPAN>
+ <SPAN>
+ col2
+</SPAN>
+ <SPAN>
+ col3
+</SPAN>
+ <SPAN>
+ col4
+</SPAN>
+ </DD>
</DL>
</test>
</tests>
\ No newline at end of file
17 years, 4 months
JBoss Tools SVN: r12472 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2008-12-08 14:31:53 -0500 (Mon, 08 Dec 2008)
New Revision: 12472
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java
Log:
CODING IN PROGRESS - issue JBIDE-3265: rich:dataDefenitionList bugs.
https://jira.jboss.org/jira/browse/JBIDE-3265
Item #1 has been fixed: Content of the component and children are only one row. So "rowClasses" isn't applyed correctly (see screenshot-1)
Item #2 has been fixed: STEP 1: Use attached file. Find dataDefenitionList, set up styleClass="btn"
ASSERT: All works correctly
STEP 2: Press refresh button
Result: All styles from styleClass crash
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2008-12-08 19:04:39 UTC (rev 12471)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesDataDefinitionListTemplate.java 2008-12-08 19:31:53 UTC (rev 12472)
@@ -10,16 +10,21 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.richfaces.template;
+import java.util.ArrayList;
+import java.util.List;
+
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
-import org.jboss.tools.jsf.vpe.richfaces.HtmlComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpression;
+import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.editor.util.VpeClassUtil;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
-import org.mozilla.interfaces.nsIDOMNode;
-import org.mozilla.interfaces.nsIDOMNodeList;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -33,23 +38,11 @@
public class RichFacesDataDefinitionListTemplate extends VpeAbstractTemplate {
private static final String FACET_DEFINITION = "facet";
-
private static final String FACET_URI = "http://java.sun.com/jsf/core";
-
private static final String FACET_NAME_ATTR = "name";
-
private static final String FACET_NAME_ATTR_VALUE = "term";
-
private static final String STYLE_RESOURCES_PATH = "/dataDefinitionList/dataDefinitionList.css";
- private static final String HEADER_CLASS_ATTR_NAME = "headerClass";
-
- private static final String ROWCLASSES_ATTR_NAME = "rowClasses";
-
- private static final String COLUMNCLASSES_ATTR_NAME = "columnClasses";
-
- private static final String STYLECLASSES_ATTR_NAME = "styleClass";
-
/**
* Creates a node of the visual tree on the node of the source tree. This
* visual node should not have the parent node This visual node can have
@@ -64,7 +57,7 @@
* @return The information on the created node of the visual tree.
*/
public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {
- nsIDOMElement listElement = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DL);
+ nsIDOMElement listElement = visualDocument.createElement(HTML.TAG_DL);
ComponentUtil.setCSSLink(
pageContext,
STYLE_RESOURCES_PATH,
@@ -72,41 +65,76 @@
VpeCreationData creationData = new VpeCreationData(listElement);
- Element el = null;
- Node tempNode = null;
+ Element child = null;
NodeList list = sourceNode.getChildNodes();
// sets attributes for list
- ComponentUtil.correctAttribute((Element)sourceNode, listElement, HtmlComponentUtil.HTML_STYLE_ATTR, HtmlComponentUtil.HTML_STYLE_ATTR, null, null);
+ ComponentUtil.correctAttribute((Element)sourceNode, listElement,
+ RichFaces.ATTR_STYLE, HTML.ATTR_STYLE, null, null);
- ComponentUtil.correctAttribute((Element)sourceNode, listElement, HtmlComponentUtil.HTML_CLASS_ATTR, HtmlComponentUtil.HTML_CLASS_ATTR, null, "listClass");
+ ComponentUtil.correctAttribute((Element)sourceNode, listElement,
+ RichFaces.ATTR_STYLE_CLASS, HTML.ATTR_CLASS, null, "listClass");
+ Element facetElement = null;
+ List<Element> dataDefinitionElements = new ArrayList<Element>();
for (int i = 0; i < list.getLength(); i++) {
- tempNode = list.item(i);
- if (!(tempNode instanceof Element)) {
+ Node nodeChild = list.item(i);
+ if (!(nodeChild instanceof Element)) {
continue;
}
- el = (Element) tempNode;
- if (el.getLocalName().equals(FACET_DEFINITION)
- &&(FACET_URI.equals(pageContext.getSourceTaglibUri(el)))
- && el.getAttribute(FACET_NAME_ATTR) != null
- && el.getAttribute(FACET_NAME_ATTR).equals(
+ child = (Element) nodeChild;
+
+ if (!child.getLocalName().equals(FACET_DEFINITION)) {
+ dataDefinitionElements.add(child);
+ } else if (facetElement == null
+ && (FACET_URI.equals(pageContext.getSourceTaglibUri(child)))
+ && child.getAttribute(FACET_NAME_ATTR) != null
+ && child.getAttribute(FACET_NAME_ATTR).equals(
FACET_NAME_ATTR_VALUE)) {
- parseListFacetDefinitionElement(pageContext, sourceNode,
- visualDocument, creationData, listElement, el);
- } else {
- parseListElement(pageContext, sourceNode, visualDocument,
- creationData, listElement, el);
+ facetElement = child;
}
}
+
+ final List<String> rowClasses;
+ try {
+ final VpeExpression exprRowClasses = RichFaces.getExprRowClasses();
+ rowClasses = VpeClassUtil.getClasses(exprRowClasses, sourceNode,
+ pageContext);
+ } catch (VpeExpressionException e) {
+ throw new RuntimeException(e);
+ }
+
+ final int rowClassesSize = rowClasses.size();
+ int rows = 1;
+ try {
+ rows = Integer.parseInt(((Element)sourceNode).getAttribute(RichFaces.ATTR_ROWS));
+ } catch (NumberFormatException x) {
+ // this is OK, rows still equals 1
+ }
+
+ for (int row = 0; row < rows; row++) {
+ if (facetElement != null) {
+ insertDtElement(sourceNode, visualDocument,
+ creationData, listElement, facetElement);
+
+ }
+
+ if (!dataDefinitionElements.isEmpty()) {
+ String ddClass = "columnClass";
+ if (rowClassesSize > 0) {
+ ddClass+= " " + rowClasses.get(row % rowClassesSize); //$NON-NLS-1$
+ }
+ insertDdElement(sourceNode, visualDocument,
+ creationData, listElement, dataDefinitionElements,
+ ddClass);
+ }
+ }
return creationData;
}
/**
- * Parses elements for list
+ * Insert elements in list
*
- * @param pageContext
- * Contains the information on edited page.
* @param sourceNode
* The current node of the source tree.
* @param visualDocument
@@ -114,25 +142,27 @@
* @param creationData
* @param parentList
* @param childElement
+ * @param styleClass class of this DD element
*/
- private void parseListElement(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData creationData, nsIDOMElement parentList, Element childElement) {
- nsIDOMElement dd = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DD);
- ComponentUtil.correctAttribute((Element) sourceNode, dd, ROWCLASSES_ATTR_NAME, HtmlComponentUtil.HTML_CLASS_ATTR, null, null);
- if (dd.getAttribute(HtmlComponentUtil.HTML_CLASS_ATTR) == null || dd.getAttribute(HtmlComponentUtil.HTML_CLASS_ATTR).length() == 0) {
- ComponentUtil.correctAttribute((Element) sourceNode, dd, COLUMNCLASSES_ATTR_NAME, HtmlComponentUtil.HTML_CLASS_ATTR, null, "columnClass");
- }
+ private void insertDdElement(Node sourceNode,
+ nsIDOMDocument visualDocument, VpeCreationData creationData,
+ nsIDOMElement parentList, List<Element> childElements, String styleClass) {
+ nsIDOMElement dd = visualDocument.createElement(HTML.TAG_DD);
+
+ dd.setAttribute(HTML.ATTR_CLASS, styleClass);
+
parentList.appendChild(dd);
VpeChildrenInfo vpeChildrenInfo = new VpeChildrenInfo(dd);
- vpeChildrenInfo.addSourceChild(childElement);
+ for (Element childElement : childElements) {
+ vpeChildrenInfo.addSourceChild(childElement);
+ }
creationData.addChildrenInfo(vpeChildrenInfo);
}
/**
- * Parse listDataDefinition facet to HTML DT element
+ * Insert listDataDefinition facet to HTML DT element
*
- * @param pageContext
- * Contains the information on edited page.
* @param sourceNode
* The current node of the source tree.
* @param visualDocument
@@ -141,16 +171,15 @@
* @param parentList
* @facet facetElement
*/
- private void parseListFacetDefinitionElement(VpePageContext pageContext,
- Node sourceNode, nsIDOMDocument visualDocument,
+ private void insertDtElement(Node sourceNode, nsIDOMDocument visualDocument,
VpeCreationData creationData, nsIDOMElement parentList,
Element facetElement) {
- nsIDOMElement dt = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DT);
+ nsIDOMElement dt = visualDocument.createElement(HTML.TAG_DT);
ComponentUtil.correctAttribute(
(Element) sourceNode,
dt,
- HEADER_CLASS_ATTR_NAME,
- HtmlComponentUtil.HTML_CLASS_ATTR,
+ RichFaces.ATTR_HEADER_CLASS,
+ HTML.ATTR_CLASS,
null,
"headerClass");
parentList.appendChild(dt);
@@ -158,90 +187,100 @@
child.addSourceChild(facetElement);
creationData.addChildrenInfo(child);
}
-
+
+ /**
+ * @see VpeAbstractTemplate#isRecreateAtAttrChange
+ */
@Override
- public void setAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name,
- String value) {
- processAttributeChanges(pageContext, sourceElement, visualDocument, visualNode, data, name);
+ public boolean isRecreateAtAttrChange(VpePageContext pageContext,
+ Element sourceElement, nsIDOMDocument visualDocument,
+ nsIDOMElement visualNode, Object data, String name, String value) {
+ return true;
}
- @Override
- public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) {
- processAttributeChanges(pageContext, sourceElement, visualDocument, visualNode, data, name);
- }
-
- /**
- * Correct list style accordinly parameters
- *
- * @param pageContext
- * Contains the information on edited page.
- * @param sourceElement
- * The current node of the source tree.
- * @param visualDocument
- * The document of the visual tree.
- * @param visualNode
- * @param data
- * @param name
- */
- private void processAttributeChanges(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) {
- nsIDOMElement el = (nsIDOMElement) visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- if (HtmlComponentUtil.HTML_STYLE_ATTR.equals(name)) {
- ComponentUtil.correctAttribute(sourceElement, el, name, name, null, null);
- } else if (STYLECLASSES_ATTR_NAME.equals(name)) {
- ComponentUtil.correctAttribute(sourceElement, el, name,
- HtmlComponentUtil.HTML_CLASS_ATTR, null, "listClass");
- } else if (HEADER_CLASS_ATTR_NAME.equals(name)) {
- nsIDOMNodeList nodeList = el.getChildNodes();
- nsIDOMNode temp = null;
- for (int i = 0; i < nodeList.getLength(); i++) {
- temp = nodeList.item(i);
- if ((temp != null)
- && (temp.getNodeName()
- .equalsIgnoreCase(HtmlComponentUtil.HTML_TAG_DT))) {
- nsIDOMElement tempVisualElement = (nsIDOMElement)temp.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- ComponentUtil.correctAttribute(sourceElement,
- tempVisualElement,
- HEADER_CLASS_ATTR_NAME,
- HtmlComponentUtil.HTML_CLASS_ATTR,
- null,
- "headerClass");
- }
- }
- } else if (ROWCLASSES_ATTR_NAME.equals(name)) {
- nsIDOMNodeList nodeList = el.getChildNodes();
- nsIDOMNode temp = null;
- for (int i = 0; i < nodeList.getLength(); i++) {
- temp = nodeList.item(i);
- if ((temp != null )
- && (temp.getNodeName()
- .equalsIgnoreCase(HtmlComponentUtil.HTML_TAG_DD))) {
- nsIDOMElement tempVisualElement = (nsIDOMElement)temp.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- ComponentUtil.correctAttribute(sourceElement,
- tempVisualElement,
- ROWCLASSES_ATTR_NAME,
- HtmlComponentUtil.HTML_CLASS_ATTR,
- null,
- "columnClass");
- }
- }
- } else if (COLUMNCLASSES_ATTR_NAME.equals(name)) {
- nsIDOMNodeList nodeList = el.getChildNodes();
- nsIDOMNode temp = null;
- for (int i = 0; i < nodeList.getLength(); i++) {
- temp = nodeList.item(i);
- if ((temp != null)
- && (temp.getNodeName()
- .equalsIgnoreCase(HtmlComponentUtil.HTML_TAG_DD))) {
- nsIDOMElement tempVisualElement = (nsIDOMElement)temp.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
- ComponentUtil.correctAttribute(
- sourceElement,
- tempVisualElement,
- COLUMNCLASSES_ATTR_NAME,
- HtmlComponentUtil.HTML_CLASS_ATTR,
- null,
- "columnClass");
- }
- }
- }
- }
+// @Override
+// public void setAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name,
+// String value) {
+// processAttributeChanges(pageContext, sourceElement, visualDocument, visualNode, data, name);
+// }
+//
+// @Override
+// public void removeAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) {
+// processAttributeChanges(pageContext, sourceElement, visualDocument, visualNode, data, name);
+// }
+//
+// /**
+// * Correct list style accordinly parameters
+// *
+// * @param pageContext
+// * Contains the information on edited page.
+// * @param sourceElement
+// * The current node of the source tree.
+// * @param visualDocument
+// * The document of the visual tree.
+// * @param visualNode
+// * @param data
+// * @param name
+// */
+// private void processAttributeChanges(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name) {
+// nsIDOMElement el = (nsIDOMElement) visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+// if (HTML.ATTR_STYLE.equals(name)) {
+// ComponentUtil.correctAttribute(sourceElement, el, name, name, null, null);
+// } else if (RichFaces.ATTR_STYLE_CLASS.equals(name)) {
+// ComponentUtil.correctAttribute(sourceElement, el, name,
+// HTML.ATTR_CLASS, null, "listClass");
+// } else if (RichFaces.ATTR_HEADER_CLASS.equals(name)) {
+// nsIDOMNodeList nodeList = el.getChildNodes();
+// nsIDOMNode temp = null;
+// for (int i = 0; i < nodeList.getLength(); i++) {
+// temp = nodeList.item(i);
+// if ((temp != null)
+// && (temp.getNodeName()
+// .equalsIgnoreCase(HTML.TAG_DT))) {
+// nsIDOMElement tempVisualElement = (nsIDOMElement)temp.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+// ComponentUtil.correctAttribute(sourceElement,
+// tempVisualElement,
+// RichFaces.ATTR_HEADER_CLASS,
+// HTML.ATTR_CLASS,
+// null,
+// "headerClass");
+// }
+// }
+// } else if (RichFaces.ATTR_ROW_CLASSES.equals(name)) {
+// nsIDOMNodeList nodeList = el.getChildNodes();
+// nsIDOMNode temp = null;
+// for (int i = 0; i < nodeList.getLength(); i++) {
+// temp = nodeList.item(i);
+// if ((temp != null )
+// && (temp.getNodeName()
+// .equalsIgnoreCase(HTML.TAG_DD))) {
+// nsIDOMElement tempVisualElement = (nsIDOMElement)temp.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+// ComponentUtil.correctAttribute(sourceElement,
+// tempVisualElement,
+// RichFaces.ATTR_ROW_CLASSES,
+// HTML.ATTR_CLASS,
+// null,
+// "columnClass");
+// }
+// }
+// } else if (RichFaces.ATTR_COLUMN_CLASSES.equals(name)) {
+// nsIDOMNodeList nodeList = el.getChildNodes();
+// nsIDOMNode temp = null;
+// for (int i = 0; i < nodeList.getLength(); i++) {
+// temp = nodeList.item(i);
+// if ((temp != null)
+// && (temp.getNodeName()
+// .equalsIgnoreCase(HTML.TAG_DD))) {
+// nsIDOMElement tempVisualElement = (nsIDOMElement)temp.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
+// ComponentUtil.correctAttribute(
+// sourceElement,
+// tempVisualElement,
+// RichFaces.ATTR_COLUMN_CLASSES,
+// HTML.ATTR_CLASS,
+// null,
+// "columnClass");
+// }
+// }
+// }
+// }
}
17 years, 4 months
JBoss Tools SVN: r12471 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-12-08 14:04:39 -0500 (Mon, 08 Dec 2008)
New Revision: 12471
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
Log:
JBIDE-1967 Editor do not recognize .jsf extension for the JSF files
Issue is fixed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-12-08 15:56:06 UTC (rev 12470)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-12-08 19:04:39 UTC (rev 12471)
@@ -121,13 +121,13 @@
contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
id="org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor"
matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl"
- extensions="jsp, jsf, jspf, jspx, tag, tagf, inc">
+ extensions="jsp, jspf, jspx, tag, tagf, inc">
<contentTypeBinding contentTypeId="org.eclipse.jst.jsp.core.jspsource"/>
</editor>
<editor
class="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor"
contributorClass="org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageContributor"
- extensions="html, htm"
+ extensions="html, htm, jsf"
icon="images/xstudio/editors/html_file.gif"
id="org.jboss.tools.jst.jsp.jspeditor.HTMLTextEditor"
matchingStrategy = "org.jboss.tools.common.core.resources.MatchingStrategyImpl"
17 years, 4 months