Author: rob.stryker(a)jboss.com Date: 2012-08-13 02:52:04 -0400 (Mon, 13 Aug 2012) New Revision: 42988 Modified: branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java Log: JBIDE-12419 to maintenance Modified: branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java =================================================================== --- branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2012-08-13 06:44:55 UTC (rev 42987) +++ branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/ArchiveFileSetImpl.java 2012-08-13 06:52:04 UTC (rev 42988) @@ -16,15 +16,15 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; -import org.eclipse.osgi.util.NLS; import org.jboss.ide.eclipse.archives.core.ArchivesCore; import org.jboss.ide.eclipse.archives.core.ArchivesCoreMessages; import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory; -import org.jboss.ide.eclipse.archives.core.model.IArchiveStandardFileSet; import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension; import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper; +import org.jboss.ide.eclipse.archives.core.model.IArchiveStandardFileSet; import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbFileSet; import org.jboss.ide.eclipse.archives.core.util.PathUtils; +import org.jboss.ide.eclipse.archives.core.xpl.AntNLS; /** * An implementation for filesets @@ -137,7 +137,7 @@ } } catch( IllegalStateException ise ) { ArchivesCore.getInstance().getLogger().log(IStatus.WARNING, - NLS.bind(ArchivesCoreMessages.CouldNotCreateScanner, ise.getMessage()), ise); + AntNLS.bind(ArchivesCoreMessages.CouldNotCreateScanner, ise.getMessage()), ise); matchingPaths = new FileWrapper[0]; matchingMap = new HashMap<String, ArrayList<FileWrapper>>(); } Modified: branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java =================================================================== --- branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2012-08-13 06:44:55 UTC (rev 42987) +++ branches/jbosstools-3.3.x/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2012-08-13 06:52:04 UTC (rev 42988) @@ -20,11 +20,11 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.osgi.util.NLS; import org.jboss.ide.eclipse.archives.core.ArchivesCore; import org.jboss.ide.eclipse.archives.core.ArchivesCoreMessages; import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; import org.jboss.ide.eclipse.archives.core.model.ArchivesModelException; +import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper; 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; @@ -32,11 +32,11 @@ import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode; import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeVisitor; -import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension.FileWrapper; import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveModelNode; import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveNodeImpl; import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackageNode; import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages; +import org.jboss.ide.eclipse.archives.core.xpl.AntNLS; /** * Utility class for matching model elements and stuff @@ -201,6 +201,8 @@ } public static void fillArchiveModel( XbPackages node, IArchiveModelRootNode modelNode) throws ArchivesModelException { + if( node == null ) + return; for (Iterator iter = node.getAllChildren().iterator(); iter.hasNext(); ) { XbPackageNode child = (XbPackageNode) iter.next(); ArchiveNodeImpl childImpl = (ArchiveNodeImpl)createPackageNodeImpl(child, modelNode); @@ -234,7 +236,7 @@ } else { // Log that this node type is unsupported IStatus status = new Status(IStatus.WARNING, ArchivesCore.PLUGIN_ID, - NLS.bind(ArchivesCoreMessages.UnsupportedNodeType, node.getNodeType())); + AntNLS.bind(ArchivesCoreMessages.UnsupportedNodeType, node.getNodeType())); ArchivesCore.log(status); } return nodeImpl;