Maven update working.

UX improvements.

Author: Layoric

src/ServiceStackEclipse/META-INF/MANIFEST.MF

@@ -8,7 +8,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.jdt.core;bundle-version="3.10.0",
  org.eclipse.ui.ide;bundle-version="3.10.2",
- org.eclipse.osgi;bundle-version="3.10.2"
+ org.eclipse.osgi;bundle-version="3.10.2",
+ org.eclipse.core.runtime;bundle-version="3.10.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.eclipse.core.runtime,
  org.eclipse.jdt.core,

src/ServiceStackEclipse/src/net/servicestack/eclipse/maven/EclipseMavenHelper.java

@@ -1,9 +1,13 @@
 package net.servicestack.eclipse.maven;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Objects;
 
@@ -16,7 +20,7 @@
 
 public class EclipseMavenHelper {
 	public boolean addMavenDependencyIfRequired(IFile pomFile, String groupId, String packageId, String version) throws Exception {
-        boolean noDependencyAdded = true;
+        boolean dependencyAdded = false;
         MavenXpp3Reader reader = new MavenXpp3Reader();
         Model pomModel;
         try {
@@ -28,22 +32,26 @@ public boolean addMavenDependencyIfRequired(IFile pomFile, String groupId, Strin
                     requiresPomDependency = false;
                 }
             }
-
+            
+            String content = null;
             if(requiresPomDependency) {
                 Dependency dependency = new Dependency();
                 dependency.setGroupId(groupId);
                 dependency.setArtifactId(packageId);
                 dependency.setVersion(version);
-                FileWriter writer = new FileWriter(pomFile.getLocationURI().getPath());
                 pomModel.addDependency(dependency);
-                new MavenXpp3Writer().write(writer, pomModel);
-                noDependencyAdded = false;
+                StringWriter strWriter = new StringWriter();
+                new MavenXpp3Writer().write(strWriter, pomModel);
+                content = strWriter.toString();
+                InputStream stream = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
+                pomFile.setContents(stream, false, false, null);
+                dependencyAdded = true;
             }
 
         } catch (IOException | XmlPullParserException e) {
             e.printStackTrace();
             throw new Exception("Unable to process pom.xml to add " + groupId + ":" + packageId + ":" + version);
         }
-        return noDependencyAdded;
+        return dependencyAdded;
     }
 }

src/ServiceStackEclipse/src/net/servicestack/eclipse/wizard/AddReferencePage.java

@@ -34,6 +34,7 @@ public class AddReferencePage extends WizardPage {
 
 	private String errorMessage;
 	private String selectedDirectory;
+	private String _tempPackageName;
 
 	protected AddReferencePage() {
 		super("Add ServiceStack Reference");
@@ -48,10 +49,6 @@ protected AddReferencePage() {
 		// TODO Auto-generated constructor stub
 	}
 
-	public boolean canFlipToNextPage() {
-		return canFinish;
-	}
-
 	@Override
 	public void createControl(Composite parent) {
 		// TODO Auto-generated method stub
@@ -92,6 +89,7 @@ public void verifyText(VerifyEvent event) {
 		packageLabel.setText("Package");
 		packageTextField = new Text(composite, SWT.BORDER | SWT.SINGLE);
 		packageTextField.setLayoutData(gd);
+		packageTextField.setText(_tempPackageName == null ? "" : _tempPackageName);
 
 		Label nameLabel = new Label(composite, SWT.NONE);
 		nameLabel.setText("Name");
@@ -129,10 +127,26 @@ public String getAddressUrl() {
 	public String getFileName() {
 		return nameTextField.getText();
 	}
+	
+	public void setPackageName(String packageName) { 
+		_tempPackageName = packageName;
+		if(packageTextField != null) {
+			packageTextField.setText(_tempPackageName);
+		}
+	}
+	
+	public String getPackageName() {
+		return packageTextField.getText();
+	}
 
 	private void dialogChanged() {
 		updateStatus(null);
 	}
+	
+	@Override
+	public boolean canFlipToNextPage() {
+		return canFinish;
+	}
 
 	private void updateStatus(String message) {
 		setErrorMessage(message);