[jbosstools-commits] JBoss Tools SVN: r8132 - in branches/jbosstools-2.1.x/core/plugins: org.jboss.ide.eclipse.archives.core/src/xml and 1 other directories.
Author: rob.stryker(a)jboss.com
Date: 2008-05-15 19:47:02 -0400 (Thu, 15 May 2008)
New Revision: 8132
Modified:
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java
Log:
JBIDE-2099 - folders turning zipped bug, with tiny other fixes that made archives unusable
to some extent
Modified:
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
---
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-05-15
22:40:14 UTC (rev 8131)
+++
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-05-15
23:47:02 UTC (rev 8132)
@@ -25,6 +25,7 @@
import java.util.Arrays;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFolder;
@@ -209,7 +210,10 @@
filesetRelative = inputFiles[i].lastSegment();
else
filesetRelative = inputFiles[i].toOSString().substring(fsLength);
- returnFiles[i] = new File(fsFile, filesetRelative, ArchiveDetector.DEFAULT);
+
+ String tmp = new Path(filesetRelative).removeLastSegments(1).toString();
+ File parentFile = new File(fsFile, tmp, ArchiveDetector.NULL);
+ returnFiles[i] = new File(parentFile, new Path(filesetRelative).lastSegment(),
ArchiveDetector.DEFAULT);
}
return returnFiles;
}
Modified:
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd
===================================================================
---
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd 2008-05-15
22:40:14 UTC (rev 8131)
+++
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd 2008-05-15
23:47:02 UTC (rev 8132)
@@ -67,7 +67,7 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="todir" type="xsd:string"
use="required">
+ <xsd:attribute name="todir" type="xsd:string"
use="optional">
<xsd:annotation>
<xsd:appinfo>
<jbxb:property name="toDir" />
Modified:
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java
===================================================================
---
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java 2008-05-15
22:40:14 UTC (rev 8131)
+++
branches/jbosstools-2.1.x/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/views/ArchivesMenuHandler.java 2008-05-15
23:47:02 UTC (rev 8132)
@@ -320,7 +320,7 @@
}
selected.addChild(current);
- //ArchivesModel.
+ ArchivesModel.instance().save(selected.getProjectPath(), new NullProgressMonitor());
} catch( ArchivesModelException ame ) {
IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, "Error
Attaching Archives Node", ame);
PackagesUIPlugin.getDefault().getLog().log(status);