[jbosstools-commits] JBoss Tools SVN: r13461 - in trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools: ui and 1 other directory.

Author: rob.stryker(a)jboss.com Date: 2009-02-04 04:07:17 -0500 (Wed, 04 Feb 2009) New Revision: 13461 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/Fileset.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetDialog.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java Log: Tiny code cleanup Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-02-04 07:45:17 UTC (rev 13460) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-02-04 09:07:17 UTC (rev 13461) @@ -58,7 +58,7 @@ public boolean accepts(IServer server, IModule[] module) { if( module != null && module.length > 0 - && "jboss.package".equals(module[0].getModuleType().getId()))//$NON-NLS-1$ + && PackageModuleFactory.MODULE_TYPE.equals(module[0].getModuleType().getId())) return true; return false; } @@ -155,7 +155,7 @@ protected int countConcreteFiles(IModule module) { PackagedModuleDelegate delegate = (PackagedModuleDelegate)module.loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor()); try { - ArrayList list = new ArrayList(); + ArrayList<IPath> list = new ArrayList<IPath>(); countConcreteFiles(delegate.members()[0], list); return list.size(); } catch( CoreException ce ) { @@ -163,7 +163,7 @@ } return -1; } - protected void countConcreteFiles(IModuleResource mr, ArrayList list) { + protected void countConcreteFiles(IModuleResource mr, ArrayList<IPath> list) { if( mr instanceof IExtendedModuleResource) { IExtendedModuleResource emr = ((IExtendedModuleResource)mr); if( mr instanceof IModuleFile ) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/Fileset.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/Fileset.java 2009-02-04 07:45:17 UTC (rev 13460) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/Fileset.java 2009-02-04 09:07:17 UTC (rev 13461) @@ -13,13 +13,14 @@ public class Fileset implements Cloneable { private static final String HASH_SEPARATOR = "::_::"; //$NON-NLS-1$ + private static final String SEP = "\n"; //$NON-NLS-1$ private String name, folder, includesPattern, excludesPattern; public Fileset() { } public Fileset(String string) { try { name = folder = includesPattern =excludesPattern = ""; //$NON-NLS-1$ - String[] parts = string.split("\n"); //$NON-NLS-1$ + String[] parts = string.split(SEP); name = parts[0]; folder = parts[1]; includesPattern = parts[2]; @@ -34,7 +35,7 @@ excludesPattern = exc; } public String toString() { - return name + "\n" + folder + "\n" + includesPattern + "\n" + excludesPattern; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ + return name + SEP + folder + SEP + includesPattern + SEP + excludesPattern; } /** * @return the folder Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetDialog.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetDialog.java 2009-02-04 07:45:17 UTC (rev 13460) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetDialog.java 2009-02-04 09:07:17 UTC (rev 13461) @@ -150,9 +150,6 @@ Group previewWrapper = new Group(main, SWT.NONE); previewWrapper.setLayout(new GridLayout()); - GridLayout gridLayout = new GridLayout(); - //gridLayout.numColumns = 3; - //gridLayout.verticalSpacing = 9; GridData data = new GridData(GridData.FILL_BOTH); data.grabExcessHorizontalSpace = true; Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2009-02-04 07:45:17 UTC (rev 13460) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/PreviewPage.java 2009-02-04 09:07:17 UTC (rev 13461) @@ -151,11 +151,11 @@ } private void setupDestinationList () { - List projects = Arrays.asList(ResourcesPlugin.getWorkspace().getRoot().getProjects()); + List<IProject> projects = Arrays.asList(ResourcesPlugin.getWorkspace().getRoot().getProjects()); setInput(projects); } private void setupInitialSelections(String initialSelection) { - ArrayList resources = new ArrayList(); + ArrayList<IResource> resources = new ArrayList<IResource>(); String[] paths = initialSelection.split(","); //$NON-NLS-1$ // find IResources IResource res; @@ -163,7 +163,7 @@ res = ResourcesPlugin.getWorkspace().getRoot().findMember(paths[i]); resources.add(res); } - setInitialSelections((IResource[]) resources.toArray(new IResource[resources.size()])); + setInitialSelections(resources.toArray(new IResource[resources.size()])); } private static class FolderContentProvider implements ITreeContentProvider { @@ -173,7 +173,7 @@ IContainer container = (IContainer) parentElement; try { IResource members[] = container.members(); - List folders = new ArrayList(); + List<IResource> folders = new ArrayList<IResource>(); for (int i = 0; i < members.length; i++) { if (members[i].getType() == IResource.FOLDER) folders.add(members[i]); }