[jbosstools-commits] JBoss Tools SVN: r33370 - trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter.
Author: scabanovich
Date: 2011-07-29 16:34:41 -0400 (Fri, 29 Jul 2011)
New Revision: 33370
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java
Log:
FileSystemsHelper.getFile(object) method used.
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java 2011-07-29
20:26:56 UTC (rev 33369)
+++
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/attribute/adapter/ServletNameListContentProvider.java 2011-07-29
20:34:41 UTC (rev 33370)
@@ -13,6 +13,7 @@
import org.jboss.tools.common.model.*;
import org.jboss.tools.jst.web.model.helpers.WebAppHelper;
+import org.jboss.tools.common.model.filesystems.FileSystemsHelper;
import
org.jboss.tools.common.model.ui.attribute.adapter.DefaultXAttributeListContentProvider;
/**
@@ -30,17 +31,15 @@
}
protected void loadTags() {
- XModelObject webxml = null;
- if(object != null) {
- XModelObject f = object;
- while(f != null && f.getFileType() != XModelObject.FILE) f = f.getParent();
- if(f != null) webxml = f;
+ XModelObject webxml = FileSystemsHelper.getFile(object);
+ if(webxml == null) {
+ webxml = WebAppHelper.getWebApp(model);
}
- if(webxml == null) webxml = WebAppHelper.getWebApp(model);
- if(webxml == null) return;
- XModelObject[] os = WebAppHelper.getServlets(webxml);
- tags = new String[os.length];
- for (int i = 0; i < tags.length; i++) tags[i] =
os[i].getAttributeValue("servlet-name"); //$NON-NLS-1$
+ if(webxml != null) {
+ XModelObject[] os = WebAppHelper.getServlets(webxml);
+ tags = new String[os.length];
+ for (int i = 0; i < tags.length; i++) tags[i] =
os[i].getAttributeValue("servlet-name"); //$NON-NLS-1$
+ }
}
}