X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/com/xaraya/wizard/XarayaModuleContainerPage.java b/net.sourceforge.phpeclipse/src/com/xaraya/wizard/XarayaModuleContainerPage.java
index 488ca10..b3b14f8 100644
--- a/net.sourceforge.phpeclipse/src/com/xaraya/wizard/XarayaModuleContainerPage.java
+++ b/net.sourceforge.phpeclipse/src/com/xaraya/wizard/XarayaModuleContainerPage.java
@@ -9,6 +9,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.StringTokenizer;
 
+import net.sourceforge.phpdt.internal.ui.util.StringUtil;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -36,7 +38,8 @@ import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.internal.IHelpContextIds;
 import org.eclipse.ui.internal.WorkbenchMessages;
 import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.misc.ResourceAndContainerGroup;
+import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.eclipse.ui.internal.ide.misc.ResourceAndContainerGroup;
 
 public class XarayaModuleContainerPage extends WizardPage implements Listener {
 	private static final int SIZING_CONTAINER_GROUP_HEIGHT = 250;
@@ -105,7 +108,7 @@ protected void createFolder(IFolder folderHandle, IProgressMonitor monitor) thro
 }
 
 protected IFolder createFolderHandle(IPath folderPath) {
-	return WorkbenchPlugin.getPluginWorkspace().getRoot().getFolder(folderPath);
+	return IDEWorkbenchPlugin.getPluginWorkspace().getRoot().getFolder(folderPath);
 }
 
 public IFolder createNewModuleFolder() {
@@ -185,7 +188,7 @@ protected void createFile(IFile fileHandle, InputStream contents, IProgressMonit
 }
 
 protected IFile createFileHandle(IPath filePath) {
-	return WorkbenchPlugin.getPluginWorkspace().getRoot().getFile(filePath);
+	return IDEWorkbenchPlugin.getPluginWorkspace().getRoot().getFile(filePath);
 }
 
 public Object[] createNewModuleFiles(){
@@ -286,7 +289,7 @@ public IFile createNewFile(String fileName) {
 			String insert = (String)inserts.get(i);
 			String replace = (String)names.get(i);
 	
-			buffer = buffer.replaceAll(insert, replace.toLowerCase());		
+      buffer = StringUtil.replaceAll(buffer, insert, replace.toLowerCase());
 			try {
 				ps = new PipedOutputStream();
 				is = new PipedInputStream(ps);
@@ -338,7 +341,7 @@ public void setVisible(boolean visible) {
 protected boolean validatePage() {
 	boolean valid = true;
 	String moduleName = new String();
-	IWorkspace workspace = WorkbenchPlugin.getPluginWorkspace();
+	IWorkspace workspace = IDEWorkbenchPlugin.getPluginWorkspace();
     IStatus nameStatus = null;
     String folderName = resourceGroup.getResource();
     moduleName = folderName;