[jbosstools-commits] JBoss Tools SVN: r17547 - in trunk/maven/plugins: org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: snjeza
Date: 2009-09-14 11:06:24 -0400 (Mon, 14 Sep 2009)
New Revision: 17547

Modified:
   trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java
   trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4881 Maven Library Provider doesn't save correctly changes made by a user

Modified: trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java	2009-09-14 13:49:46 UTC (rev 17546)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java	2009-09-14 15:06:24 UTC (rev 17547)
@@ -58,14 +58,11 @@
 			URIConverter.WriteableOutputStream uws = null;
 			FileWriter fw = null;
 			try {
-				if (providerFile.exists()) {
-					url = providerFile.toURL();
-				} else {
-					Map<String, String> params = provider.getParams();
-					String pomURLString = params.get("template"); //$NON-NLS-1$
-					URL platformURL = new URL(pomURLString);
-					url = FileLocator.resolve(platformURL);
-				}
+				Map<String, String> params = provider.getParams();
+				String pomURLString = params.get("template"); //$NON-NLS-1$
+				URL platformURL = new URL(pomURLString);
+				url = FileLocator.resolve(platformURL);
+				
 				libraryResource = MavenCoreActivator.loadResource(url);
 				libraryResource.getContents().clear();
 				libraryResource.getContents().add(libraryModel);
@@ -84,12 +81,16 @@
 					try {
 						uws.flush();
 						uws.close();
-					} catch (IOException ignore) {}
+					} catch (IOException e) {
+						MavenCoreActivator.log(e);
+					}
 				}
 				if (fw != null) {
 					try {
 						fw.close();
-					} catch (IOException ignore) {}
+					} catch (IOException e) {
+						MavenCoreActivator.log(e);
+					}
 				}
 				if (libraryResource != null) {
 					libraryResource.unload();

Modified: trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java	2009-09-14 13:49:46 UTC (rev 17546)
+++ trunk/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java	2009-09-14 15:06:24 UTC (rev 17547)
@@ -67,7 +67,10 @@
 		composite.setLayoutData(gd);
 		
 		String projectName = getDataModel().getStringProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME);
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+		IProject project = null;
+		if (projectName != null && projectName.trim().length() > 0) {
+			project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+		}
 		boolean mavenProjectExists = false;
 		if (project != null && project.isOpen()) {
 			try {