Author: sagara
Date: Thu Aug 25 08:04:55 2011
New Revision: 1161430
URL: http://svn.apache.org/viewvc?rev=1161430&view=rev
Log:
Applied patch for AXIS2-4063.
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?rev=1161430&r1=1161429&r2=1161430&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
Thu Aug 25 08:04:55 2011
@@ -43,6 +43,8 @@ import org.apache.commons.logging.LogFac
import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.ws.java2wsdl.Java2WSDLCodegenEngine;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -173,6 +175,10 @@ public class CodeGenWizard extends Wizar
switch (selectedWizardType) {
case SettingsConstants.WSDL_2_JAVA_TYPE:
doFinishWSDL2Java();
+ IProject selectedWorkspaceProject =
outputPage.getSelectedWorkspaceProject();
+ if(selectedWorkspaceProject != null){
+
selectedWorkspaceProject.refreshLocal(IResource.DEPTH_INFINITE, new
NullProgressMonitor());
+ }
break;
case SettingsConstants.JAVA_2_WSDL_TYPE:
doFinishJava2WSDL();
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java?rev=1161430&r1=1161429&r2=1161430&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
(original)
+++
axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/ui/OutputPage.java
Thu Aug 25 08:04:55 2011
@@ -88,6 +88,8 @@ public class OutputPage extends Abstract
private boolean hintVisible = false;
+ private IProject selectedWorkspaceProject;
+
/**
*
@@ -110,6 +112,7 @@ public class OutputPage extends Abstract
settings.put(PREF_CHECK_AXIS_PLUGIN_LIB_COPY, false);
workspaceSaveOption = false;
jarFileCopyOption = false;
+ selectedWorkspaceProject=null;
}
/*
@@ -643,6 +646,8 @@ public class OutputPage extends Abstract
if (project != null) {
outputLocation.setText(project.getLocation()
.toOSString() + builder.toString());
+ //Fixing AXIS2-4063
+
selectedWorkspaceProject=project;
} else {
// append to the
workspace path if the project is
// null
@@ -664,4 +669,11 @@ public class OutputPage extends Abstract
public int getPageType() {
return WSDL_2_JAVA_TYPE;
}
+
+ public IProject getSelectedWorkspaceProject(){
+ if(workspaceSaveOption){
+ return selectedWorkspaceProject;
+ }
+ return null;
+ }
}