Google Git
Sign in
eclipse/ejb/webtools.ejb.git.old/refs/heads/R2_0_maintenance^!/.
commit
bcec9a4ffce2d6e0df153e2449887ff164da282a
[log]
author
david_williams <david_williams>
Wed Feb 20 19:33:51 2008 +0000
committer
david_williams <david_williams>
Wed Feb 20 19:33:51 2008 +0000
tree
5f77dd98d2b853d59b97938c9d476de06bca4f2f
parent
c36ec8235d86b0c52fc844637d10f84d68dad534 [diff]
restoring stream to include fixes since 201, plus increment in service field

diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
index df2c947..9d29dfa 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/META-INF/MANIFEST.MF

@@ -15,8 +15,8 @@
  org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.util;x-internal:=true
 Require-Bundle: org.eclipse.jst.j2ee.ejb.annotations.emitter;visibility:=reexport;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.jdt;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,2.4.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
@@ -40,7 +40,7 @@
  org.eclipse.debug.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jdt.debug.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,2.4.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.1.0,1.3.0)"

diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/XDocletActionDelegate.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/XDocletActionDelegate.java
index 796656a..f90cd46 100644
--- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/XDocletActionDelegate.java
+++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/action/XDocletActionDelegate.java

@@ -70,7 +70,7 @@
 		IFolder resource = (IFolder) J2EEProjectUtilities.getSourceFolderOrFirst(project, null);
 		SourceFinder finder = new SourceFinder();
 		try {
-
+			if (resource != null)
 			resource.accept(finder);
 		} catch (CoreException e) {
 		}