[jbosstools-commits] JBoss Tools SVN: r18759 - in trunk/struts/plugins/org.jboss.tools.struts: META-INF and 2 other directories.
Author: scabanovich
Date: 2009-11-20 09:06:26 -0500 (Fri, 20 Nov 2009)
New Revision: 18759
Modified:
trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF
trunk/struts/plugins/org.jboss.tools.struts/build.properties
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessHelper.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5236
Modified: trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF 2009-11-20 12:39:10
UTC (rev 18758)
+++ trunk/struts/plugins/org.jboss.tools.struts/META-INF/MANIFEST.MF 2009-11-20 14:06:26
UTC (rev 18759)
@@ -1,5 +1,7 @@
Manifest-Version: 1.0
Bundle-Name: %Bundle-Name.0
+Bundle-ClassPath: struts.jar
+Bundle-ActivationPolicy: lazy
Bundle-Activator: org.jboss.tools.struts.StrutsModelPlugin
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.jboss.tools.struts;singleton:=true
Modified: trunk/struts/plugins/org.jboss.tools.struts/build.properties
===================================================================
--- trunk/struts/plugins/org.jboss.tools.struts/build.properties 2009-11-20 12:39:10 UTC
(rev 18758)
+++ trunk/struts/plugins/org.jboss.tools.struts/build.properties 2009-11-20 14:06:26 UTC
(rev 18759)
@@ -1,9 +1,10 @@
-source.. = src/,\
+source.struts.jar = src/,\
resources/
bin.includes = plugin.xml,\
plugin.properties,\
dtds/,\
about.html,\
META-INF/,\
- .
+ .,\
+ struts.jar
additional.bundles = org.eclipse.wst.server.core
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java
===================================================================
---
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2009-11-20
12:39:10 UTC (rev 18758)
+++
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/StrutsModelPlugin.java 2009-11-20
14:06:26 UTC (rev 18759)
@@ -24,7 +24,7 @@
*/
public class StrutsModelPlugin extends BaseUIPlugin {
public static final String PLUGIN_ID = "org.jboss.tools.struts";
- static StrutsModelPlugin INSTANCE = null;
+ static StrutsModelPlugin INSTANCE;
public StrutsModelPlugin() {
INSTANCE = this;
Modified:
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessHelper.java
===================================================================
---
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessHelper.java 2009-11-20
12:39:10 UTC (rev 18758)
+++
trunk/struts/plugins/org.jboss.tools.struts/src/org/jboss/tools/struts/model/helpers/StrutsProcessHelper.java 2009-11-20
14:06:26 UTC (rev 18759)
@@ -585,6 +585,10 @@
continue;
}
String path = bind.getAttributeValue(ATT_PATH);
+ if(path == null) {
+ //this is comment node
+ continue;
+ }
int ind = path.indexOf('?');
if (ind > 0) {
path = path.substring(0, ind);