woproject/projects/wolips/plugins/org.objectstyle.wolips.wizards/java/org/objectstyle/wolips/wizards WOApplicationWizard.java,1.4,1.5 JarProjectWizard.java,1.3,1.4 WOComponentCreator.java,1.7,1.8 WOSubprojectCreator.java,1.5,1.6 WOFrameworkWizard.java,1.5,1.6 D2WApplicationWizard.java,1.4,1.5
[email protected] Thu, 16 Feb 2006 06:08:01 -0800 (PST)
| Newsgroups | gmane.comp.web.webobjects.woproject.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.wizards/java/org/objectstyle/wolips/wizards
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13372/java/org/objectstyle/wolips/wizards
Modified Files:
WOApplicationWizard.java JarProjectWizard.java
WOComponentCreator.java WOSubprojectCreator.java
WOFrameworkWizard.java D2WApplicationWizard.java
Log Message:
1) Incorporated Sebastien's patch from WOL-209 so Template engine always makes parent folders (and accidentally did a reformat code ... really hard to break that muscle memory :) )
2) Modified WOComponentCreationWizard specifically to create package subfolders (for people who don't have autorefresh enabled) for WOL-209
3) Added compile targets to WOApplication and WOFramework templates
4) Cleaned up a couple strict Eclipse warnings in wizards
Index: WOApplicationWizard.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.wizards/java/org/objectstyle/wolips/wizards/WOApplicationWizard.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- WOApplicationWizard.java 11 Feb 2006 13:09:07 -0000 1.4
+++ WOApplicationWizard.java 16 Feb 2006 14:06:58 -0000 1.5
@@ -60,7 +60,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -104,8 +103,7 @@
this.project = project;
}
- protected void execute(IProgressMonitor monitor) throws CoreException,
- InvocationTargetException, InterruptedException {
+ protected void execute(IProgressMonitor monitor) throws InvocationTargetException {
String projectName = this.project.getName();
String path = this.project.getLocation().toOSString();
NullProgressMonitor nullProgressMonitor = new NullProgressMonitor();
Index: JarProjectWizard.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.wizards/java/org/objectstyle/wolips/wizards/JarProjectWizard.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- JarProjectWizard.java 11 Feb 2006 13:09:07 -0000 1.3
+++ JarProjectWizard.java 16 Feb 2006 14:06:58 -0000 1.4
@@ -60,7 +60,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -103,8 +102,7 @@
this.project = project;
}
- protected void execute(IProgressMonitor monitor) throws CoreException,
- InvocationTargetException, InterruptedException {
+ protected void execute(IProgressMonitor monitor) throws InvocationTargetException {
String projectName = this.project.getName();
String path = this.project.getLocation().toOSString();
Index: WOComponentCreator.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.wizards/java/org/objectstyle/wolips/wizards/WOComponentCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- WOComponentCreator.java 11 Feb 2006 13:09:07 -0000 1.7
+++ WOComponentCreator.java 16 Feb 2006 14:06:59 -0000 1.8
@@ -57,6 +57,7 @@
import java.lang.reflect.InvocationTargetException;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -78,138 +79,130 @@
* @author uli
*/
public class WOComponentCreator implements IRunnableWithProgress {
- private String componentName;
+ private String componentName;
- private String packageName;
+ private String packageName;
- private boolean createBodyTag;
+ private boolean createBodyTag;
- private boolean createApiFile;
+ private boolean createApiFile;
- private boolean createWooFile;
+ private boolean createWooFile;
- private IResource parentResource;
+ private IResource parentResource;
- private WOComponentCreationPage page;
+ private WOComponentCreationPage page;
- /**
- * Constructor for WOComponentCreator.
- *
- * @param parentResource
- * @param componentName
- * @param packageName
- * @param createBodyTag
- * @param createApiFile
- * @param createWooFile
- */
- public WOComponentCreator(IResource parentResource, String componentName,
- String packageName, boolean createBodyTag, boolean createApiFile,
- boolean createWooFile, WOComponentCreationPage page) {
- this.parentResource = parentResource;
- this.componentName = componentName;
- this.packageName = packageName;
- this.createBodyTag = createBodyTag;
- this.createApiFile = createApiFile;
- this.createWooFile = createWooFile;
- this.page = page;
- }
+ /**
+ * Constructor for WOComponentCreator.
+ *
+ * @param parentResource
+ * @param componentName
+ * @param packageName
+ * @param createBodyTag
+ * @param createApiFile
+ * @param createWooFile
+ */
+ public WOComponentCreator(IResource parentResource, String componentName, String packageName, boolean createBodyTag, boolean createApiFile, boolean createWooFile, WOComponentCreationPage page) {
+ this.parentResource = parentResource;
+ this.componentName = componentName;
+ this.packageName = packageName;
+ this.createBodyTag = createBodyTag;
+ this.createApiFile = createApiFile;
+ this.createWooFile = createWooFile;
+ this.page = page;
+ }
- public void run(IProgressMonitor monitor) throws InvocationTargetException {
- try {
- createWOComponent(monitor);
- } catch (CoreException e) {
- throw new InvocationTargetException(e);
- }
- }
+ public void run(IProgressMonitor monitor) throws InvocationTargetException {
+ try {
+ createWOComponent(monitor);
+ }
+ catch (CoreException e) {
+ throw new InvocationTargetException(e);
+ }
+ }
- /**
- * Method createWOComponent.
- *
- * @param monitor
- * @throws CoreException
- * @throws InvocationTargetException
- */
- public void createWOComponent(IProgressMonitor monitor)
- throws CoreException, InvocationTargetException {
- IFolder componentFolder = null;
- IPath componentJavaPath = null;
- IPath apiPath = null;
- IFolder componentFolderToReveal = null;
- IJavaProject iJavaProject = JavaCore.create(this.parentResource
- .getProject());
- JavaProject javaProject = (JavaProject) iJavaProject
- .getAdapter(JavaProject.class);
- Project project = (Project) this.parentResource.getProject()
- .getAdapter(Project.class);
- switch (this.parentResource.getType()) {
- case IResource.PROJECT:
- componentFolder = ((IProject) this.parentResource)
- .getFolder(this.componentName + "."
- + IWOLipsModel.EXT_COMPONENT);
- componentFolderToReveal = (IFolder) javaProject
- .getProjectSourceFolder();
- componentJavaPath = componentFolderToReveal.getLocation();
- apiPath = this.parentResource.getProject().getLocation();
- break;
- case IResource.FOLDER:
- componentFolder = ((IFolder) this.parentResource)
- .getFolder(this.componentName + "."
- + IWOLipsModel.EXT_COMPONENT);
- componentFolderToReveal = javaProject.getSubprojectSourceFolder(
- (IFolder) this.parentResource, true);
- componentJavaPath = componentFolderToReveal.getLocation();
- apiPath = componentFolder.getParent().getLocation();
- IFolder pbFolder = project
- .getParentFolderWithPBProject((IFolder) this.parentResource);
- if (pbFolder != null) {
- apiPath = pbFolder.getLocation();
- }
- break;
- default:
- throw new InvocationTargetException(new Exception(
- "Wrong parent resource - check validation"));
- }
- if (packageName != null && packageName.length() > 0) {
- componentJavaPath = componentJavaPath.append(new Path(packageName
- .replace('.', '/')));
- }
- // IFolder componentJavaFolder = ((IProject)
- // this.parentResource).getFolder(componentJavaPath);
- // System.out.println("WOComponentCreator.createWOComponent: " +
- // componentJavaFolder);
- // componentJavaFolder.create(false, true, monitor);
- componentFolder.create(false, true, monitor);
- String projectName = this.parentResource.getProject().getName();
- IPath path = componentFolder.getLocation();
- ComponentEngine componentEngine = new ComponentEngine();
- try {
- componentEngine.init();
- } catch (Exception e) {
- WizardsPlugin.getDefault().log(e);
- throw new InvocationTargetException(e);
- }
- // TODO: select template in the user interface
- componentEngine.setSelectedTemplateName(componentEngine.names()[0]);
- componentEngine.setProjectName(projectName);
- componentEngine.setCreateBodyTag(this.createBodyTag);
- componentEngine.setComponentName(this.componentName);
- componentEngine.setPackageName(this.packageName);
- componentEngine.setComponentPath(path);
- componentEngine.setApiPath(apiPath);
- componentEngine.setJavaPath(componentJavaPath);
- componentEngine.setCreateWooFile(this.createWooFile);
- componentEngine.setCreateApiFile(this.createApiFile);
- try {
- componentEngine.run(new NullProgressMonitor());
- this.parentResource.getProject().refreshLocal(
- IResource.DEPTH_INFINITE, monitor);
- page.setResourceToReveal(componentFolderToReveal
- .findMember(this.componentName + "."
- + IWOLipsModel.EXT_JAVA));
- } catch (Exception e) {
- WizardsPlugin.getDefault().log(e);
- throw new InvocationTargetException(e);
- }
- }
+ /**
+ * Method createWOComponent.
+ *
+ * @param monitor
+ * @throws CoreException
+ * @throws InvocationTargetException
+ */
+ public void createWOComponent(IProgressMonitor monitor) throws CoreException, InvocationTargetException {
+ IFolder componentFolder = null;
+ IPath componentJavaPath = null;
+ IPath apiPath = null;
+ IFolder componentFolderToReveal = null;
+ IJavaProject iJavaProject = JavaCore.create(this.parentResource.getProject());
+ JavaProject javaProject = (JavaProject) iJavaProject.getAdapter(JavaProject.class);
+ Project project = (Project) this.parentResource.getProject().getAdapter(Project.class);
+ switch (this.parentResource.getType()) {
+ case IResource.PROJECT:
+ componentFolder = ((IProject) this.parentResource).getFolder(this.componentName + "." + IWOLipsModel.EXT_COMPONENT);
+ componentFolderToReveal = (IFolder) javaProject.getProjectSourceFolder();
+ componentJavaPath = componentFolderToReveal.getLocation();
+ apiPath = this.parentResource.getProject().getLocation();
+ break;
+ case IResource.FOLDER:
+ componentFolder = ((IFolder) this.parentResource).getFolder(this.componentName + "." + IWOLipsModel.EXT_COMPONENT);
+ componentFolderToReveal = javaProject.getSubprojectSourceFolder((IFolder) this.parentResource, true);
+ componentJavaPath = componentFolderToReveal.getLocation();
+ apiPath = componentFolder.getParent().getLocation();
+ IFolder pbFolder = project.getParentFolderWithPBProject((IFolder) this.parentResource);
+ if (pbFolder != null) {
+ apiPath = pbFolder.getLocation();
+ }
+ break;
+ default:
+ throw new InvocationTargetException(new Exception("Wrong parent resource - check validation"));
+ }
+ if (packageName != null && packageName.length() > 0) {
+ componentJavaPath = componentJavaPath.append(new Path(packageName.replace('.', '/')));
+ }
+ prepareFolder(componentFolder, monitor);
+ String projectName = this.parentResource.getProject().getName();
+ IPath path = componentFolder.getLocation();
+ IPath projectRelativeJavaPath = componentJavaPath.removeFirstSegments(this.parentResource.getProject().getLocation().segmentCount());
+ IFolder javaSourceFolder = this.parentResource.getProject().getFolder(projectRelativeJavaPath);
+ prepareFolder(javaSourceFolder, monitor);
+ ComponentEngine componentEngine = new ComponentEngine();
+ try {
+ componentEngine.init();
+ }
+ catch (Exception e) {
+ WizardsPlugin.getDefault().log(e);
+ throw new InvocationTargetException(e);
+ }
+ // TODO: select template in the user interface
+ componentEngine.setSelectedTemplateName(componentEngine.names()[0]);
+ componentEngine.setProjectName(projectName);
+ componentEngine.setCreateBodyTag(this.createBodyTag);
+ componentEngine.setComponentName(this.componentName);
+ componentEngine.setPackageName(this.packageName);
+ componentEngine.setComponentPath(path);
+ componentEngine.setApiPath(apiPath);
+ componentEngine.setJavaPath(componentJavaPath);
+ componentEngine.setCreateWooFile(this.createWooFile);
+ componentEngine.setCreateApiFile(this.createApiFile);
+ try {
+ componentEngine.run(new NullProgressMonitor());
+ this.parentResource.getProject().refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ page.setResourceToReveal(componentFolderToReveal.findMember(this.componentName + "." + IWOLipsModel.EXT_JAVA));
+ }
+ catch (Exception e) {
+ WizardsPlugin.getDefault().log(e);
+ throw new InvocationTargetException(e);
+ }
+ }
+ public void prepareFolder(IFolder _folder, IProgressMonitor _progressMonitor) throws CoreException {
+ if (!_folder.exists()) {
+ IContainer parent = _folder.getParent();
+ if (parent instanceof IFolder) {
+ prepareFolder((IFolder) parent, _progressMonitor);
+ }
+ _folder.create(false, true, _progressMonitor);
+ }
+ }
}
\ No newline at end of file
Index: WOSubprojectCreator.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.wizards/java/org/objectstyle/wolips/wizards/WOSubprojectCreator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- WOSubprojectCreator.java 11 Feb 2006 13:09:07 -0000 1.5
+++ WOSubprojectCreator.java 16 Feb 2006 14:07:01 -0000 1.6
@@ -97,8 +97,7 @@
/**
* @see WOProjectResourceCreator#run(IProgressMonitor)
*/
- public void run(IProgressMonitor monitor) throws InvocationTargetException,
- InterruptedException {
+ public void run(IProgressMonitor monitor) throws InvocationTargetException {
try {
createSubproject(monitor);
} catch (CoreException e) {
Index: WOFrameworkWizard.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.wizards/java/org/objectstyle/wolips/wizards/WOFrameworkWizard.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- WOFrameworkWizard.java 11 Feb 2006 13:09:07 -0000 1.5
+++ WOFrameworkWizard.java 16 Feb 2006 14:07:01 -0000 1.6
@@ -60,7 +60,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -104,8 +103,7 @@
this.project = project;
}
- protected void execute(IProgressMonitor monitor) throws CoreException,
- InvocationTargetException, InterruptedException {
+ protected void execute(IProgressMonitor monitor) throws InvocationTargetException {
String projectName = this.project.getName();
String path = this.project.getLocation().toOSString();
NullProgressMonitor nullProgressMonitor = new NullProgressMonitor();
Index: D2WApplicationWizard.java
===================================================================
RCS file: /cvsroot/woproject/woproject/projects/wolips/plugins/org.objectstyle.wolips.wizards/java/org/objectstyle/wolips/wizards/D2WApplicationWizard.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- D2WApplicationWizard.java 11 Feb 2006 13:09:07 -0000 1.4
+++ D2WApplicationWizard.java 16 Feb 2006 14:07:01 -0000 1.5
@@ -60,7 +60,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.ui.actions.WorkspaceModifyOperation;
@@ -104,8 +103,7 @@
this.project = project;
}
- protected void execute(IProgressMonitor monitor) throws CoreException,
- InvocationTargetException, InterruptedException {
+ protected void execute(IProgressMonitor monitor) throws InvocationTargetException {
String projectName = this.project.getName();
String path = this.project.getLocation().toOSString();
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642