[jbosstools-commits] JBoss Tools SVN: r6194 - in trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core: util and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Thu Feb 7 18:11:03 EST 2008
Author: rob.stryker at jboss.com
Date: 2008-02-07 18:11:02 -0500 (Thu, 07 Feb 2008)
New Revision: 6194
Modified:
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/EclipseResourceGroupTask.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/IsolatedTruezipExecution.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/JBossArchivesTask.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
Log:
Preparing to break / destroy archives! awesome for API refactors
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java 2008-02-07 23:04:05 UTC (rev 6193)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntVariables.java 2008-02-07 23:11:02 UTC (rev 6194)
@@ -26,7 +26,7 @@
}
public IPath getProjectPath(String projectName) {
- HashMap map = ResourceModel.getDefault().getTaskEnvironment(currentTask);
+ HashMap<Object, Object> map = ResourceModel.getDefault().getTaskEnvironment(currentTask);
if( map.containsKey(projectName)) return new Path((String)map.get(projectName));
if( map.containsKey(IPath.SEPARATOR + projectName)) return new Path((String)map.get(IPath.SEPARATOR + projectName));
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/EclipseResourceGroupTask.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/EclipseResourceGroupTask.java 2008-02-07 23:04:05 UTC (rev 6193)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/EclipseResourceGroupTask.java 2008-02-07 23:11:02 UTC (rev 6194)
@@ -30,7 +30,7 @@
}
}
- ArrayList resources = new ArrayList();
+ ArrayList<EclipseResource> resources = new ArrayList<EclipseResource>();
public EclipseResource createEclipseResource() {
EclipseResource res = new EclipseResource();
resources.add(res);
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/IsolatedTruezipExecution.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/IsolatedTruezipExecution.java 2008-02-07 23:04:05 UTC (rev 6193)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/IsolatedTruezipExecution.java 2008-02-07 23:11:02 UTC (rev 6194)
@@ -61,7 +61,7 @@
}
IArchiveModelNode node = ArchivesModel.instance().getRoot(path);
- final ArrayList requiredProjects = new ArrayList();
+ final ArrayList<String> requiredProjects = new ArrayList<String>();
node.accept(new IArchiveNodeVisitor() {
public boolean visit(IArchiveNode node) {
if( node.getNodeType() == IArchiveNode.TYPE_ARCHIVE) {
@@ -92,7 +92,7 @@
boolean retVal = true;
AntVariables vars = ((AntVariables)ArchivesCore.getInstance().getVariables());
for( int i = 0; i < requiredProjects.size(); i++ ) {
- IPath p = vars.getProjectPath((String)requiredProjects.get(i));
+ IPath p = vars.getProjectPath(requiredProjects.get(i));
if( p == null ) {
retVal = false;
task.log("Required project \"" + requiredProjects.get(i) +
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/JBossArchivesTask.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/JBossArchivesTask.java 2008-02-07 23:04:05 UTC (rev 6193)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/JBossArchivesTask.java 2008-02-07 23:11:02 UTC (rev 6194)
@@ -1,8 +1,6 @@
package org.jboss.ide.eclipse.archives.core.ant;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -40,7 +38,7 @@
}
- ArrayList resources = new ArrayList();
+ ArrayList<EclipseResource> resources = new ArrayList<EclipseResource>();
public EclipseResource createEclipseResource() {
EclipseResource res = new EclipseResource();
resources.add(res);
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2008-02-07 23:04:05 UTC (rev 6193)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/ModelUtil.java 2008-02-07 23:11:02 UTC (rev 6194)
@@ -59,7 +59,7 @@
* @return
*/
public static IArchiveFileSet[] getMatchingFilesets(IArchiveNode node, final IPath path) {
- final ArrayList rets = new ArrayList();
+ final ArrayList<IArchiveFileSet> rets = new ArrayList<IArchiveFileSet>();
IArchiveNodeVisitor visitor = new IArchiveNodeVisitor() {
public boolean visit(IArchiveNode node) {
if( node.getNodeType() == IArchiveNode.TYPE_ARCHIVE_FILESET &&
@@ -75,7 +75,7 @@
else
node.accept(visitor);
- return (IArchiveFileSet[]) rets.toArray(new IArchiveFileSet[rets.size()]);
+ return rets.toArray(new IArchiveFileSet[rets.size()]);
}
/**
@@ -84,8 +84,8 @@
* @return
*/
public static IArchiveFileSet[] findAllDescendentFilesets(IArchiveNode node) {
- ArrayList matches = findAllDescendents(node, IArchiveNode.TYPE_ARCHIVE_FILESET, true);
- return (IArchiveFileSet[]) matches.toArray(new IArchiveFileSet[matches.size()]);
+ ArrayList<IArchiveNode> matches = findAllDescendents(node, IArchiveNode.TYPE_ARCHIVE_FILESET, true);
+ return matches.toArray(new IArchiveFileSet[matches.size()]);
}
/**
@@ -94,8 +94,8 @@
* @return
*/
public static IArchiveFolder[] findAllDescendentFolders(IArchiveNode node) {
- ArrayList matches = findAllDescendents(node, IArchiveNode.TYPE_ARCHIVE_FOLDER, false);
- return (IArchiveFolder[]) matches.toArray(new IArchiveFolder[matches.size()]);
+ ArrayList<IArchiveNode> matches = findAllDescendents(node, IArchiveNode.TYPE_ARCHIVE_FOLDER, false);
+ return matches.toArray(new IArchiveFolder[matches.size()]);
}
/**
@@ -103,8 +103,8 @@
* @param node
* @return
*/
- public static ArrayList findAllDescendents(IArchiveNode node, final int type, final boolean includeSelf) {
- final ArrayList matches = new ArrayList();
+ public static ArrayList<IArchiveNode> findAllDescendents(IArchiveNode node, final int type, final boolean includeSelf) {
+ final ArrayList<IArchiveNode> matches = new ArrayList<IArchiveNode>();
final IArchiveNode original = node;
node.accept(new IArchiveNodeVisitor() {
public boolean visit(IArchiveNode node) {
@@ -168,13 +168,13 @@
*/
public static IPath getBaseDestinationFile(IArchiveNode node, IPath absolutePath) {
IArchiveNode parameterNode = node;
- ArrayList list = new ArrayList();
+ ArrayList<IArchiveNode> list = new ArrayList<IArchiveNode>();
while( node != null && !(node instanceof ArchiveModelNode)) {
list.add(node);
node = node.getParent();
}
Collections.reverse(list);
- IArchiveNode[] nodes = (IArchiveNode[]) list.toArray(new IArchiveNode[list.size()]);
+ IArchiveNode[] nodes = list.toArray(new IArchiveNode[list.size()]);
IPath lastConcrete = null;
for( int i = 0; i < nodes.length; i++ ) {
Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-02-07 23:04:05 UTC (rev 6193)
+++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-02-07 23:11:02 UTC (rev 6194)
@@ -87,7 +87,7 @@
// Let them know which files were removed, for events
public static IPath[] fullFilesetRemove(final IArchiveFileSet fileset, boolean sync) {
IPath[] paths = fileset.findMatchingPaths();
- final ArrayList list = new ArrayList();
+ final ArrayList<IPath> list = new ArrayList<IPath>();
list.addAll(Arrays.asList(paths));
for( int i = 0; i < paths.length; i++ ) {
if( !ModelUtil.otherFilesetMatchesPathAndOutputLocation(fileset, paths[i])) {
@@ -116,7 +116,7 @@
if( sync )
TrueZipUtil.sync();
- return (IPath[]) list.toArray(new IPath[list.size()]);
+ return list.toArray(new IPath[list.size()]);
}
More information about the jbosstools-commits
mailing list