[jbosstools-commits] JBoss Tools SVN: r12235 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core: build and 1 other directories.
Author: rob.stryker(a)jboss.com
Date: 2008-12-02 21:30:50 -0500 (Tue, 02 Dec 2008)
New Revision: 12235
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
Log:
JBIDE-3305
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-03
01:47:13 UTC (rev 12234)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ArchivesCoreMessages.properties 2008-12-03
02:30:50 UTC (rev 12235)
@@ -20,7 +20,7 @@
BuildingFilesets=Building filesets
CannotBuildBadConfiguration=Cannot build archive "{0}" due to a problem in the
archive's configuration.
CannotBuildOutputLocationNotWriteable=Cannot build archive "{0}. Output location {1}
is not writeable.
-ErrorCreatingOutputFile=Error creating output file for node {0}
+ErrorCreatingOutputFile=Error creating output file {0} for node {1}
ProjectArchivesIncrementalBuild=Project Archives Incremental Build
ErrorUpdatingModel=Error updating model changes
ErrorUnmarshallingFile=Error unmarshalling packages file {0}
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-03
01:47:13 UTC (rev 12234)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java 2008-12-03
02:30:50 UTC (rev 12235)
@@ -156,7 +156,9 @@
if( !ModelTruezipBridge.createFile(pkg) ) {
IStatus e = new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID,
- ArchivesCore.bind(ArchivesCoreMessages.ErrorCreatingOutputFile,pkg.toString()));
+ ArchivesCore.bind(ArchivesCoreMessages.ErrorCreatingOutputFile,
+ ModelTruezipBridge.getFilePath(pkg),
+ pkg.toString()));
errors.add(e);
}
monitor.worked(200);
@@ -167,7 +169,10 @@
folderMonitor.beginTask(ArchivesCoreMessages.CreatingFolders, folders.length * 100);
for( int i = 0; i < folders.length; i++ ) {
if( !ModelTruezipBridge.createFile(folders[i])) {
- IStatus e = new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID,
ArchivesCore.bind(ArchivesCoreMessages.ErrorCreatingOutputFile,folders[i].toString()));
+ IStatus e = new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID,
+ ArchivesCore.bind(ArchivesCoreMessages.ErrorCreatingOutputFile,
+ ModelTruezipBridge.getFilePath(folders[i]),
+ folders[i].toString()));
errors.add(e);
}
folderMonitor.worked(100);
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-12-03
01:47:13 UTC (rev 12234)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-12-03
02:30:50 UTC (rev 12235)
@@ -212,7 +212,7 @@
}
public static boolean createFile(final IArchiveNode node, boolean sync) {
File f = getFile(node);
- boolean b = true;
+ boolean b = false;
if( f != null ) {
b = f.mkdirs();
}
@@ -297,4 +297,8 @@
return null;
}
+ public static String getFilePath(IArchiveNode node) {
+ File f = getFile(node);
+ return f == null ? null : f.getAbsolutePath();
+ }
}